[arch-commits] Commit in nfs-utils/trunk (PKGBUILD fix-nfsd-startup-1.2.1.patch)

[Tobias Powalowski]

    Date: Saturday, February 20, 2010 @ 05:28:43
  Author: tpowa
Revision: 69321

upgpkg: nfs-utils 1.2.2-1
bump to latest version

Modified:
  nfs-utils/trunk/PKGBUILD
Deleted:
  nfs-utils/trunk/fix-nfsd-startup-1.2.1.patch

------------------------------+
 PKGBUILD                     |   16 +++++-----------
 fix-nfsd-startup-1.2.1.patch |   15 ---------------
 2 files changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-20 10:24:42 UTC (rev 69320)
+++ PKGBUILD	2010-02-20 10:28:43 UTC (rev 69321)
@@ -6,8 +6,8 @@
 # Contributor: Marco Lima <cipparello gmail com>
 
 pkgname=nfs-utils
-pkgver=1.2.1
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -27,10 +27,9 @@
 	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
-	fix-nfsd-startup-1.2.1.patch)
+	nfs-utils-1.1.4-no-exec.patch)
 install=nfs-utils.install
-md5sums=('c3ccd16c147befd49fe4541a506dd177'
+md5sums=('dad92f64db3266c7757f71bb53ee8f35'
          '990a07943fa958d4abb1cb7bd52c9a7b'
          'f73f197a16b02c3e248488ec35c4cf43'
          '5ae080f6117cef3140f02bc162bdc755'
@@ -42,8 +41,7 @@
          '20c6fae1c771b9d8e91c4973f16372e3'
          'e6fd3a8acfe97970a53db1b902c34f45'
          '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2'
-         '0709195356cf23d322539c780c626d9a')
+         '4f4827dfc93008dfadd0a530ad0872b2')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
@@ -54,10 +52,6 @@
   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

Deleted: fix-nfsd-startup-1.2.1.patch
===================================================================
--- fix-nfsd-startup-1.2.1.patch	2010-02-20 10:24:42 UTC (rev 69320)
+++ fix-nfsd-startup-1.2.1.patch	2010-02-20 10:28:43 UTC (rev 69321)
@@ -1,15 +0,0 @@
-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;
-