From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 18 Jul 2007 17:04:44 +0000 (+0200)
Subject: Imported Debian patch 1.1.0-11
X-Git-Tag: debian/1%1.1.0-11^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=2ac79288fc1ddc0326af1b2c5b9ffd6d023bf376;p=nfs-utils.git

Imported Debian patch 1.1.0-11
---

diff --git a/debian/changelog b/debian/changelog
index 4af72d3..ff701b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nfs-utils (1:1.1.0-11) unstable; urgency=low
+
+  * Include the nfs man page, which was also forgotten. The new nfs man page
+    fixes a few documentation bugs over the old one from util-linux:
+    * TCP is now the default if supported. (Closes: #414160)
+    * The default NFS version is now 3. (Closes: #289436)
+  * Add a replaces on pre-2.13 mount, since nfs(5) used to be there.
+  * 05-ignore-quota-option.patch: Properly ignore quota options in fstab.
+    (Closes: #329417)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 18 Jul 2007 19:04:44 +0200
+
 nfs-utils (1:1.1.0-10) unstable; urgency=high
 
   * Start nfs-common in the /etc/rcS start-up sequence, making sure statd is
diff --git a/debian/control b/debian/control
index 503e73f..83439ec 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Architecture: any
 Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), ${shlibs:Depends}
 Provides: nfs-client
 Conflicts: nfs-client
-Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)
+Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5), mount (<< 2.13~)
 Description: NFS support files common to client and server
  Use this package on any machine that uses NFS, either as client or
  server.  Programs included: lockd, statd, showmount, nfsstat, gssd
diff --git a/debian/nfs-common.manpages b/debian/nfs-common.manpages
index 7843287..2fd641d 100644
--- a/debian/nfs-common.manpages
+++ b/debian/nfs-common.manpages
@@ -1,4 +1,5 @@
 debian/tmp/usr/share/man/man5/idmapd.conf*
+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
diff --git a/debian/patches/05-ignore-quota-option.patch b/debian/patches/05-ignore-quota-option.patch
new file mode 100644
index 0000000..2985938
--- /dev/null
+++ b/debian/patches/05-ignore-quota-option.patch
@@ -0,0 +1,22 @@
+The mount(5) man page states that the noquota, quota, usrquota and
+grpquota options are ignored. (They are, however, used by the quota
+tools, so having them in fstab can be useful.) Make mount.nfs ignore
+them properly, matching the man page. There are a few aliases (like
+usrjquota) that are parsed by quota, but as these are not documented
+nor seem to be widely used, they are not included.
+
+Index: nfs-utils-1.1.0/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/mount/mount.c
++++ nfs-utils-1.1.0/utils/mount/mount.c
+@@ -132,6 +132,10 @@ static const struct opt_map opt_map[] = 
+   { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
+   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
+ #endif
++  { "noquota", 0, 0, MS_DUMMY },        /* Don't enforce quota */
++  { "quota", 0, 0, MS_DUMMY },          /* Enforce user quota */
++  { "usrquota", 0, 0, MS_DUMMY },       /* Enforce user quota */
++  { "grpquota", 0, 0, MS_DUMMY },       /* Enforce group quota */
+   { NULL,	0, 0, 0		}
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cb97c49..ae6f898 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+05-ignore-quota-option.patch
 04-umount-exit-status.patch
 03-sm-notify-in-sbin.patch
 01-fix-hostent-memory-leak.diff