Accepting request 788739 from Base:System

- Improve the hack to avoid python dependencies.
  A new python script had been added since that hack was written.
  (boo#1166067)

- 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
  Support optional include files correctly
  (boo#1164619)

- 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

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

0001-conffile-Don-t-give-warning-for-optional-config-file.patch

@@ -0,0 +1,33 @@
+From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@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 <neilb@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-utils.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Mar 27 05:29:36 UTC 2020 - Neil Brown <nfbrown@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 <nfbrown@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 <pvorel@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
+
 -------------------------------------------------------------------
 Mon Mar  9 10:04:10 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 

nfs-utils.spec

@@ -46,6 +46,7 @@ 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
@@ -144,6 +145,7 @@ This package contains additional NFS documentation.
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE6} .
 
@@ -202,7 +204,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 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}/

nfs.conf

@@ -17,8 +17,11 @@ include = -/etc/nfs.conf.local
 # 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 @@ include = -/etc/nfs.conf.local
 #
 [mountd]
 # debug=0
-# manage_gids=n
+# manage-gids=n
 # descriptors=0
  port= $MOUNTD_PORT
 # threads=1
@@ -52,7 +55,7 @@ include = -/etc/nfs.conf.local
 # port=0
 # grace-time=90
  lease-time=$NFSV4LEASETIME
-# udp=y
+# udp=n
 # tcp=y
 # vers2=n
  vers3=$NFS3_SERVER_SUPPORT
@@ -61,6 +64,7 @@ include = -/etc/nfs.conf.local
 # vers4.1=y
 # vers4.2=y
 # rdma=n
+# rdma-port=20049
 #
 [statd]
 # debug=0
@@ -69,12 +73,15 @@ include = -/etc/nfs.conf.local
  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=