[arch-commits] Commit in nfs-utils/trunk (5 files)

Tobias Powalowski tpowa at archlinux.org
Sun Jan 10 11:43:57 EST 2010


    Date: Sunday, January 10, 2010 @ 11:43:56
  Author: tpowa
Revision: 62603

upgpkg: nfs-utils 1.2.1-3
    fix #15775 #17738 #15953

Added:
  nfs-utils/trunk/fix-nfsd-startup-1.2.1.patch
Modified:
  nfs-utils/trunk/PKGBUILD
  nfs-utils/trunk/nfs-common.conf
  nfs-utils/trunk/nfs-server.conf
  nfs-utils/trunk/start-statd.patch

------------------------------+
 PKGBUILD                     |   18 ++++++++++++------
 fix-nfsd-startup-1.2.1.patch |   15 +++++++++++++++
 nfs-common.conf              |   23 ++++++++++-------------
 nfs-server.conf              |   12 ++++++------
 start-statd.patch            |    3 ++-
 5 files changed, 45 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-10 16:26:44 UTC (rev 62602)
+++ PKGBUILD	2010-01-10 16:43:56 UTC (rev 62603)
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -27,21 +27,23 @@
 	nfs-utils-1.1.6-no_libgssapi.patch
 	nfs-utils-1.1.6-heimdal_functions.patch
 	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch)
+	nfs-utils-1.1.4-no-exec.patch
+	fix-nfsd-startup-1.2.1.patch)
 install=nfs-utils.install
 md5sums=('c3ccd16c147befd49fe4541a506dd177'
          '990a07943fa958d4abb1cb7bd52c9a7b'
-         '768928d9cbe5d0c6719e43b445e69ac6'
+         'f73f197a16b02c3e248488ec35c4cf43'
          '5ae080f6117cef3140f02bc162bdc755'
-         '7bb672c320b10b3716b40c3f5bd6b6a8'
+         'b9b334414baec31b97f0431d9ecdcfb9'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
-         '97c9c6765ac793c5b684b2d6bbe1bc3f'
+         'e24f81a8c8657672e262c61235d34b4a'
          'f3be115d392d9f9bb0f056e8d4341a14'
          '20c6fae1c771b9d8e91c4973f16372e3'
          'e6fd3a8acfe97970a53db1b902c34f45'
          '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')
+         '4f4827dfc93008dfadd0a530ad0872b2'
+         '0709195356cf23d322539c780c626d9a')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
@@ -52,6 +54,10 @@
   patch -Np0 -i ../nfs-utils-1.1.6-heimdal_functions.patch || return 1
   patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch || return 1
   patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch || return 1
+  # fix nfsd startup if interfaces are not ready, fixed in upcoming 1.2.2
+  # http://bugs.archlinux.org/task/17738
+  # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=2905358524c0835311501bad04c521479b0525ff
+  patch -Np1 -i ../fix-nfsd-startup-1.2.1.patch || return 1
 
   # arch specific patch
   patch -Np0 -i $srcdir/start-statd.patch || return 1

Added: fix-nfsd-startup-1.2.1.patch
===================================================================
--- fix-nfsd-startup-1.2.1.patch	                        (rev 0)
+++ fix-nfsd-startup-1.2.1.patch	2010-01-10 16:43:56 UTC (rev 62603)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.linux-nfs.org/?p=steved%2Fnfs-utils.git;a=blobdiff_plain;f=utils%2Fnfsd%2Fnfssvc.c;h=b8028bbed3bca6e76d88d44506a6a495545ec5b6;hp=12d3253228fadb0e074590b83d6e08808c2ec59e;hb=2905358524c0835311501bad04c521479b0525ff;hpb=67e6d2d8a96e98d7f21693a9d034da81d3f90084
+
+diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
+index 12d3253..b8028bb 100644
+--- a/utils/nfsd/nfssvc.c
++++ b/utils/nfsd/nfssvc.c
+@@ -212,7 +212,7 @@ int
+ nfssvc_set_sockets(const int family, const unsigned int protobits,
+ 		   const char *host, const char *port)
+ {
+-	struct addrinfo hints = { .ai_flags = AI_PASSIVE | AI_ADDRCONFIG };
++	struct addrinfo hints = { .ai_flags = AI_PASSIVE };
+ 
+ 	hints.ai_family = family;
+ 

Modified: nfs-common.conf
===================================================================
--- nfs-common.conf	2010-01-10 16:26:44 UTC (rev 62602)
+++ nfs-common.conf	2010-01-10 16:43:56 UTC (rev 62603)
@@ -6,38 +6,35 @@
 # for the NEED_ options are "yes" and "no".
 
 # Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=
+NEED_STATD=""
 
 # Options to pass to rpc.statd.
 # See rpc.statd(8) for more details.
 # N.B. statd normally runs on both client and server, and run-time
-# options should be specified accordingly. Specifically, the Arch
-# NFS init scripts require the --no-notify flag on the server,
-# but not on the client e.g.
-# STATD_OPTS="--no-notify -p 32765 -o 32766" -> server
-# STATD_OPTS="-p 32765 -o 32766" -> client
-STATD_OPTS=
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
 
 # Options to pass to sm-notify
 # e.g. SMNOTIFY_OPTS="-p 32764"
 SMNOTIFY_OPTS=""
 
 # Do you want to start the idmapd daemon? It is only needed for NFSv4.
-NEED_IDMAPD=
+NEED_IDMAPD=""
 
 # Options to pass to rpc.idmapd.
 # See rpc.idmapd(8) for more details.
-IDMAPD_OPTS=
+IDMAPD_OPTS=""
 
 # Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=
+NEED_GSSD=""
 
 # Options to pass to rpc.gssd.
 # See rpc.gssd(8) for more details.
-GSSD_OPTS=
+GSSD_OPTS=""
 
 # Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
-PIPEFS_MOUNTPOINT=
+PIPEFS_MOUNTPOINT=""
 
 # Options used to mount rpc_pipefs filesystem; the default is "defaults".
-PIPEFS_MOUNTOPTS=
+PIPEFS_MOUNTOPTS=""

Modified: nfs-server.conf
===================================================================
--- nfs-server.conf	2010-01-10 16:26:44 UTC (rev 62602)
+++ nfs-server.conf	2010-01-10 16:43:56 UTC (rev 62603)
@@ -3,16 +3,16 @@
 
 # Options to pass to rpc.nfsd.
 # See rpc.nfsd(8) for more details.
-NFSD_OPTS=
+NFSD_OPTS=""
 
 # Number of servers to start up; the default is 8 servers.
-NFSD_COUNT=
+NFSD_COUNT=""
 
 # Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
-PROCNFSD_MOUNTPOINT=
+PROCNFSD_MOUNTPOINT=""
 
 # Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
-PROCNFSD_MOUNTOPTS=
+PROCNFSD_MOUNTOPTS=""
 
 # Options for rpc.mountd.
 # If you have a port-based firewall, you might want to set up
@@ -22,8 +22,8 @@
 
 # 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".
-NEED_SVCGSSD=
+NEED_SVCGSSD=""
 
 # Options to pass to rpc.svcgssd.
 # See rpc.svcgssd(8) for more details.
-SVCGSSD_OPTS=
+SVCGSSD_OPTS=""

Modified: start-statd.patch
===================================================================
--- start-statd.patch	2010-01-10 16:26:44 UTC (rev 62602)
+++ start-statd.patch	2010-01-10 16:43:56 UTC (rev 62603)
@@ -1,7 +1,8 @@
 --- utils/statd/start-statd	2007-05-11 04:40:57.000000000 +0100
 +++ utils/statd/start-statd.new	2007-09-21 17:11:34.000000000 +0100
 @@ -1,9 +1,16 @@
- #!/bin/sh
+-#!/bin/sh -p
++#!/bin/sh
 +
 +# Original script provided by the NFS project
 +# Modified for Arch Linux by Tom Killian



More information about the arch-commits mailing list