[arch-commits] Commit in nfs-utils/trunk (PKGBUILD id_resolver.conf)

[Andreas Radke]

    Date: Friday, November 15, 2019 @ 17:21:43
  Author: andyrtr
Revision: 368928

upgpkg: nfs-utils 2.4.2-1

upstream update 2.4.2; use upstream id_resolver.conf

Modified:
  nfs-utils/trunk/PKGBUILD
Deleted:
  nfs-utils/trunk/id_resolver.conf

------------------+
 PKGBUILD         |   11 +++++------
 id_resolver.conf |    9 ---------
 2 files changed, 5 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-15 16:38:25 UTC (rev 368927)
+++ PKGBUILD	2019-11-15 17:21:43 UTC (rev 368928)
@@ -7,19 +7,17 @@
 
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.4.1
-pkgrel=3
+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
 
@@ -28,6 +26,7 @@
  
   # 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
 }
 
@@ -80,7 +79,7 @@
   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

Deleted: id_resolver.conf
===================================================================
--- id_resolver.conf	2019-11-15 16:38:25 UTC (rev 368927)
+++ id_resolver.conf	2019-11-15 17:21:43 UTC (rev 368928)
@@ -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