Imported Debian patch 1.1.0-7

diff --git a/debian/changelog b/debian/changelog
index 8887d4fb1c4626849fdda94baf4d85e26eaa943d..e179219fe73cebac72b28ed3ac8f352be3253d97 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.0-7) unstable; urgency=low
+
+  * Add postinst fragment to make /sbin/mount setuid root, which should fix
+    problems with non-root mounting. (Closes: #432581)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 12 Jul 2007 01:40:18 +0200
+
 nfs-utils (1:1.1.0-6) unstable; urgency=low
 
   * Enable {mount,umount}.{nfs,nfs4}, in line with util-linux 2.13 no longer

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 2b838617c9c711da798cbdfec28ae7a52b353565..7671c1578fef333d22169c4fd5e40e0d78b4ac2a 100644 (file)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -27,6 +27,10 @@ case "$1" in
                chown statd /var/lib/nfs/state
             fi
        fi
+
+       if ! dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
+           dpkg-statoverride --update --add root root 4755 /sbin/mount.nfs
+       fi
     ;;
 esac
 

diff --git a/debian/nfs-common.postrm b/debian/nfs-common.postrm
index 267bb7a05a2b2b3354de697f2015df5eb8cf33f7..c7af6431cb80c97840e89809c55c8bd4d84e7d15 100644 (file)
--- a/debian/nfs-common.postrm
+++ b/debian/nfs-common.postrm
@@ -20,5 +20,7 @@ case "$1" in
        rm -f /var/lib/nfs/state    \
              /var/lib/nfs/sm/*     \
              /var/lib/nfs/sm.bak/*
+           
+       dpkg-statoverride --remove /sbin/mount.nfs
        ;;
 esac