Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-03-31 17:31:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils"
Tue Mar 31 17:31:47 2020 rev:153 rq:788739 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-03-16
10:16:27.819541420 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3160/nfs-utils.changes
2020-03-31 17:31:53.684248169 +0200
@@ -1,0 +2,23 @@
+Fri Mar 27 05:29:36 UTC 2020 - Neil Brown <nfbr...@suse.com>
+
+- Improve the hack to avoid python dependencies.
+ A new python script had been added since that hack was written.
+ (boo#1166067)
+
+-------------------------------------------------------------------
+Fri Mar 27 05:06:12 UTC 2020 - Neil Brown <nfbr...@suse.com>
+
+- 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
+ Support optional include files correctly
+ (boo#1164619)
+
+-------------------------------------------------------------------
+Tue Mar 24 10:13:53 UTC 2020 - Petr Vorel <pvo...@suse.cz>
+
+- Update nfs.conf
+ - change value: udp=n (disabled in 2.2.1.)
+ - update name: manage-gids
+ - new: verbosity=0, rpc-verbosity=0, use-gss-proxy=0, rdma-port=20049,
+ no-notify=0, force=0, lift-grace=y
+
+-------------------------------------------------------------------
New:
----
0001-conffile-Don-t-give-warning-for-optional-config-file.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfs-utils.spec ++++++
--- /var/tmp/diff_new_pack.xklr0N/_old 2020-03-31 17:31:55.136249019 +0200
+++ /var/tmp/diff_new_pack.xklr0N/_new 2020-03-31 17:31:55.144249024 +0200
@@ -46,6 +46,7 @@
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
@@ -144,6 +145,7 @@
%prep
%setup -q -a 1
%patch0 -p1
+%patch1 -p1
cp %{SOURCE6} .
@@ -202,7 +204,7 @@
install -m 644 utils/mount/nfsmount.conf
%{buildroot}%{_sysconfdir}/nfsmount.conf
#
# hack to avoid automatic python dependency
-chmod 644 %{buildroot}%{_sbindir}/{mountstats,nfsiostat}
+chmod 644 `grep -l -r '^#!/usr/bin/python' %{buildroot}%{_sbindir}`
# Install sysusers.d template
mkdir -p %{buildroot}%{_sysusersdir}
install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
++++++ 0001-conffile-Don-t-give-warning-for-optional-config-file.patch ++++++
>From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001
From: NeilBrown <ne...@suse.de>
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 <ne...@suse.de>
---
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;
++++++ nfs.conf ++++++
--- /var/tmp/diff_new_pack.xklr0N/_old 2020-03-31 17:31:55.312249122 +0200
+++ /var/tmp/diff_new_pack.xklr0N/_new 2020-03-31 17:31:55.312249122 +0200
@@ -17,8 +17,11 @@
# debug=0
#
#[gssd]
+# verbosity=0
+# rpc-verbosity=0
# use-memcache=0
# use-machine-creds=1
+# use-gss-proxy=0
avoid-dns=$NFS_GSSD_AVOID_DNS
# limit-to-legacy-enctypes=0
# context-timeout=0
@@ -33,7 +36,7 @@
#
[mountd]
# debug=0
-# manage_gids=n
+# manage-gids=n
# descriptors=0
port= $MOUNTD_PORT
# threads=1
@@ -52,7 +55,7 @@
# port=0
# grace-time=90
lease-time=$NFSV4LEASETIME
-# udp=y
+# udp=n
# tcp=y
# vers2=n
vers3=$NFS3_SERVER_SUPPORT
@@ -61,6 +64,7 @@
# vers4.1=y
# vers4.2=y
# rdma=n
+# rdma-port=20049
#
[statd]
# debug=0
@@ -69,12 +73,15 @@
name=$STATD_HOSTNAME
# state-directory-path=/var/lib/nfs/statd
# ha-callout=
+# no-notify=0
#
#[sm-notify]
# debug=0
+# force=0
# retry-time=900
# outgoing-port=
# outgoing-addr=
+# lift-grace=y
#
#[svcgssd]
# principal=
