Compare commits

...

No commits in common. "devel" and "factory" have entirely different histories.

5 changed files with 19 additions and 76 deletions

View File

@ -1,21 +1,14 @@
From 374a756bc6d372d242dbcc1178f9ac2f34e0ab32 Mon Sep 17 00:00:00 2001
From: Petr Vorel <pvorel@suse.cz>
Date: Tue, 29 Oct 2024 11:10:37 +0100
Subject: [PATCH] exports: Ignore mount --bind
References: bcs#229583, https://bugzilla.suse.com/attachment.cgi?id=110519&action=diff
Upstream-status: SUSE specific workaround for nfs-utils 1.0.7 (SLES10-SP1), still needed?
Signed-off-by: Olaf Kirch <okir@suse.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
support/export/export.c | 2
support/include/misc.h | 3
support/include/nfslib.h | 1
================================================================================
---
support/nfs/exports.c | 2 ++
support/nfs/exports.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index a6816e60..b9143718 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -792,6 +792,8 @@ bad_option:
@@ -684,6 +684,8 @@ bad_option:
} else if (strncmp(opt, "replicas=", 9) == 0) {
ep->e_fslocmethod = FSLOC_REPLICA;
ep->e_fslocdata = strdup(opt+9);
@ -24,6 +17,3 @@ index a6816e60..b9143718 100644
} else if (strncmp(opt, "sec=", 4) == 0) {
active = parse_flavors(opt+4, ep);
if (!active)
--
2.45.2

View File

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

View File

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

View File

@ -1,49 +1,3 @@
-------------------------------------------------------------------
Sat Feb 8 21:30:47 UTC 2025 - Dirk Müller <dmueller@suse.com>
- update to 2.8.2:
* exports: Fix referrals when --enable-junction=no
* nfsidmap(v2): Add guards around [nfsidmap] usages of [sysconf].
* libnsm(v2): fix the safer atomic filenames fix
* libnsm: fix the safer atomic filenames fix
* nfsd: dump default number of threads to 16
* autoconf: don't build nfsdcltrack by default
* nfs(5): Update rsize/wsize options
* nfsdctl: clarify when versions can be set on the man page
* nfsdctl: fix up the help text in version_usage()
* libnsm: safer atomic filenames
* nfs-utils: fixup statd testing simulator host arg
* mount.nfs: retry NFSv3 mount after NFSv4 failure in auto negotiation
-------------------------------------------------------------------
Wed Dec 11 03:18:18 UTC 2024 - William Brown <william.brown@suse.com>
- Require system-user-nobody for nfs-client as the statd user relies
on `nogroup` from this package
-------------------------------------------------------------------
Tue Oct 29 10:05:55 UTC 2024 - Petr Vorel <pvorel@suse.cz>
- Update to version 2.8.1
- https://lore.kernel.org/linux-nfs/4a86eea3-973e-4535-8aa5-f3b8b5f7934d@redhat.com/
- https://kernel.org/pub/linux/utils/nfs-utils/2.8.1/2.8.1-Changelog
- Add new binary nfsdctl
- The default number of nfsd threads is now 16 instead of 8
- Removed patchs from previous releases
- 0001-exportfs-remove-warning-if-neither-subtree_check-or-.patch
- 0002-conffile-don-t-report-error-from-conf_init_file.patch
- 0003-conffile-allow-usr-etc-to-provide-any-config-files-e.patch
- 0004-fsidd-call-anonymous-sockets-by-their-name-only-don-.patch
- 0001-gssd-revert-commit-a5f3b7ccb01c.patch
- 0002-gssd-revert-commit-513630d720bd.patch
- 0003-gssd-switch-to-using-rpc_gss_seccreate.patch
- 0004-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-machine-cr.patch
- 0005-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-user-crede.patch
- 0006-configure-check-for-rpc_gss_seccreate.patch
- Turn nfs-utils-1.0.7-bind-syntax.patch to git patch (bug reference,
easier to refresh via git, likely it can be now removed)
- Add BuildRequires libnl-3.0, readline
-------------------------------------------------------------------
Tue Aug 20 20:21:14 UTC 2024 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@
%endif
Name: nfs-utils
Version: 2.8.2
Version: 2.6.4
Release: 0
Summary: Support Utilities for Kernel nfsd
License: GPL-2.0-or-later
@ -42,6 +42,17 @@ Source25: rpc-svcgssd.options.conf
Source26: nfs.conf
Source27: nfs-kernel-server.tmpfiles.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: 0001-exportfs-remove-warning-if-neither-subtree_check-or-.patch
Patch2: 0002-conffile-don-t-report-error-from-conf_init_file.patch
Patch3: 0003-conffile-allow-usr-etc-to-provide-any-config-files-e.patch
Patch4: 0004-fsidd-call-anonymous-sockets-by-their-name-only-don-.patch
# PATCH-FIX-UPSTREAM: fix build against libtirpc 1.3.5
Patch5: 0001-gssd-revert-commit-a5f3b7ccb01c.patch
Patch6: 0002-gssd-revert-commit-513630d720bd.patch
Patch7: 0003-gssd-switch-to-using-rpc_gss_seccreate.patch
Patch8: 0004-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-machine-cr.patch
Patch9: 0005-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-user-crede.patch
Patch10: 0006-configure-check-for-rpc_gss_seccreate.patch
BuildRequires: e2fsprogs-devel
BuildRequires: gcc-c++
BuildRequires: libtool
@ -55,11 +66,9 @@ BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(libcap)
BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(libkeyutils)
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libtirpc)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mount)
BuildRequires: pkgconfig(readline)
BuildRequires: pkgconfig(sqlite3)
Suggests: python-base
%{?systemd_ordering}
@ -75,8 +84,6 @@ Group: Productivity/Networking/NFS
Requires: keyutils
Requires: netcfg
Requires: rpcbind
# The statd user relies on 'nogroup' from system-user-nobody
Requires: system-user-nobody
Requires(post): %fillup_prereq
Requires(pre): permissions
Obsoletes: nfs-utils < 1.1.0
@ -368,7 +375,6 @@ fi
%{_sbindir}/rpc.mountd
%{_sbindir}/rpc.nfsd
%{_sbindir}/nfsdcltrack
%{_sbindir}/nfsdctl
%{_sbindir}/nfsref
%attr(0755,root,root) %{_sbindir}/nfsdclddb
%attr(0755,root,root) %{_sbindir}/nfsdclnts
@ -380,7 +386,6 @@ fi
%{_mandir}/man8/nfsref.8%{ext_man}
%{_mandir}/man8/rpc.mountd.8%{ext_man}
%{_mandir}/man8/rpc.nfsd.8%{ext_man}
%{_mandir}/man8/nfsdctl.8%{ext_man}
%{_mandir}/man8/nfsdcltrack.8%{ext_man}
%config(noreplace) %{_localstatedir}/lib/nfs/etab
%config(noreplace) %{_localstatedir}/lib/nfs/rmtab