Fri May 31 06:21:01 PDT 2013

1 files changed, 27 insertions, 20 deletions

diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index cbfb91384..3a1f08c0a 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185039 2013-05-10 16:21:44Z tomegun $
+# $Id: PKGBUILD 186779 2013-05-31 07:19:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.8
-pkgrel=3
+pkgrel=6
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -20,7 +20,6 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	nfs-server.conf
 	exports
 	idmapd.conf
-	start-statd.patch
         nfs
 	nfs-utils-1.1.4-mtab-sym.patch
 	nfs-utils-1.1.4-no-exec.patch
@@ -33,54 +32,59 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	var-lib-nfs-rpc_pipefs.mount
 	proc-fs-nfsd.mount
 	blkmapd.service
-	nfs-utils.conf)
+	nfs-utils.conf
+        id_resolver.conf
+        start-statd.patch)
 install=nfs-utils.install
 md5sums=('6e7d97de51e428a0b8698c16ca23db77'
          'f73f197a16b02c3e248488ec35c4cf43'
          '9cef69bc686cc5dcac23fbb51450747d'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
          'f5e7bba09a46c5c5d7007cac6eff9df5'
          '7674106eaaa4c149bccd4f05fe3604e9'
          '4f4827dfc93008dfadd0a530ad0872b2'
-         '3694619813cebc5b4502b58f1992b442'
-         '965311784d49a7d126d512cadbe91deb'
-         'e05705d9ccccaeaeb1ecaee20adc05bc'
-         '359d84a85f8781dc3f45f4cf1dbe4b53'
-         'beff8a426b3b14c46e3e78a2a283e2ab'
-         '5d33d2e754fd37280365b287603bac90'
+         '6aeb4a80b2a5162f5951438474ea22f3'
+         'ff95ad9275ef774e0a2ea8adfe55ee66'
+         '2e991f0e440b4809e22b6c7689544fc0'
+         '42d0088add3beab0284be1379391382b'
+         '60d82e2d2d19d21ceb72665e54bf913e'
+         '3bcc9901478f4f9ea0a03b67171c13e3'
          '1cd65909fa0983047f3f06a3ab352401'
          '8f1b5282795895c9b8ce8430d20cdda6'
-         '8ffc2ebe932d29efe17d6f3f23d5b975'
-         '8ac484023d786766d287ccbe878ae4ba')
+         '8f03e708b230619ffc2a799a48bffb53'
+         '8ac484023d786766d287ccbe878ae4ba'
+         'bed57f7c3911af695ec7b469248c104a'
+         'f8bb29c2ca1ce178e6371091a3e1090d')
 
 prepare() {
   cd $srcdir/${pkgname}-${pkgver}
   patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
+  # fix /usr/bin in start-statd shell script
+  patch -Np1 -i ../start-statd.patch
   #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
-  # arch specific patch
-  patch -Np0 -i $srcdir/start-statd.patch
 }
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
+  ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \
               --without-tcp-wrappers --with-statedir=/var/lib/nfs \
               --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
-              --enable-mountconfig
-
+              --enable-mountconfig --with-start-statd=/usr/bin/start-statd
+  # move mount helpers to /usr/bin
+  sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile
+  # move osd_login to /usr/bin
+  sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile
   make 
 }
 
 package() {
   cd $srcdir/${pkgname}-${pkgver}
   # fix make install
-  mkdir -p $pkgdir/sbin
   make DESTDIR=$pkgdir install
 
   # support python2 (FS#25120)
-  sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
+  sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
 
   # Configuration
   install -D -m 644 ../exports "$pkgdir/"etc/exports
@@ -89,6 +93,8 @@ package() {
   install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
   install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
   install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
+  # keyutils id_resolver #35463
+  install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf
   # systemd files
   for i in ${srcdir}/*.{service,mount}; do
     install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
@@ -99,3 +105,4 @@ package() {
   mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
   mkdir "$pkgdir/"var/lib/nfs/v4recovery
 }
+