From: Steinar H. Gunderson Date: Sun, 5 Aug 2007 18:06:53 +0000 (+0200) Subject: Imported Debian patch 1.1.0-14 X-Git-Tag: debian/1%1.1.0-14^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ffa66031fdbc6d886fbe9b424107da423100b9d8;p=nfs-utils.git Imported Debian patch 1.1.0-14 --- diff --git a/debian/changelog b/debian/changelog index b2f8759..f3aa767 100644 --- 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 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 1c988d5..654a583 100644 --- 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 40a2daf..b72ac35 100755 --- 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