Imported Debian patch 1.1.4-1

diff --git a/debian/changelog b/debian/changelog
index b1ce1c82a20d4663d48e5ea8f4a5a2225baf5325..66472bb52e2101c497ab79a11f2904a34d1f7ca9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+nfs-utils (1:1.1.4-1) unstable; urgency=low
+
+  * New upstream release. Patch status:
+    * 01-sm-notify-in-sbin.patch: Refreshed.
+    * 03-handle-mtab-symlink.patch: Refreshed.
+    * 05-default-use-old-mount-interface.patch: Removed (see below).
+    * 07-remove-duplicate-exports-paragraphs.patch: No change.
+    * 09-492827-cache.c.patch: Integrated by upstream, removed.
+    * 10-493659-nfs.man.patch: No change.
+    * Do not sync() in sm-notify if there are no hosts to be notified.
+      (Closes: #502122)
+  * Removed 05-default-use-old-mount-interface.patch, ie. revert to the new
+    text-based mount interface, as this package is not intended for lenny.
+    Probably reopens several older bugs, but Closes: #480909, #492970.
+  * Fix abuses of $? in nfs-kernel-server.init (they were already OK in
+    nfs-common.init, for some reason). (Closes: #503643)
+  * In /etc/default/nfs-kernel-server.default, add --manage-gids to the default
+    set of mountd options. (Closes: #493059)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri, 07 Nov 2008 14:01:19 +0100
+
 nfs-utils (1:1.1.3-2) unstable; urgency=low
 
   * Add 09-492827-cache.c.patch to fix mac os x 10.5 client hangs when server

diff --git a/debian/nfs-kernel-server.default b/debian/nfs-kernel-server.default
index 365f616ea98de74ee955e19a0cb6a2173bbb5715..d3ff49f7c0b150a57f44234fc689955bd3064057 100644 (file)
--- a/debian/nfs-kernel-server.default
+++ b/debian/nfs-kernel-server.default
@@ -8,7 +8,7 @@ RPCNFSDPRIORITY=0
 # If you have a port-based firewall, you might want to set up
 # a fixed port here using the --port option. For more information, 
 # see rpc.mountd(8) or http://wiki.debian.org/?SecuringNFS
-RPCMOUNTDOPTS=
+RPCMOUNTDOPTS=--manage-gids
 
 # Do you want to start the svcgssd daemon? It is only required for Kerberos
 # exports. Valid alternatives are "yes" and "no"; the default is "no".

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 4c4205a1c57a862115a399926f7fb91e43adfadf..2f675be128045bfca5294f06fb95fc75c0b82716 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -72,9 +72,10 @@ case "$1" in
                do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
                log_begin_msg "Exporting directories for $DESC..."
                $PREFIX/sbin/exportfs -r
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
                log_end_msg 0
 
@@ -83,9 +84,10 @@ case "$1" in
                start-stop-daemon --start --oknodo --quiet \
                    --nicelevel $RPCNFSDPRIORITY \
                    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
 
                # make sure 127.0.0.1 is a valid source for requests
@@ -108,18 +110,20 @@ case "$1" in
                        log_progress_msg "svcgssd"
                        start-stop-daemon --start --oknodo --quiet \
                            --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
-                       if [ $? != 0 ]; then
-                               log_end_msg $?
-                               exit $?
+                       RET=$?
+                       if [ $RET != 0 ]; then
+                               log_end_msg $RET
+                               exit $RET
                        fi
                fi
 
                log_progress_msg "mountd"
                start-stop-daemon --start --oknodo --quiet \
                    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
 
                log_end_msg 0
@@ -134,36 +138,40 @@ case "$1" in
        log_progress_msg "mountd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.mountd --user 0
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+       RET=$?
+       if [ $RET != 0 ]; then
+               log_end_msg $RET
+               exit $RET
        fi
 
        if [ "$NEED_SVCGSSD" = "yes" ]; then
                log_progress_msg "svcgssd"
                start-stop-daemon --stop --oknodo --quiet \
                    --name rpc.svcgssd --user 0
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
+               RET=$?
+               if [ $RET != 0 ]; then
+                       log_end_msg $RET
+                       exit $RET
                fi
        fi
 
        log_progress_msg "nfsd"
        start-stop-daemon --stop --oknodo --quiet \
            --name nfsd --user 0 --signal 2
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+       RET=$?
+       if [ $RET != 0 ]; then
+               log_end_msg $RET
+               exit $RET
        fi
 
        log_end_msg 0
 
        log_begin_msg "Unexporting directories for $DESC..."
        $PREFIX/sbin/exportfs -au
-       if [ $? != 0 ]; then
-               log_end_msg $?
-               exit $?
+       RET=$?
+       if [ $RET != 0 ]; then
+               log_end_msg $RET
+               exit $RET
        fi
        log_end_msg 0
 
@@ -187,8 +195,9 @@ case "$1" in
   reload | force-reload)
        log_begin_msg "Re-exporting directories for $DESC..."
        $PREFIX/sbin/exportfs -r
-       log_end_msg $?
-       exit $?
+       RET=$?
+       log_end_msg $RET
+       exit $RET
        ;;
 
   restart)

diff --git a/debian/patches/01-sm-notify-in-sbin.patch b/debian/patches/01-sm-notify-in-sbin.patch
index 7cd9541361e46c115e4ef6f4bb43583728b7dd8e..fcfcaade3afe7fb119dbdc5b0f29112543650808 100644 (file)
--- a/debian/patches/01-sm-notify-in-sbin.patch
+++ b/debian/patches/01-sm-notify-in-sbin.patch
@@ -1,8 +1,8 @@
-Index: nfs-utils-1.1.0/utils/statd/statd.c
+Index: nfs-utils-1.1.4/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)
+--- nfs-utils-1.1.4.orig/utils/statd/statd.c
++++ nfs-utils-1.1.4/utils/statd/statd.c
+@@ -222,7 +222,7 @@ static void run_sm_notify(int outport)
        char *av[6];
        int ac = 0;
  

diff --git a/debian/patches/03-handle-mtab-symlink.patch b/debian/patches/03-handle-mtab-symlink.patch
index 28211a56138cd2beb71c9d32b90dee072c4fed97..9cf09761282a6b9c8a7f347c2a44b7871687e835 100644 (file)
--- a/debian/patches/03-handle-mtab-symlink.patch
+++ b/debian/patches/03-handle-mtab-symlink.patch
@@ -1,8 +1,8 @@
-Index: nfs-utils-1.1.2/utils/mount/fstab.c
+Index: nfs-utils-1.1.4/utils/mount/fstab.c
 ===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/fstab.c
-+++ nfs-utils-1.1.2/utils/mount/fstab.c
-@@ -52,7 +52,7 @@ mtab_does_not_exist(void) {
+--- nfs-utils-1.1.4.orig/utils/mount/fstab.c
++++ nfs-utils-1.1.4/utils/mount/fstab.c
+@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
        return var_mtab_does_not_exist;
  }
  
@@ -11,10 +11,10 @@ Index: nfs-utils-1.1.2/utils/mount/fstab.c
  mtab_is_a_symlink(void) {
          get_mtab_info();
          return var_mtab_is_a_symlink;
-Index: nfs-utils-1.1.2/utils/mount/fstab.h
+Index: nfs-utils-1.1.4/utils/mount/fstab.h
 ===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/fstab.h
-+++ nfs-utils-1.1.2/utils/mount/fstab.h
+--- nfs-utils-1.1.4.orig/utils/mount/fstab.h
++++ nfs-utils-1.1.4/utils/mount/fstab.h
 @@ -7,6 +7,7 @@
  #define _PATH_FSTAB "/etc/fstab"
  #endif
@@ -22,14 +22,14 @@ Index: nfs-utils-1.1.2/utils/mount/fstab.h
 +int mtab_is_a_symlink(void);
  int mtab_is_writable(void);
  int mtab_does_not_exist(void);
- 
-Index: nfs-utils-1.1.2/utils/mount/mount.c
+ void reset_mtab_info(void);
+Index: nfs-utils-1.1.4/utils/mount/mount.c
 ===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -257,6 +257,13 @@ static int add_mtab(char *spec, char *mo
-               return EX_SUCCESS;
-       }
+--- nfs-utils-1.1.4.orig/utils/mount/mount.c
++++ nfs-utils-1.1.4/utils/mount/mount.c
+@@ -230,6 +230,13 @@ create_mtab (void) {
+       int flags;
+       mntFILE *mfp;
  
 +      /* Avoid writing if the mtab is a symlink to /proc/mounts, since
 +         that would create a file /proc/mounts in case the proc filesystem
@@ -40,4 +40,4 @@ Index: nfs-utils-1.1.2/utils/mount/mount.c
 +
        lock_mtab();
  
-       mtab = nfs_setmntent(MOUNTED, "a+");
+       mfp = nfs_setmntent (MOUNTED, "a+");

diff --git a/debian/patches/series b/debian/patches/series
index 553bf959d7d25c67100b4b5e4058821f6726d065..c34414da6c701f8b5947e2f3399b8a441ecdc3ef 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
 01-sm-notify-in-sbin.patch
 03-handle-mtab-symlink.patch
-05-default-use-old-mount-interface.patch
-06-dont-check-exec-bit.patch
 07-remove-duplicate-exports-paragraphs.patch
-09-492827-cache.c.patch
 10-493659-nfs.man.patch