[packages/nfs-utils] - updated to 2.8.4

qboosh qboosh at pld-linux.org
Sun Sep 28 19:19:35 CEST 2025


commit bfbe2b2a969e8a8db5c8f3d74401a6df3a6ebb65
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 28 19:22:38 2025 +0200

    - updated to 2.8.4

 glibc2.42.patch | 55 -------------------------------------------------------
 nfs-utils.spec  | 12 +++++-------
 2 files changed, 5 insertions(+), 62 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 231e46d..986e518 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -12,12 +12,12 @@ Summary(pt_BR.UTF-8):	Os utilitários para o cliente e servidor NFS do Linux
 Summary(ru.UTF-8):	Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
-Version:	2.8.3
-Release:	2
+Version:	2.8.4
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	5a827a1254f878370135e3b3ae49be73
+# Source0-md5:	e5aa4f14759abd4f93b4a68e2bc086ff
 #Source1:	ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:	nfs.doc.tar.gz
 # Source1-md5:	ae7db9c61c5ad04f83bb99e5caed73da
@@ -54,7 +54,6 @@ Patch5:		%{name}-x32.patch
 Patch6:		libnfsidmap-pluginpath.patch
 Patch7:		%{name}-sh.patch
 Patch8:		%{name}-krb5-cache.patch
-Patch9:		glibc2.42.patch
 URL:		http://linux-nfs.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -255,7 +254,6 @@ Statyczna biblioteka libnfsidmap.
 %if %{without krb5}
 %patch -P8 -p1 -R
 %endif
-%patch -P9 -p1
 
 # force regeneration
 %{__rm} tools/nfsrahead/99-nfs.rules
@@ -670,7 +668,7 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
 %attr(755,root,root) /%{_lib}/libnfsidmap.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libnfsidmap.so.1
+%ghost /%{_lib}/libnfsidmap.so.1
 %dir /%{_lib}/libnfsidmap
 %attr(755,root,root) /%{_lib}/libnfsidmap/nsswitch.so
 %attr(755,root,root) /%{_lib}/libnfsidmap/regex.so
@@ -683,7 +681,7 @@ fi
 
 %files -n libnfsidmap-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnfsidmap.so
+%{_libdir}/libnfsidmap.so
 %{_includedir}/nfsidmap.h
 %{_includedir}/nfsidmap_plugin.h
 %{_pkgconfigdir}/libnfsidmap.pc
diff --git a/glibc2.42.patch b/glibc2.42.patch
deleted file mode 100644
index 25b0b10..0000000
--- a/glibc2.42.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9f974046c37b7c28705d5558328759fff708b1cb Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi at redhat.com>
-Date: Fri, 27 Jun 2025 04:54:08 -0500
-Subject: [PATCH] Fix build with glibc-2.42
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-exportfs.c: In function ‘release_lockfile’:
-exportfs.c:83:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
-   83 |                 lockf(_lockfd, F_ULOCK, 0);
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
-exportfs.c: In function ‘grab_lockfile’:
-exportfs.c:77:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
-   77 |                 lockf(_lockfd, F_LOCK, 0);
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
-
-lockf is now marked with attribute warn_unused_result:
-
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f3c82fc1b41261f582f5f9fa12f74af9bcbc88f9
-
-Signed-off-by: Steve Dickson <steved at redhat.com>
----
- utils/exportfs/exportfs.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
-index b03a047..748c38e 100644
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -74,13 +74,19 @@ grab_lockfile(void)
- {
- 	_lockfd = open(lockfile, O_CREAT|O_RDWR, 0666);
- 	if (_lockfd != -1)
--		lockf(_lockfd, F_LOCK, 0);
-+		if (lockf(_lockfd, F_LOCK, 0) != 0) {
-+			xlog_warn("%s: lockf() failed: errno %d (%s)",
-+			__func__, errno, strerror(errno));
-+		}
- }
- static void
- release_lockfile(void)
- {
- 	if (_lockfd != -1) {
--		lockf(_lockfd, F_ULOCK, 0);
-+		if (lockf(_lockfd, F_ULOCK, 0) != 0) {
-+			xlog_warn("%s: lockf() failed: errno %d (%s)",
-+			__func__, errno, strerror(errno));
-+		}
- 		close(_lockfd);
- 		_lockfd = -1;
- 	}
--- 
-1.8.3.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nfs-utils.git/commitdiff/bfbe2b2a969e8a8db5c8f3d74401a6df3a6ebb65



More information about the pld-cvs-commit mailing list