v2.12r-11

diff --git a/debian/changelog b/debian/changelog
index bdab2da50578f4272dfed1a108bf489c31184e4b..fbdc4ba4f4fb7c8f54996c842723f82a2750b3d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+util-linux (2.12r-11) unstable; urgency=low
+
+  * typos in NFSv4 (GSSDLCK didn't have .pid, and the latest
+    nfs-common no longer creates the file at all.) Closes: #376931
+    - modified 30nfs4-fix.dpatch
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 19 Sep 2006 09:33:31 -0600
+
 util-linux (2.12r-10) unstable; urgency=low
 
   * NFSv4 patch fixes for cfs.  Closes: #367049

diff --git a/debian/patches/30nfs4-fix.dpatch b/debian/patches/30nfs4-fix.dpatch
old mode 100644 (file)
new mode 100755 (executable)
index e31a16c..8ac23ba
--- a/debian/patches/30nfs4-fix.dpatch
+++ b/debian/patches/30nfs4-fix.dpatch
@@ -5,9 +5,24 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./mount/nfsmount.c /tmp/dpep-work.DQTPki/util-linux-2.12r/mount/nfsmount.c
---- ./mount/nfsmount.c 2006-05-15 17:56:55.000000000 -0500
-+++ /tmp/dpep-work.DQTPki/util-linux-2.12r/mount/nfsmount.c    2006-05-15 17:59:35.000000000 -0500
+diff -urNad 2.12r-11~/mount/nfs4mount.c 2.12r-11/mount/nfs4mount.c
+--- 2.12r-11~/mount/nfs4mount.c        2006-09-19 09:29:41.000000000 -0600
++++ 2.12r-11/mount/nfs4mount.c 2006-09-19 09:32:58.000000000 -0600
+@@ -367,7 +367,10 @@
+               /*
+                * ditto with rpc.gssd daemon
+                */
+-              gssd_check();
++              /*
++               * The latest nfs-common doesn't create pid files at all.
++               */
++              /* gssd_check(); */
+       }
+       data.auth_flavourlen = num_flavour;
+       data.auth_flavours = pseudoflavour;
+diff -urNad 2.12r-11~/mount/nfsmount.c 2.12r-11/mount/nfsmount.c
+--- 2.12r-11~/mount/nfsmount.c 2006-09-19 09:29:41.000000000 -0600
++++ 2.12r-11/mount/nfsmount.c  2006-09-19 09:29:42.000000000 -0600
 @@ -301,6 +301,7 @@
                         (xdrproc_t)xdr_void, (caddr_t)NULL,
                         (xdrproc_t)xdr_void, (caddr_t)&clnt_res,

diff --git a/debian/patches/30nfs4.dpatch b/debian/patches/30nfs4.dpatch
index ff1dc86e1cda3c2060e4e5fa2a0f35d2ba71c8fd..d943282392f56dcd338840af00bacfbecc7d6beb 100755 (executable)
--- a/debian/patches/30nfs4.dpatch
+++ b/debian/patches/30nfs4.dpatch
@@ -231,7 +231,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./mount/nfs4mount.c /tmp/dpep-work.TJbh
 +      } \
 +} while(0);
 +
-+char *GSSDLCK = DEFAULT_DIR "/rpc.gssd";
++char *GSSDLCK = DEFAULT_DIR "/rpc.gssd.pid";
 +#define gssd_check() do { \
 +              if (access(GSSDLCK, F_OK)) { \
 +                      printf(_("Warning: rpc.gssd appears not to be running.\n")); \