Imported Debian patch 1.0.7-16

diff --git a/debian/changelog b/debian/changelog
index 07aa32e50f537a277ca5698e5528513cfebb2ce8..445388656860828c34f89b11a1d85dff36ef2e25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.0.7-16) unstable; urgency=high
+
+  * urgency=high; fixes an RC bug.
+  * If one upgraded from 1:1.0.7-13, /var/lib/nfs might never be set as owned
+    by statd. Bump the version check, so everything before this version gets
+    chowned properly. (Closes: #367009)
+  * Add more detailed explanations and links to the Debian wiki for
+    /etc/defaults/nfs-{common,kernel-server}. (Closes: #366989, #366990)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 13 May 2006 16:06:08 +0200
+
 nfs-utils (1:1.0.7-15) unstable; urgency=low
 
   * /var/lib/nfs/state is not a directory; it shouldn't really be mkdir-ed

diff --git a/debian/nfs-common.default b/debian/nfs-common.default
index 89f99804772b0861411cfb466efecbc07ec6a0ee..5eba0b5bf9b45fa47574be54a252badc20b23f9b 100644 (file)
--- a/debian/nfs-common.default
+++ b/debian/nfs-common.default
@@ -3,8 +3,10 @@
 # for the NEED_ options are "yes" and "no".
 
 # Options for rpc.statd.
-#   Should rpc.statd listen on a specific port?
-#   If so, set this variable to a statd argument like: "--port 1000".
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or http://wiki.debian.org/?SecuringNFS
 STATDOPTS=
 
 # Some kernels need a separate lockd daemon; most don't. Set this if you

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 162f3c30ef30db3fd51667de629b6157e8431d5f..f556bc273519fc72c58dd2fb2abd5d83c1a0dcd2 100755 (executable)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -15,7 +15,7 @@ case "$1" in
                 rmdir --ignore-fail-on-non-empty /home/statd
             fi
        fi
-       if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-13; then
+       if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-16; then
            chown statd /var/lib/nfs/sm \
                /var/lib/nfs/sm.bak \
                /var/lib/nfs/rpc_pipefs \

diff --git a/debian/nfs-kernel-server.default b/debian/nfs-kernel-server.default
index e3e08f72d2e2e97fd2fe70e7461467957c3c7e10..c2c4955c872f35a5a268a736dfbe153c32791fbd 100644 (file)
--- a/debian/nfs-kernel-server.default
+++ b/debian/nfs-kernel-server.default
@@ -4,7 +4,10 @@ RPCNFSDCOUNT=8
 # Runtime priority of server (see nice(1))
 RPCNFSDPRIORITY=0
 
-# Options for rpc.mountd
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information, 
+# see rpc.mountd(8) or http://wiki.debian.org/?SecuringNFS
 RPCMOUNTDOPTS=
 
 # If you are not running NFS with RPCSEC_GSS security, and wish to