Imported Debian patch 1.1.3-2

diff --git a/debian/changelog b/debian/changelog
index 3a8519746d1339c3a0779e629137d7047ff0e0db..b1ce1c82a20d4663d48e5ea8f4a5a2225baf5325 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.1.3-2) unstable; urgency=low
+
+  * Add 09-492827-cache.c.patch to fix mac os x 10.5 client hangs when server
+    started with --manage-gids; patch by Neil Brown; closes: #492827
+  * Install sm-notify manpage; patch by J Bruce Fields <bfields@fieldses.org>;
+    closes: #494154
+  * Add 10-493659-nfs.man.patch to fix unicode characters in nfs(5) man page;
+    patch by nbreen@ofb.net (Nicholas Breen); closes: #493659
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 26 Aug 2008 18:16:37 +1000
+
 nfs-utils (1:1.1.3-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/nfs-common.manpages b/debian/nfs-common.manpages
index 2fd641d850019a74ca2ae9cb6eec84302678105e..5f264ab9ca604e85491176a54a5a0723e210dbb5 100644 (file)
--- a/debian/nfs-common.manpages
+++ b/debian/nfs-common.manpages
@@ -3,6 +3,7 @@ debian/tmp/usr/share/man/man5/nfs.5
 debian/tmp/usr/share/man/man8/gssd.8
 debian/tmp/usr/share/man/man8/idmapd.8
 debian/tmp/usr/share/man/man8/statd.8
+debian/tmp/usr/share/man/man8/sm-notify.8
 debian/tmp/usr/share/man/man8/nfsstat*
 debian/tmp/usr/share/man/man8/showmount*
 debian/tmp/usr/share/man/man8/idmapd*

diff --git a/debian/patches/04-eacces-is-a-permanent-error.patch b/debian/patches/04-eacces-is-a-permanent-error.patch
deleted file mode 100644 (file)
index fe5dae6..0000000
--- a/debian/patches/04-eacces-is-a-permanent-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: nfs-utils-1.1.2/utils/mount/stropts.c
-===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/stropts.c
-+++ nfs-utils-1.1.2/utils/mount/stropts.c
-@@ -289,7 +289,6 @@ static int set_mandatory_options(const c
- static int is_permanent_error(int error)
- {
-       switch (error) {
--      case EACCES:
-       case ESTALE:
-       case ETIMEDOUT:
-       case ECONNREFUSED:

diff --git a/debian/patches/09-492827-cache.c.patch b/debian/patches/09-492827-cache.c.patch
new file mode 100644 (file)
index 0000000..0d0086b
--- /dev/null
+++ b/debian/patches/09-492827-cache.c.patch
@@ -0,0 +1,17 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=492827
+Patch by Neil Brown
+
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+index f555dcc..48d737b 100644
+--- a/utils/mountd/cache.c
++++ b/utils/mountd/cache.c
+@@ -158,7 +158,8 @@ void auth_unix_gid(FILE *f)
+               qword_printint(f, ngroups);
+               for (i=0; i<ngroups; i++)
+                       qword_printint(f, groups[i]);
+-      }
++      } else
++              qword_printint(f, 0);
+       qword_eol(f);
+       if (groups != glist)
+               free(groups);

diff --git a/debian/patches/10-493659-nfs.man.patch b/debian/patches/10-493659-nfs.man.patch
new file mode 100644 (file)
index 0000000..c9aead2
--- /dev/null
+++ b/debian/patches/10-493659-nfs.man.patch
@@ -0,0 +1,15 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
+patch by nbreen@ofb.net (Nicholas Breen)
+
+diff -Nru nfs-utils-1.1.3_orig/utils/mount/nfs.man nfs-utils-1.1.3/utils/mount/nfs.man
+--- nfs-utils-1.1.3_orig/utils/mount/nfs.man   2008-07-27 14:01:45.000000000 -0700
++++ nfs-utils-1.1.3/utils/mount/nfs.man        2008-08-03 16:47:06.904343379 -0700
+@@ -799,7 +799,7 @@
+ and server load.
+ .P
+ However, UDP can be quite effective in specialized settings where  
+-the network’s MTU is large relative to NFS’s data transfer size (such  
++the network's MTU is large relative to NFS's data transfer size (such  
+ as network environments that enable jumbo Ethernet frames).  In such  
+ environments, trimming the 
+ .B rsize 

diff --git a/debian/patches/series b/debian/patches/series
index edc0d429dc0e92d6f452e282f8abea83db9c6897..553bf959d7d25c67100b4b5e4058821f6726d065 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 05-default-use-old-mount-interface.patch
 06-dont-check-exec-bit.patch
 07-remove-duplicate-exports-paragraphs.patch
+09-492827-cache.c.patch
+10-493659-nfs.man.patch