From 1229b705a33f1cfcaba7621eaa17df9fa4f74a0d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 24 Apr 2023 12:48:04 +0000
Subject: [PATCH] core/nfs-utils to 2.6.3-1

---
 core/nfs-utils/PKGBUILD | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 90cc56b1e..107552e8f 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -10,18 +10,17 @@
 
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.6.2
+pkgver=2.6.3
 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
         sysusers.d)
-# https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.2/sha256sums.asc
-sha256sums=('5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011'
+# https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.3/sha256sums.asc
+sha256sums=('38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1'
             'SKIP'
             'b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d'
             '8e1b6aa59cf5539b9da13cfec217b3ca7b6c32e08df3b0a204901ed2891b2ded')
@@ -33,8 +32,6 @@ prepare() {
   # 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
 }
@@ -74,7 +71,7 @@ package_nfs-utils() {
   backup=(etc/{exports,nfs.conf,nfsmount.conf}
           var/lib/nfs/{etab,rmtab})
   depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper')
-  optdepends=('sqlite: for nfsdcltrack usage'
+  optdepends=('sqlite: for nfsdcltrack and fsidd usage'
               'python: for rpcctl, nfsiostat, nfsdclnts and mountstats usage')
 
   cd "${pkgbase}"-${pkgver}
@@ -122,6 +119,11 @@ package_nfsidmap() {
 
   cd "${pkgbase}"-${pkgver}
   make -C support  DESTDIR="$pkgdir" install
+  
+  # part of -utils pkg
+  rm -v "$pkgdir"/usr/bin/fsidd
+  rmdir -v "$pkgdir"/usr/bin
+
   # config file  
   install -D -m 644 support/nfsidmap/idmapd.conf "$pkgdir"/etc/idmapd.conf
   # license