Accepting request 1308375 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1308375
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=188

nfs-utils-2.8.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725
-size 743952

nfs-utils-2.8.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5
+size 750276

nfs-utils-Fix-build-with-glibc-2.42.patch

@@ -1,55 +0,0 @@
-From 9f974046c37b7c28705d5558328759fff708b1cb Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@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=UTF-8
-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@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 b03a047b0968..748c38e3e966 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;
- 	}
--- 
-2.50.1
-

nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch

@@ -1,42 +0,0 @@
-From c5b1a81310471927f0f42ae9b592c6e06ceb2793 Mon Sep 17 00:00:00 2001
-From: Scott Mayhew <smayhew@redhat.com>
-Date: Tue, 6 May 2025 10:53:14 -0400
-Subject: [PATCH] nfsdctl: fix lockd config during autostart
-
-Be sure to actually send the lockd config values over the netlink
-interface.
-
-While we're at it, get rid of the unused "ret" variable.
-
-Fixes: f61c2ff8 ("nfsdctl: add necessary bits to configure lockd")
-Reviewed-by: Jeff Layton <jlayton@kernel.org>
-Signed-off-by: Scott Mayhew <smayhew@redhat.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/nfsdctl/nfsdctl.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
-index 1fdbb44daf51..c2e342607a6e 100644
---- a/utils/nfsdctl/nfsdctl.c
-+++ b/utils/nfsdctl/nfsdctl.c
-@@ -1417,7 +1417,6 @@ static int lockd_configure(struct nl_sock *sock, int grace)
- {
- 	char *tcp_svc, *udp_svc;
- 	int tcpport = 0, udpport = 0;
--	int ret;
- 
- 	tcp_svc = conf_get_str("lockd", "port");
- 	if (tcp_svc) {
-@@ -1432,6 +1431,8 @@ static int lockd_configure(struct nl_sock *sock, int grace)
- 		if (udpport < 0)
- 			return 1;
- 	}
-+
-+	return lockd_config_doit(sock, LOCKD_CMD_SERVER_SET, grace, tcpport, udpport);
- }
- 
- static int
--- 
-2.50.1
-

nfs-utils.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Wed Sep 24 09:52:29 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Drop rcnfs-client/rcnfs-server symlinks [jsc#PED-266]
+
+-------------------------------------------------------------------
+Mon Sep 15 19:17:31 UTC 2025 - Petr Vorel <pvorel@suse.cz>
+
+- Update to 2.8.4:
+  https://kernel.org/pub/linux/utils/nfs-utils/2.8.4/2.8.4-Changelog
+  https://lore.kernel.org/linux-nfs/6f271c01-cd4b-456b-80ac-77a96b99a1fe@redhat.com/
+  * rpc-statd.service: define dependency on both rpcbind.service and rpcbind.socket
+  * nfsrahead: modify get_device_info logic
+  * Fix build with glibc-2.42
+  * nfsroot-generator: do not fail if nfsroot is not configured
+  * systemd: Add a generator to mount /sysroot via NFSv4 in the initrd
+  * systemd: Allow nfs-idmapd.service to be started without the server
+  * configure.ac: AC_PROG_GCC_TRADITIONAL is obsolete.
+  * nfsdctl: Warning Clean Up
+  * gssd:fix the possible buffer overflow in get_full_hostname
+  * nfsdcld:Fix a memory leak
+  * nfsdctl: fix lockd config during autostart
+  * nfsdctl: debug logging fixups
+  * rpcctl: Add support for `rpcctl switch add-xprt`
+  * rpcctl: Display new rpc_clnt sysfs attributes
+  * rpcctl: Add support for the xprtsec sysfs attribute
+  * rpcctl: Rename {read,write}_addr_file()
+- Add new binary file /usr/lib/systemd/system-generators/nfsroot-generator
+- Remove patches from upstream
+  * nfs-utils-Fix-build-with-glibc-2.42.patch
+  * nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch
+
 -------------------------------------------------------------------
 Thu Jul 31 22:10:40 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
 

nfs-utils.spec

@@ -2,7 +2,6 @@
 # spec file for package nfs-utils
 #
 # Copyright (c) 2025 SUSE LLC and contributors
-# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +22,7 @@
 %endif
 
 Name:           nfs-utils
-Version:        2.8.3
+Version:        2.8.4
 Release:        0
 Summary:        Support Utilities for Kernel nfsd
 License:        GPL-2.0-or-later
@@ -44,8 +43,6 @@ Source24:       rpc-statd-notify.options.conf
 Source25:       rpc-svcgssd.options.conf
 Source26:       nfs.conf
 Source27:       nfs-kernel-server.tmpfiles.conf
-Patch0:         nfs-utils-Fix-build-with-glibc-2.42.patch
-Patch1:         nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -170,8 +167,6 @@ install -D -m 644 %{SOURCE26} %{buildroot}%{_prefix}%{_sysconfdir}/nfs.conf
 mkdir -p -m 755 %{buildroot}%{_prefix}%{_sysconfdir}/nfs.conf.d
 mkdir -p -m 755 %{buildroot}%{_sysconfdir}/nfs.conf.d
 install -D -m 644 %{SOURCE27} %{buildroot}%{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf
-ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server
-ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-client
 # sysconfig-data
 mkdir -p %{buildroot}%{_fillupdir}
 install -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}
@@ -285,7 +280,6 @@ fi
 %{_sbindir}/nfsdcld
 %{_sbindir}/nfsidmap
 %{_sbindir}/nfsstat
-%{_sbindir}/rcnfs-client
 %{_sbindir}/rpc.gssd
 %{_sbindir}/rpc.idmapd
 %{_sbindir}/rpc.statd
@@ -319,6 +313,7 @@ fi
 %dir %{_systemdgeneratordir}
 %{_systemdgeneratordir}/nfs-server-generator
 %{_systemdgeneratordir}/rpc-pipefs-generator
+%{_systemdgeneratordir}/nfsroot-generator
 %{_mandir}/man5/idmapd.conf.5%{ext_man}
 %{_mandir}/man5/nfs.5%{ext_man}
 %{_mandir}/man5/nfs.conf.5%{ext_man}
@@ -368,7 +363,6 @@ fi
 %{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf
 %{_sbindir}/exportfs
 %{_sbindir}/fsidd
-%{_sbindir}/rcnfs-server
 %{_sbindir}/rpc.mountd
 %{_sbindir}/rpc.nfsd
 %{_sbindir}/nfsdcltrack