net-tools, nfstools

update binary path to /usr/bin
refs #961

1 files changed, 46 insertions, 40 deletions

diff --git a/abs/core/nfs-utils/PKGBUILD b/abs/core/nfs-utils/PKGBUILD
index a6ac7ff..b94b840 100644
--- a/abs/core/nfs-utils/PKGBUILD
+++ b/abs/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $
+# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,7 +6,7 @@
 # Contributor: Marco Lima <cipparello gmail com>
 
 pkgname=nfs-utils
-pkgver=1.2.6
+pkgver=1.2.9
 pkgrel=1
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
@@ -14,15 +14,12 @@ url='http://nfs.sourceforge.net'
 license=('GPL')
 backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
 depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake')
+makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite')
 source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common
 	nfs-common.conf
-	nfs-server
 	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
@@ -35,57 +32,43 @@ 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=('8be543ca270c2234ff18f8c8d35e0d37'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         'f5e7bba09a46c5c5d7007cac6eff9df5'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2'
-         '38855936dc55a5afe37d84edc0f11066'
-         '965311784d49a7d126d512cadbe91deb'
-         'e05705d9ccccaeaeb1ecaee20adc05bc'
-         'd7df7bc311fd95c5b80017dd1741570d'
-         '2e72ee082cba5d3ec6f51d2a105664da'
-         '5d33d2e754fd37280365b287603bac90'
-         '1cd65909fa0983047f3f06a3ab352401'
-         '02a34835aa077146a90eb7d191e612d0'
-         '8ffc2ebe932d29efe17d6f3f23d5b975'
-         '8ac484023d786766d287ccbe878ae4ba')
+optdepends=('sqlite: for nfsdcltrack usage')
 
-build() {
+
+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
+}
 
-  ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
+build() {
+  cd $srcdir/${pkgname}-${pkgver}
+  ./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
-
+              --with-gssglue \
+              --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}
 
-  # NFS & NFSv4 init scripts
-  install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
-  install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
   # Configuration
   install -D -m 644 ../exports "$pkgdir/"etc/exports
   install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
@@ -93,6 +76,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##*/}"
@@ -100,6 +85,27 @@ package() {
   install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
   # directories
   mkdir "$pkgdir/"etc/exports.d
-  mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
+  mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
   mkdir "$pkgdir/"var/lib/nfs/v4recovery
 }
+
+md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
+         'f73f197a16b02c3e248488ec35c4cf43'
+         '9cef69bc686cc5dcac23fbb51450747d'
+         'ff585faf410a62c4333a027c50b56bae'
+         'eb4f4027fab6fc1201f1ca04f5954c76'
+         'f5e7bba09a46c5c5d7007cac6eff9df5'
+         '7674106eaaa4c149bccd4f05fe3604e9'
+         '4f4827dfc93008dfadd0a530ad0872b2'
+         '6aeb4a80b2a5162f5951438474ea22f3'
+         'ff95ad9275ef774e0a2ea8adfe55ee66'
+         '2e991f0e440b4809e22b6c7689544fc0'
+         '42d0088add3beab0284be1379391382b'
+         '60d82e2d2d19d21ceb72665e54bf913e'
+         '3bcc9901478f4f9ea0a03b67171c13e3'
+         '1cd65909fa0983047f3f06a3ab352401'
+         '8f1b5282795895c9b8ce8430d20cdda6'
+         '8f03e708b230619ffc2a799a48bffb53'
+         '8ac484023d786766d287ccbe878ae4ba'
+         'bed57f7c3911af695ec7b469248c104a'
+         'f8bb29c2ca1ce178e6371091a3e1090d')