nfs-utils: update to 2.3.1

1 files changed, 91 insertions, 91 deletions

diff --git a/abs/core/nfs-utils/PKGBUILD b/abs/core/nfs-utils/PKGBUILD
index b94b840..2bcce5c 100644
--- a/abs/core/nfs-utils/PKGBUILD
+++ b/abs/core/nfs-utils/PKGBUILD
@@ -1,111 +1,111 @@
-# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
 # Contributor: abelstr <abel@pinklf.eu>
 # Contributor: Marco Lima <cipparello gmail com>
 
-pkgname=nfs-utils
-pkgver=1.2.9
+pkgbase=nfs-utils
+pkgname=('nfs-utils' 'nfsidmap')
+pkgver=2.3.1
 pkgrel=1
-pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 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' 'sqlite')
-source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common.conf
-	nfs-server.conf
-	exports
-	idmapd.conf
-        nfs
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch
-	rpc-gssd.service
-	rpc-mountd.service
-	rpc-svcgssd.service
-	rpc-idmapd.service
-	rpc-statd.service
-	nfsd.service
-	var-lib-nfs-rpc_pipefs.mount
-	proc-fs-nfsd.mount
-	blkmapd.service
-	nfs-utils.conf
+makedepends=('libevent' 'sqlite')
+# http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary
+source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign}
         id_resolver.conf
-        start-statd.patch)
-install=nfs-utils.install
-optdepends=('sqlite: for nfsdcltrack usage')
-
+        exports)
+# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
+sha256sums=('96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5'
+            'SKIP'
+            'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
+            '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
 
 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
+  cd ${pkgbase}-${pkgver}
+
+  # fix hardcoded sbin path to our needs
+  sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+  autoreconf -vfi
 }
 
 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 \
-              --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
+  cd ${pkgbase}-${pkgver}
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --enable-gss \
+    --without-tcp-wrappers \
+    --with-statedir=/var/lib/nfs \
+    --enable-ipv6 \
+    --enable-libmount-mount \
+    --enable-mountconfig \
+    --with-start-statd=/usr/bin/start-statd
   make 
 }
 
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  # fix make install
-  make DESTDIR=$pkgdir install
-
-  # support python2 (FS#25120)
-  sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
-
-  # Configuration
-  install -D -m 644 ../exports "$pkgdir/"etc/exports
-  install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
-  install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
-  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##*/}"
+check() {
+  cd ${pkgbase}-${pkgver}
+  make -k check || /bin/true
+}
+
+package_nfs-utils() {
+
+  pkgdesc="Support programs for Network File Systems"
+  license=('GPL2')
+
+  backup=(etc/{exports,nfs.conf,nfsmount.conf})
+  depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper')
+  optdepends=('sqlite: for nfsdcltrack usage'
+              'python: for nfsiostat and mountstats usage')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR="$pkgdir" install
+ 
+  install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
+  install -D -m 644 nfs.conf "$pkgdir"/etc/nfs.conf
+  
+  for i in systemd/{*.service,*.mount,*.target}; do
+    install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$(basename $i)
   done
-  install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
-  # directories
-  mkdir "$pkgdir/"etc/exports.d
-  mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
-  mkdir "$pkgdir/"var/lib/nfs/v4recovery
+  install -d -m 755 "$pkgdir"/usr/share/doc/$pkgname
+  install -D -m 644 systemd/README "$pkgdir"/usr/share/doc/$pkgname/README.systemd
+  
+  # docs
+  install -m 644 {NEWS,README} "$pkgdir"/usr/share/doc/$pkgname/
+
+  # empty exports file  
+  install -D -m 644 ../exports "$pkgdir"/etc/exports
+
+  # config file for idmappers in newer kernels
+  install -D -m 644 ../id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf
+
+  mkdir "$pkgdir"/etc/exports.d
+  mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs
+  mkdir "$pkgdir"/var/lib/nfs/v4recovery
+
+  # nfsidmap cleanup
+  rm -vrf $pkgdir/usr/include #/nfsid*
+  rm -vrf $pkgdir/usr/lib/libnfsidmap*
+  rm -vrf $pkgdir/usr/lib/pkgconfig #/libnfsidmap.pc
+  rm -v $pkgdir/usr/share/man/{man3/nfs4_uid_to_name*,man5/idmapd.conf*}
+  rm -rf $pkgdir/usr/share/man/man3
 }
 
-md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'f5e7bba09a46c5c5d7007cac6eff9df5'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2'
-         '6aeb4a80b2a5162f5951438474ea22f3'
-         'ff95ad9275ef774e0a2ea8adfe55ee66'
-         '2e991f0e440b4809e22b6c7689544fc0'
-         '42d0088add3beab0284be1379391382b'
-         '60d82e2d2d19d21ceb72665e54bf913e'
-         '3bcc9901478f4f9ea0a03b67171c13e3'
-         '1cd65909fa0983047f3f06a3ab352401'
-         '8f1b5282795895c9b8ce8430d20cdda6'
-         '8f03e708b230619ffc2a799a48bffb53'
-         '8ac484023d786766d287ccbe878ae4ba'
-         'bed57f7c3911af695ec7b469248c104a'
-         'f8bb29c2ca1ce178e6371091a3e1090d')
+package_nfsidmap() {
+
+  pkgdesc="Library to help mapping IDs, mainly for NFSv4"
+  license=('GPL2')
+  backup=(etc/idmapd.conf)
+  depends=('libldap')
+
+  cd ${pkgbase}-${pkgver}
+  make -C support  DESTDIR="$pkgdir" install
+  # config file  
+  install -D -m 644 support/nfsidmap/idmapd.conf "$pkgdir"/etc/idmapd.conf
+  # license
+  install -Dm644 support/nfsidmap/COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE
+}