Imported Debian patch 1.0.7-13

diff --git a/confdefs.h b/confdefs.h
new file mode 100644 (file)
index 0000000..0010349
--- /dev/null
+++ b/confdefs.h
@@ -0,0 +1,4 @@
+
+#define NFS3_SUPPORTED 1
+#define NFS4_SUPPORTED 1
+#define GSS_SUPPORTED 1

diff --git a/debian/changelog b/debian/changelog
index e0da231a1811a2900b8127eb87be4974decaf81f..00e297a236b5e41618d4c87f66a76e1aefa58922 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+nfs-utils (1:1.0.7-13) unstable; urgency=low
+
+  * Up the Standards-Version to 3.7.2; no changes needed.
+  * Tidy up after the /home/statd mess if there was a chance the user ever
+    had 1:1.0.7-10 installed; based on patch from Oskar Liljeblad.
+    (Closes: #366182)
+  * Fix the version check for the chown-ing of /var/lib/nfs/sm etc.; I
+    forgot to include the epoch, so only new installs ever got statd running
+    as non-root. (Due to this, the version number to test against is of course
+    also bumped.)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat,  6 May 2006 01:50:10 +0200
+
 nfs-utils (1:1.0.7-12) unstable; urgency=low
 
   * Move the home directory again (by request), this time to /var/lib/nfs.

diff --git a/debian/control b/debian/control
index e7f80f946044377fd856fa2f055ce37ba68ac2da..e42d7cb3746f44492c97f7daac168093950100fe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel.baumann@panthera-systems.net>
 Build-Depends: debhelper (>= 5), autoconf2.13, autotools-dev, libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: nfs-kernel-server
 Priority: optional

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 21d47ddd39571f1795f4fc982c946a95314b6283..ce8d59b24d2e3e1c6dadb26f73993f12bdb2cdd1 100755 (executable)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -9,7 +9,13 @@ case "$1" in
        if ! getent passwd statd >/dev/null; then
            adduser --system --home /var/lib/nfs --no-create-home statd
        fi
-       if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1.0.7-10; then
+       if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then
+            usermod --home /var/lib/nfs statd || true
+            if [ -d /home/statd ]; then
+                rmdir --ignore-fail-on-non-empty /home/statd
+            fi
+       fi
+       if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-13; then
            chown statd /var/lib/nfs/sm \
                /var/lib/nfs/sm.bak \
                /var/lib/nfs/state \