core/nfs-utils to 2.4.2-1

core/nfs-utils/PKGBUILD

@@ -10,32 +10,31 @@
 
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.4.2
+pkgrel=1
 arch=('x86_64')
 url='http://nfs.sourceforge.net'
 makedepends=('libevent' 'sqlite' 'rpcsvc-proto')
 # 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
         exports)
 # https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
-sha256sums=('85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736'
+sha256sums=('4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038'
             'SKIP'
-            'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
             '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
 validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
 
 prepare() {
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
  
   # fix hardcoded sbin path to our needs
   sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+  sed -i "s|sbin|bin|" utils/nfsidmap/id_resolver.conf
   autoreconf -vfi
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
   CFLAGS+=" -D_FILE_OFFSET_BITS=64"
   ./configure --prefix=/usr \
     --sbindir=/usr/bin \
@@ -51,7 +50,7 @@ build() {
 }
 
 check() {
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
   make -k check || /bin/true
 }
 
@@ -65,7 +64,7 @@ package_nfs-utils() {
   optdepends=('sqlite: for nfsdcltrack usage'
               'python: for nfsiostat and mountstats usage')
 
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
   make DESTDIR="$pkgdir" install
  
   install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
@@ -84,18 +83,18 @@ package_nfs-utils() {
   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
+  install -D -m 644 utils/nfsidmap/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
+  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
 }
 
 package_nfsidmap() {
@@ -105,7 +104,7 @@ package_nfsidmap() {
   backup=(etc/idmapd.conf)
   depends=('libldap')
 
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
   make -C support  DESTDIR="$pkgdir" install
   # config file  
   install -D -m 644 support/nfsidmap/idmapd.conf "$pkgdir"/etc/idmapd.conf

core/nfs-utils/id_resolver.conf

@@ -1,9 +0,0 @@
-#
-# nfsidmap(5) - The NFS idmapper upcall program
-# Summary: Used by NFSv4 to map user/group ids into 
-#          user/group names and names into in ids
-# Options:
-# -v         Increases the verbosity of the output to syslog
-# -t timeout Set the expiration timer, in seconds, on the key
-#
-create id_resolver * * /usr/bin/nfsidmap %k %d