Imported Debian patch 1.1.0-14

diff --git a/debian/changelog b/debian/changelog
index b2f8759591a1f283f91dc3f52a5b057b1f88c543..f3aa7670a4a9b78306fb389b6c08a0a0b4938a44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.1.0-14) unstable; urgency=low
+
+  * Install mount.nfs setuid directly instead of doing dpkg-statoverride in
+    the postinst. Clear the dpkg-statoverride status in the postinst script 
+    on upgrades from earlier versions for cleanness. (Closes: #435258)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 05 Aug 2007 20:06:53 +0200
+
 nfs-utils (1:1.1.0-13) unstable; urgency=low
 
   * 06-gssd-manpage-typo.patch: New patch from A Costa, fixes a typo in the

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 1c988d5926f159214364a7a65162a9092b449e70..654a5835b8e950011259e82bfbf911aeade651f6 100644 (file)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -30,9 +30,11 @@ 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
+       
+       if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then
+           if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
+               dpkg-statoverride --remove /sbin/mount.nfs
+           fi
        fi
     ;;
 esac

diff --git a/debian/rules b/debian/rules
index 40a2daf4b996a6ae63228b8954427c64e3a7824f..b72ac35649156cec5101a0a539c838f5e2e7092a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ binary-arch: build
        dh_installchangelogs ChangeLog
        dh_strip
        dh_compress
-       dh_fixperms
+       dh_fixperms -Xmount.nfs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol