Imported Debian patch 1.1.0-5 debian/1%1.1.0-5
authorSteinar H. Gunderson <sesse@debian.org>
Sun, 8 Jul 2007 19:15:59 +0000 (21:15 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:53:00 +0000 (02:53 +0100)
debian/changelog
debian/nfs-common.install
debian/patches/03-sm-notify-in-sbin.patch [new file with mode: 0644]
debian/patches/series
debian/rules

index c2a605e..fd98994 100644 (file)
@@ -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
index 31a3784..f84fc73 100644 (file)
@@ -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
@@ -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) {
index 8177834..4d23d7f 100644 (file)
@@ -1,2 +1,3 @@
+03-sm-notify-in-sbin.patch
 01-fix-hostent-memory-leak.diff
 02-document-debian-init-scripts.patch
index 40a2daf..fe2b273 100755 (executable)
@@ -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