core/nfs-utils to 2.6.2-1

core/nfs-utils/PKGBUILD

@@ -10,26 +10,32 @@
 
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=1
 arch=('x86_64')
 url='http://nfs.sourceforge.net'
 makedepends=('libevent' 'sqlite' 'rpcsvc-proto' 'device-mapper')
+options=('debug')
 # 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}
-        exports)
-# https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc
-sha256sums=('60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df'
+        exports
+        sysusers.d)
+# https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.2/sha256sums.asc
+sha256sums=('5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011'
             'SKIP'
-            'b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d')
+            'b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d'
+            '8e1b6aa59cf5539b9da13cfec217b3ca7b6c32e08df3b0a204901ed2891b2ded')
 validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
 
 prepare() {
   cd "${pkgbase}"-${pkgver}
  
-  # fix hardcoded sbin path to our needs
+  # fix hardcoded sbin/libexec 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
+  sed -i "s|sbin|usr/bin|" systemd/50-nfs.conf
+  sed -i "s|/sbin|/usr/bin|" systemd/50-nfs.conf
+  sed -i "s|libexec|bin|" tools/nfsrahead/99-nfs.rules
   autoreconf -vfi
 }
 
@@ -39,14 +45,16 @@ build() {
   ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
+    --libexecdir=/usr/bin \
+    --with-statedir=/var/lib/nfs \
+    --with-statdpath=/var/lib/nfs/statd \
+    --with-start-statd=/usr/bin/start-statd \
     --enable-nfsv4server \
     --enable-gss \
     --without-tcp-wrappers \
-    --with-statedir=/var/lib/nfs \
     --enable-ipv6 \
     --enable-libmount-mount \
     --enable-mountconfig \
-    --with-start-statd=/usr/bin/start-statd \
     --with-systemd
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
@@ -54,7 +62,8 @@ build() {
 
 check() {
   cd "${pkgbase}"-${pkgver}
-  make -k check || /bin/true
+  #make -k check || /bin/true
+  make check
 }
 
 package_nfs-utils() {
@@ -66,7 +75,7 @@ package_nfs-utils() {
           var/lib/nfs/{etab,rmtab})
   depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper')
   optdepends=('sqlite: for nfsdcltrack usage'
-              'python: for nfsiostat, nfsdclnts and mountstats usage')
+              'python: for rpcctl, nfsiostat, nfsdclnts and mountstats usage')
 
   cd "${pkgbase}"-${pkgver}
   make DESTDIR="$pkgdir" install
@@ -76,7 +85,7 @@ package_nfs-utils() {
   
   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/
 
@@ -90,6 +99,12 @@ package_nfs-utils() {
   mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs
   mkdir "$pkgdir"/var/lib/nfs/v4recovery
 
+  # systemd sysusers - FS#75536
+  install -D -m 644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/rpcuser.conf
+  chown -Rv 34:34 "${pkgdir}"/var/lib/nfs/statd
+  chmod -R 700 "${pkgdir}"/var/lib/nfs/statd
+  chmod 644 "${pkgdir}"/var/lib/nfs/statd/state
+
   # nfsidmap cleanup
   rm -vrf "$pkgdir"/usr/include #/nfsid*
   rm -vrf "$pkgdir"/usr/lib/libnfsidmap*

core/nfs-utils/keys/pgp/E1B71E339E20A10A676F7CB69AFB1D681A125177.asc

@@ -0,0 +1,84 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=SMZD
+-----END PGP PUBLIC KEY BLOCK-----

core/nfs-utils/sysusers.d

@@ -0,0 +1 @@
+u rpcuser 34 "RPC Service User" /var/lib/nfs