From d7bfb5ad92dd3802bb0dd058ffce3c6f94df2307ea8579afed37f38640dee1a8 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 15 Jul 2020 03:35:08 +0000 Subject: [PATCH 1/2] Accepting request 820948 from home:pevik:branches:Base:System - Update to version 2.5.1 Dropped patch accepted upstream: 0001-conffile-Don-t-give-warning-for-optional-config-file.patch OBS-URL: https://build.opensuse.org/request/show/820948 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=227 --- ...ive-warning-for-optional-config-file.patch | 33 ------------------- nfs-utils-2.4.3.tar.xz | 3 -- nfs-utils-2.5.1.tar.xz | 3 ++ nfs-utils.changes | 7 ++++ nfs-utils.spec | 4 +-- 5 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 0001-conffile-Don-t-give-warning-for-optional-config-file.patch delete mode 100644 nfs-utils-2.4.3.tar.xz create mode 100644 nfs-utils-2.5.1.tar.xz diff --git a/0001-conffile-Don-t-give-warning-for-optional-config-file.patch b/0001-conffile-Don-t-give-warning-for-optional-config-file.patch deleted file mode 100644 index e96ff4a..0000000 --- a/0001-conffile-Don-t-give-warning-for-optional-config-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Fri, 27 Mar 2020 15:58:24 +1100 -Subject: [PATCH] conffile: Don't give warning for optional config files. - -A recent commit added the possibility of optional config files for which -warning messages would be suppressed. -Unfortunately only one of the possible warning messages - the least -likely one - was suppressed. - -This patch suppresses the other. - -Fixes: c6fdcbe0a5cf ("conffile: allow optional include files") -Signed-off-by: NeilBrown ---- - support/nfs/conffile.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/support/nfs/conffile.c -+++ b/support/nfs/conffile.c -@@ -429,9 +429,9 @@ conf_parse_line(int trans, char *line, c - - subconf = conf_readfile(relpath); - if (subconf == NULL) { -- xlog_warn("config error at %s:%d: " -- "error loading included config", -- filename, lineno); -+ if (!optional) -+ xlog_warn("config error at %s:%d: error loading included config", -+ filename, lineno); - if (relpath) - free(relpath); - return; diff --git a/nfs-utils-2.4.3.tar.xz b/nfs-utils-2.4.3.tar.xz deleted file mode 100644 index 836134b..0000000 --- a/nfs-utils-2.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599 -size 685744 diff --git a/nfs-utils-2.5.1.tar.xz b/nfs-utils-2.5.1.tar.xz new file mode 100644 index 0000000..c13aaf6 --- /dev/null +++ b/nfs-utils-2.5.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f1c8170e16a07d9836bbf0836d48d0c842b6f0e0e8b18748f099751851d30c4 +size 694468 diff --git a/nfs-utils.changes b/nfs-utils.changes index db79b69..3e625c9 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 14 16:05:08 UTC 2020 - Petr Vorel + +- Update to version 2.5.1 + Dropped patch accepted upstream: + 0001-conffile-Don-t-give-warning-for-optional-config-file.patch + ------------------------------------------------------------------- Fri Jun 5 10:02:18 UTC 2020 - Thorsten Kukuk diff --git a/nfs-utils.spec b/nfs-utils.spec index 506034b..6efc072 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -22,7 +22,7 @@ %endif Name: nfs-utils -Version: 2.4.3 +Version: 2.5.1 Release: 0 Summary: Support Utilities for Kernel nfsd License: GPL-2.0-or-later @@ -45,7 +45,6 @@ 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-conffile-Don-t-give-warning-for-optional-config-file.patch BuildRequires: e2fsprogs-devel BuildRequires: fedfs-utils-devel @@ -141,7 +140,6 @@ This package contains additional NFS documentation. %prep %setup -q -a 1 %patch0 -p1 -%patch1 -p1 %build autoreconf -fvi From 12dc548a181a0ac91d9be0b0748637246e34fb434881a95c5569f35a5d8954e7 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 30 Sep 2020 06:29:33 +0000 Subject: [PATCH 2/2] - Remove nfs-doc package. The documentation is 20 years old and barely relevant. (bsc#1171448) - improvements for 64bit time - improvements for SASL referrals - Rename clddb-tool to nfsdclddb - New tools nfsdclnts - Better python3 support - many bug-fixes OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=228 --- nfs-utils.changes | 14 ++++++++++++++ nfs-utils.spec | 33 +++++---------------------------- nfs.doc.tar.bz2 | 3 --- 3 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 nfs.doc.tar.bz2 diff --git a/nfs-utils.changes b/nfs-utils.changes index 3e625c9..4396d5b 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 30 06:24:22 UTC 2020 - Neil Brown + +- Remove nfs-doc package. The documentation is 20 years old + and barely relevant. + (bsc#1171448) + ------------------------------------------------------------------- Tue Jul 14 16:05:08 UTC 2020 - Petr Vorel @@ -5,6 +12,13 @@ Tue Jul 14 16:05:08 UTC 2020 - Petr Vorel Dropped patch accepted upstream: 0001-conffile-Don-t-give-warning-for-optional-config-file.patch + - improvements for 64bit time + - improvements for SASL referrals + - Rename clddb-tool to nfsdclddb + - New tools nfsdclnts + - Better python3 support + - many bug-fixes + ------------------------------------------------------------------- Fri Jun 5 10:02:18 UTC 2020 - Thorsten Kukuk diff --git a/nfs-utils.spec b/nfs-utils.spec index 6efc072..30ad0ee 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -29,9 +29,6 @@ License: GPL-2.0-or-later Group: Productivity/Networking/NFS URL: http://kernel.org/pub/linux/utils/nfs-utils/ Source0: http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz -# Download does not work: -# Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2 -Source1: nfs.doc.tar.bz2 Source4: sysconfig.nfs Source11: idmapd.conf Source12: statd-user.conf @@ -127,18 +124,8 @@ In NFSv4, identities of users are conveyed by names rather than user ID and group ID. Both the NFS server and client code in the kernel need to translate these to numeric IDs. -%package -n nfs-doc -Summary: Support Utilities for NFS -Group: Productivity/Networking/NFS -Requires: latex2html-pngicons -Obsoletes: nfs-utils < 1.1.0 -Supplements: (nfs-utils and patterns-base-documentation) - -%description -n nfs-doc -This package contains additional NFS documentation. - %prep -%setup -q -a 1 +%setup -q %patch0 -p1 %build @@ -159,14 +146,6 @@ export LDFLAGS="-pie" --enable-mountconfig make %{?_smp_mflags} %sysusers_generate_pre %{SOURCE12} statd -cd nfs -for i in *.html ; do -sed -i \ - -e "s@%{_prefix}/lib/latex2html/icons.png/next_motif.png@%{_datadir}/latex2html/icons/next.png@" \ - -e "s@%{_prefix}/lib/latex2html/icons.png/up_motif_gr.png@%{_datadir}/latex2html/icons/up.png@" \ - -e "s@%{_prefix}/lib/latex2html/icons.png/previous_motif_gr.png@%{_datadir}/latex2html/icons/prev.png@" \ - $i -done %install make %{?_smp_mflags} DESTDIR=%{buildroot} install @@ -279,7 +258,8 @@ fi /sbin/umount.nfs4 %attr(0755,root,root) %{_sbindir}/mountstats %attr(0755,root,root) %{_sbindir}/nfsiostat -%{_sbindir}/clddb-tool +%{_sbindir}/nfsdclddb +%{_sbindir}/nfsdclnts %{_sbindir}/nfsdcld %{_sbindir}/nfsidmap %{_sbindir}/nfsstat @@ -313,7 +293,8 @@ fi %dir /usr/lib/systemd/system-generators /usr/lib/systemd/system-generators/nfs-server-generator /usr/lib/systemd/system-generators/rpc-pipefs-generator -%{_mandir}/man8/clddb-tool.8%{ext_man} +%{_mandir}/man8/nfsdclddb.8%{ext_man} +%{_mandir}/man8/nfsdclnts.8%{ext_man} %{_mandir}/man5/nfsmount.conf.5%{ext_man} %{_mandir}/man5/nfs.conf.5%{ext_man} %{_mandir}/man5/nfs.5%{ext_man} @@ -384,8 +365,4 @@ fi %{_mandir}/man3/* %doc support/nfsidmap/README -%files -n nfs-doc -%defattr(-,root,root) -%doc nfs/*.html nfs/*.ps - %changelog diff --git a/nfs.doc.tar.bz2 b/nfs.doc.tar.bz2 deleted file mode 100644 index 7161640..0000000 --- a/nfs.doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8182ddf316a1c72b4edaf982b3f4a76542b6ac792b451e314792dc6b3318210e -size 69695