From: LaMont Jones <lamont@mix.mmjgroup.com>
Date: Sun, 8 Jul 2007 23:07:30 +0000 (-0600)
Subject: v2.12r-8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76ed21e661b246a35914ee65ccab4283b4136495;p=util-linux

v2.12r-8
---

diff --git a/debian/changelog b/debian/changelog
index 6e1e6856..32a2f8b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+util-linux (2.12r-8) unstable; urgency=high
+
+  * Drop NFS v4 patch, since it breaks mounting things exported by
+    nfs-user-server.  It will be happily reapplied once someone fixes
+    the patch.  Closes: #354075.  Reopens: #302420, #239031
+    - fix compiler warnings in said patch.
+    - Apply nfs4mount.c fix to (dropped) nfsv4 patch.  Closes: #354193
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Feb 2006 10:57:29 -0700
+
 util-linux (2.12r-7) unstable; urgency=low
 
   * Add nfsv4 patch.  Closes: #302420, #239031
diff --git a/debian/control b/debian/control
index a875f538..5cc53ea2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: base
 Priority: required
 Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpatch
 Maintainer: LaMont Jones <lamont@debian.org>
-Standards-Version: 3.5.6.0
+Standards-Version: 3.6.2.0
 
 Package: util-linux
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
index 790b9f04..7d9ff225 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,7 +10,7 @@
 10sparcumount
 10warnings
 20guesshelper
-30nfs4
+#30nfs4
 #20xgethostname
 #50hurd
 60_opt_O1
diff --git a/debian/patches/30nfs4.dpatch b/debian/patches/30nfs4.dpatch
index 13071429..ff1dc86e 100755
--- a/debian/patches/30nfs4.dpatch
+++ b/debian/patches/30nfs4.dpatch
@@ -243,7 +243,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./mount/nfs4mount.c /tmp/dpep-work.TJbh
 +#endif
 +
 +extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
-+extern void rpc_strerror();
++extern void rpc_strerror(void);
 +
 +struct {
 +	char    *flavour;
@@ -1053,7 +1053,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./mount/nfsmount.c /tmp/dpep-work.TJbhs
 +int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
 +
 +/* Convert RPC errors into strings */
-+void rpc_strerror()
++void rpc_strerror(void)
 +{
 +	int cf_stat = rpc_createerr.cf_stat; 
 +	int cf_errno = rpc_createerr.cf_error.re_errno;