Imported Debian patch 1.1.0-5

diff --git a/debian/changelog b/debian/changelog
index c2a605e5605c8ce7ec1317e8bb43a4dead199a27..fd98994807a553a81e5a03bdaaa2ecf9e1b2ce8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.1.0-5) unstable; urgency=low
+
+  * Install the sm-notify binary, as rpc.statd seems to want to run it at
+    boot.
+  * 03-sm-notify-in-sbin.patch: New patch, tell rpc.statd that we put
+    sm-notify in /sbin instead of /usr/sbin.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 08 Jul 2007 21:15:59 +0200
+
 nfs-utils (1:1.1.0-4) unstable; urgency=low
 
   * Change the obsolete /proc/nfs/nfsd path in the init script so it matches

diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index 31a378438581db45deca1b5f602ddc5adf7c033a..f84fc73cae30e989863b648fd2b0b510f4ca3773 100644 (file)
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -1,4 +1,5 @@
 debian/tmp/usr/sbin/rpc.statd sbin/
+debian/tmp/usr/sbin/sm-notify sbin/
 debian/tmp/usr/sbin/showmount sbin/
 debian/tmp/usr/sbin/nfsstat
 debian/tmp/usr/sbin/rpc.gssd

diff --git a/debian/patches/03-sm-notify-in-sbin.patch b/debian/patches/03-sm-notify-in-sbin.patch
new file mode 100644 (file)
index 0000000..7cd9541
--- /dev/null
+++ b/debian/patches/03-sm-notify-in-sbin.patch
@@ -0,0 +1,13 @@
+Index: nfs-utils-1.1.0/utils/statd/statd.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/statd/statd.c
++++ nfs-utils-1.1.0/utils/statd/statd.c
+@@ -223,7 +223,7 @@ static void run_sm_notify(int outport)
+       char *av[6];
+       int ac = 0;
+ 
+-      av[ac++] = "/usr/sbin/sm-notify";
++      av[ac++] = "/sbin/sm-notify";
+       if (run_mode & MODE_NODAEMON)
+               av[ac++] = "-d";
+       if (outport) {

diff --git a/debian/patches/series b/debian/patches/series
index 817783440e21dea122468545e42e29ddfdc0f956..4d23d7f874cf7ee8723c28636551be7012901f15 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+03-sm-notify-in-sbin.patch
 01-fix-hostent-memory-leak.diff
 02-document-debian-init-scripts.patch

diff --git a/debian/rules b/debian/rules
index 40a2daf4b996a6ae63228b8954427c64e3a7824f..fe2b273985852ddb2f1587bd75c008e66d9f8c57 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ build-stamp:
        CFLAGS="-g -O2 -Wall" ./configure \
                --mandir='$${prefix}/share/man' \
                --enable-secure-statd \
-               --with-tcp-wrappers
+               --with-tcp-wrappers \
+               --enable-mount
        $(MAKE)
        touch build-stamp