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

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

@@ -1,33 +0,0 @@
-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-2.4.3.tar.xz

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

nfs-utils-2.5.1.tar.xz

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

nfs-utils.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 14 16:05:08 UTC 2020 - Petr Vorel <pvorel@suse.cz>
+
+- 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 <kukuk@suse.com>
 

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