From: Steinar H. Gunderson <sesse@debian.org>
Date: Sat, 29 Sep 2007 13:03:21 +0000 (+0200)
Subject: Imported Debian patch 1.1.1~git-20070929-1
X-Git-Tag: debian/1%1.1.1_git-20070929-1^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9438b647be378ec0f578697b613de723e02312a2;p=nfs-utils.git

Imported Debian patch 1.1.1~git-20070929-1
---

diff --git a/debian/changelog b/debian/changelog
index 8fc8dca..36dc240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.1~git-20070929-1) unstable; urgency=low
+
+  * New git snapshot.
+    * Update debian/copyright with new version information.
+    * 07-daemonize-instead-of-fork.patch: Now in upstream, removed.
+    * 08-libgssglue-changes.patch: Now in upstream, removed.
+    * 09-define-major-minor.patch: Now in upstream, removed.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 29 Sep 2007 15:03:21 +0200
+
 nfs-utils (1:1.1.1~git-20070709-5) unstable; urgency=low
 
   * Fix totally broken export-detecting regex in the init script; patch by
diff --git a/debian/patches/07-daemonize-instead-of-fork.patch b/debian/patches/07-daemonize-instead-of-fork.patch
deleted file mode 100644
index 5ae0f89..0000000
--- a/debian/patches/07-daemonize-instead-of-fork.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: nfs-utils-1.1.1~git-20070709/utils/mount/mount.c
-===================================================================
---- nfs-utils-1.1.1~git-20070709.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.1~git-20070709/utils/mount/mount.c
-@@ -530,9 +530,7 @@ int main(int argc, char *argv[])
- 		 * Parent exits immediately with success.  Make
- 		 * sure not to free "mount_point"
- 		 */
--		if (fork() > 0)
--			exit(0);
--
-+		daemon(0,0);
- 		mnt_err = try_mount(spec, mount_point, flags, fs_type,
- 					&extra_opts, mount_opts, fake,
- 					nomtab, BACKGROUND);
diff --git a/debian/patches/08-libgssglue-changes.patch b/debian/patches/08-libgssglue-changes.patch
deleted file mode 100644
index 59e1c46..0000000
--- a/debian/patches/08-libgssglue-changes.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/utils/gssd/gssd.c
-+++ b/utils/gssd/gssd.c
-@@ -81,7 +81,7 @@ sig_hup(int signal)
- static void
- usage(char *progname)
- {
--	fprintf(stderr, "usage: %s [-f] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir]\n",
-+	fprintf(stderr, "usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir]\n",
- 		progname);
- 	exit(1);
- }
---- a/configure	2007-08-10 01:29:12.000000000 +1000
-+++ b/configure	2007-09-12 23:00:15.000000000 +1000
-@@ -22631,12 +22631,12 @@
-         pkg_cv_RPCSECGSS_CFLAGS="$RPCSECGSS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.10\"") >&5
--  ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.10") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.16\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.16") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_RPCSECGSS_CFLAGS=`$PKG_CONFIG --cflags "librpcsecgss >= 0.10" 2>/dev/null`
-+  pkg_cv_RPCSECGSS_CFLAGS=`$PKG_CONFIG --cflags "librpcsecgss >= 0.16" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22649,12 +22649,12 @@
-         pkg_cv_RPCSECGSS_LIBS="$RPCSECGSS_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.10\"") >&5
--  ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.10") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.16\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.16") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_RPCSECGSS_LIBS=`$PKG_CONFIG --libs "librpcsecgss >= 0.10" 2>/dev/null`
-+  pkg_cv_RPCSECGSS_LIBS=`$PKG_CONFIG --libs "librpcsecgss >= 0.16" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22673,9 +22673,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librpcsecgss >= 0.10"`
-+	        RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librpcsecgss >= 0.16"`
-         else
--	        RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librpcsecgss >= 0.10"`
-+	        RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librpcsecgss >= 0.16"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$RPCSECGSS_PKG_ERRORS" >&5
-@@ -22710,12 +22710,12 @@
-         pkg_cv_GSSAPI_CFLAGS="$GSSAPI_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.11\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.11") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GSSAPI_CFLAGS=`$PKG_CONFIG --cflags "libgssapi >= 0.11" 2>/dev/null`
-+  pkg_cv_GSSAPI_CFLAGS=`$PKG_CONFIG --cflags "libgssglue >= 0.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22728,12 +22728,12 @@
-         pkg_cv_GSSAPI_LIBS="$GSSAPI_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.11\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.11") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GSSAPI_LIBS=`$PKG_CONFIG --libs "libgssapi >= 0.11" 2>/dev/null`
-+  pkg_cv_GSSAPI_LIBS=`$PKG_CONFIG --libs "libgssglue >= 0.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22752,14 +22752,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GSSAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgssapi >= 0.11"`
-+	        GSSAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgssglue >= 0.1"`
-         else
--	        GSSAPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgssapi >= 0.11"`
-+	        GSSAPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgssglue >= 0.1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GSSAPI_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libgssapi >= 0.11) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libgssglue >= 0.1) were not met:
- 
- $GSSAPI_PKG_ERRORS
- 
-@@ -22770,7 +22770,7 @@
- and GSSAPI_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (libgssapi >= 0.11) were not met:
-+echo "$as_me: error: Package requirements (libgssglue >= 0.1) were not met:
- 
- $GSSAPI_PKG_ERRORS
- 
-@@ -24020,7 +24020,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lrpcsecgss -lgssapi -ldl $LIBS"
-+LIBS="-lrpcsecgss -lgssglue -ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24089,7 +24089,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lrpcsecgss -lgssapi -ldl $LIBS"
-+LIBS="-lrpcsecgss -lgssglue -ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/debian/patches/09-define-major-minor.patch b/debian/patches/09-define-major-minor.patch
deleted file mode 100644
index 6a96940..0000000
--- a/debian/patches/09-define-major-minor.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/utils/mountd/cache.c	2007-08-10 01:28:21.000000000 +1000
-+++ b/utils/mountd/cache.c	2007-08-10 01:28:21.000000000 +1000
-@@ -36,6 +36,15 @@
- #include "blkid/blkid.h"
- #endif
- 
-+#ifndef major
-+# define major(dev) gnu_dev_major (dev)
-+#endif
-+#ifndef minor
-+# define minor(dev) gnu_dev_minor (dev)
-+#endif
-+#ifndef makedev
-+# define makedev(maj, min) gnu_dev_makedev (maj, min)
-+#endif
- 
- enum nfsd_fsid {
- 	FSID_DEV = 0,
diff --git a/debian/patches/series b/debian/patches/series
index 5c4660d..94a7f94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@
 03-sm-notify-in-sbin.patch
 05-ignore-quota-option.patch
 06-gssd-manpage-typo.patch
-07-daemonize-instead-of-fork.patch
-08-libgssglue-changes.patch
-09-define-major-minor.patch