Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / 
nfs-utils


Commits:
59b529bb by Andreas Radke at 2025-01-06T21:14:52+01:00
upgpkg: 2.8.2-2; fix id mapping #2; fully locked system accounts

- - - - -


4 changed files:

- .SRCINFO
- + 0001-fix-nfsidmap-missing-functions.patch
- PKGBUILD
- sysusers.d


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = nfs-utils
        pkgver = 2.8.2
-       pkgrel = 1
+       pkgrel = 2
        url = http://nfs.sourceforge.net
        arch = x86_64
        license = GPL-2.0-or-later
@@ -13,11 +13,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


=====================================
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


=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://nfs.sourceforge.net'
 license=('GPL-2.0-or-later')
@@ -16,16 +16,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


=====================================
sysusers.d
=====================================
@@ -1 +1 @@
-u rpcuser 34 "RPC Service User" /var/lib/nfs
+u! rpcuser 34 "RPC Service User" /var/lib/nfs



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nfs-utils/-/commit/59b529bb9209bcc692c6d10e79e096e4a28517ba

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nfs-utils/-/commit/59b529bb9209bcc692c6d10e79e096e4a28517ba
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to