From c997a26fe392eca659371f6250daa85534e0509e Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Sun, 9 Feb 2025 17:47:49 +0100
Subject: [PATCH] * update nfs-utils to 2.8.2-2

---
 nfs-utils/.SRCINFO                            |  6 ++--
 .../0001-fix-nfsidmap-missing-functions.patch | 28 +++++++++++++++++++
 nfs-utils/PKGBUILD                            | 11 ++++++--
 nfs-utils/sysusers.d                          |  2 +-
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 nfs-utils/0001-fix-nfsidmap-missing-functions.patch

diff --git a/nfs-utils/.SRCINFO b/nfs-utils/.SRCINFO
index ad7f8aa200..a673662ac6 100644
--- a/nfs-utils/.SRCINFO
+++ b/nfs-utils/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nfs-utils
 	pkgver = 2.8.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://nfs.sourceforge.net
 	arch = x86_64
 	arch = powerpc64le
@@ -17,11 +17,13 @@ pkgbase = nfs-utils
 	source = https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.2/nfs-utils-2.8.2.tar.sign
 	source = exports
 	source = sysusers.d
+	source = 0001-fix-nfsidmap-missing-functions.patch
 	validpgpkeys = E1B71E339E20A10A676F7CB69AFB1D681A125177
 	sha256sums = a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15
 	sha256sums = SKIP
 	sha256sums = b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d
-	sha256sums = 8e1b6aa59cf5539b9da13cfec217b3ca7b6c32e08df3b0a204901ed2891b2ded
+	sha256sums = 61a3fbe55e30bc9c5da17a76e772c8be1cc695e0142a144c15f0f9aa46ab9ce0
+	sha256sums = 74a9c27fa82e4d4411d99ed65712363467dabcb17c76f9a9ae9d7c3ebb50994e
 
 pkgname = nfs-utils
 	pkgdesc = Support programs for Network File Systems
diff --git a/nfs-utils/0001-fix-nfsidmap-missing-functions.patch b/nfs-utils/0001-fix-nfsidmap-missing-functions.patch
new file mode 100644
index 0000000000..81898d4ab5
--- /dev/null
+++ b/nfs-utils/0001-fix-nfsidmap-missing-functions.patch
@@ -0,0 +1,28 @@
+diff --git a/support/nfsidmap/Makefile.am b/support/nfsidmap/Makefile.am
+index f5b9de0e..3a204882 100644
+--- a/support/nfsidmap/Makefile.am
++++ b/support/nfsidmap/Makefile.am
+@@ -40,19 +40,19 @@ nsswitch_la_SOURCES = nss.c nfsidmap_common.c
+ nsswitch_la_LDFLAGS = -module -avoid-version
+ nsswitch_la_LIBADD = ../../support/nfs/libnfsconf.la
+ 
+-static_la_SOURCES = static.c
++static_la_SOURCES = static.c nfsidmap_common.c
+ static_la_LDFLAGS = -module -avoid-version
+ static_la_LIBADD = ../../support/nfs/libnfsconf.la
+ 
+-regex_la_SOURCES = regex.c
++regex_la_SOURCES = regex.c nfsidmap_common.c
+ regex_la_LDFLAGS = -module -avoid-version
+ regex_la_LIBADD = ../../support/nfs/libnfsconf.la
+ 
+-umich_ldap_la_SOURCES = umich_ldap.c
++umich_ldap_la_SOURCES = umich_ldap.c nfsidmap_common.c
+ umich_ldap_la_LDFLAGS = -module -avoid-version
+ umich_ldap_la_LIBADD = -lldap $(KRB5_GSS_LIB) ../../support/nfs/libnfsconf.la
+ 
+-gums_la_SOURCES = gums.c
++gums_la_SOURCES = gums.c nfsidmap_common.c
+ gums_la_LDFLAGS = -module -avoid-version
+ 
+ man3_MANS = nfs4_uid_to_name.3
diff --git a/nfs-utils/PKGBUILD b/nfs-utils/PKGBUILD
index b19a0643a7..661ccb0b24 100644
--- a/nfs-utils/PKGBUILD
+++ b/nfs-utils/PKGBUILD
@@ -9,7 +9,7 @@
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='http://nfs.sourceforge.net'
 license=('GPL-2.0-or-later')
@@ -17,16 +17,21 @@ makedepends=('libevent' 'sqlite' 'rpcsvc-proto' 'device-mapper' 'libnl')
 # 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)
+        sysusers.d
+        0001-fix-nfsidmap-missing-functions.patch)
 # https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.8.2/sha256sums.asc
 sha256sums=('a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15'
             'SKIP'
             'b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d'
-            '8e1b6aa59cf5539b9da13cfec217b3ca7b6c32e08df3b0a204901ed2891b2ded')
+            '61a3fbe55e30bc9c5da17a76e772c8be1cc695e0142a144c15f0f9aa46ab9ce0'
+            '74a9c27fa82e4d4411d99ed65712363467dabcb17c76f9a9ae9d7c3ebb50994e')
 validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
 
 prepare() {
   cd "${pkgbase}"-${pkgver}
+
+  # fix user id mapping - #2
+  patch -Np1 -i ../0001-fix-nfsidmap-missing-functions.patch
  
   # fix hardcoded sbin/libexec path to our needs
   sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
diff --git a/nfs-utils/sysusers.d b/nfs-utils/sysusers.d
index 4399cd7db0..b6a8a715d1 100644
--- a/nfs-utils/sysusers.d
+++ b/nfs-utils/sysusers.d
@@ -1 +1 @@
-u rpcuser 34 "RPC Service User" /var/lib/nfs
+u! rpcuser 34 "RPC Service User" /var/lib/nfs