[Pkg-loop-aes-commits] r1296 - in /trunk/loop-aes-utils/debian: changelog patches/30nfs4-fix.dpatch

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Oct  7 23:10:03 2006
New Revision: 1296

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1296
Log:
* patches/30nfs4-fix:
  - Sync with util-linux 2.12r-11


Modified:
    trunk/loop-aes-utils/debian/changelog
    trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch

Modified: trunk/loop-aes-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/changelog?rev=1296&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Sat Oct  7 23:10:03 2006
@@ -1,8 +1,9 @@
 loop-aes-utils (2.12r-14) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Max Vozeler <xam at debian.org>  Wed, 19 Jul 2006 17:00:52 +0200
+  * patches/30nfs4-fix:
+    - Sync with util-linux 2.12r-11
+
+ -- Max Vozeler <xam at debian.org>  Sun,  8 Oct 2006 01:04:28 +0200
 
 loop-aes-utils (2.12r-13) unstable; urgency=low
 

Modified: trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch?rev=1296&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch Sat Oct  7 23:10:03 2006
@@ -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,