$ git show --format=fuller --patch-with-stat --summary 9d2be5605a7868c9575e9f1b1b27d4f14aad0662
commit 9d2be5605a7868c9575e9f1b1b27d4f14aad0662
Author: Alex <alexander@mezon.ru>
AuthorDate: Thu Nov 21 21:59:13 2019 +0000
Commit: Alex <alexander@mezon.ru>
CommitDate: Thu Nov 21 21:59:13 2019 +0000
2.4.2
---
.abf.yml | 2 +-
nfs-utils-1.2.5-idmap-errmsg.patch | 11 -----------
nfs-utils-2.3.4-no-werror.patch | 18 +++++++++---------
nfs-utils.spec | 9 +++++----
4 files changed, 15 insertions(+), 25 deletions(-)
delete mode 100644 nfs-utils-1.2.5-idmap-errmsg.patch
diff --git a/.abf.yml b/.abf.yml
index b10be01..d50f6d9 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- nfs-utils-2.4.1.tar.xz: b38024832abe8b6906ffd6082c609227122b5c7b
+ nfs-utils-2.4.2.tar.xz: 094fc4ff082721e6692d10f75f95e47ab306fa4c
diff --git a/nfs-utils-1.2.5-idmap-errmsg.patch b/nfs-utils-1.2.5-idmap-errmsg.patch
deleted file mode 100644
index 78184a9..0000000
--- a/nfs-utils-1.2.5-idmap-errmsg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.4/utils/nfsidmap/nfsidmap.c.0103~ 2016-12-07 00:55:07.497215538 +0100
-+++ nfs-utils-1.3.4/utils/nfsidmap/nfsidmap.c 2016-12-07 00:56:17.520410732 +0100
-@@ -431,7 +431,7 @@ int main(int argc, char **argv)
-
- xlog_stderr(verbose);
- if ((argc - optind) != 2) {
-- xlog_warn("Bad arg count. Check /etc/request-key.conf");
-+ xlog_warn("Bad arg count. Check /etc/request-key.d/id_resolver.conf");
- xlog_warn(usage, progname);
- return EXIT_FAILURE;
- }
diff --git a/nfs-utils-2.3.4-no-werror.patch b/nfs-utils-2.3.4-no-werror.patch
index 7fc0dd1..d50a066 100644
--- a/nfs-utils-2.3.4-no-werror.patch
+++ b/nfs-utils-2.3.4-no-werror.patch
@@ -1,20 +1,20 @@
-From 04c9e3cc26dd330d9cb524c02de610c3bccd4b7b Mon Sep 17 00:00:00 2001
+From b7df6ae89846104b99f46336592b928a5421c3d8 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 11 May 2019 22:51:35 +0200
+Date: Sat, 16 Nov 2019 12:04:48 +0100
Subject: [PATCH] Don't build with -Werror flags
https://bugs.gentoo.org/656984
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
- configure.ac | 34 +---------------------------------
- 1 file changed, 1 insertion(+), 33 deletions(-)
+ configure.ac | 33 +--------------------------------
+ 1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 4d70961..e6e709c 100644
+index 9ba9d4b5..26663264 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -574,46 +574,14 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
+@@ -581,47 +581,16 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
AC_SUBST(LDFLAGS_FOR_BUILD)
my_am_cflags="\
@@ -56,12 +56,12 @@ index 4d70961..e6e709c 100644
-CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
-CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
-CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
--
+ AX_GCC_FUNC_ATTRIBUTE([format])
+
-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
+AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
# Make sure that $ACLOCAL_FLAGS are used during a rebuild
AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
--
-2.21.0
-
+2.24.0
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 8a38923..5a11859 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -6,8 +6,8 @@
Summary: The utilities for Linux NFS server
Name: nfs-utils
Epoch: 1
-Version: 2.4.1
-Release: 2
+Version: 2.4.2
+Release: 1
Group: Networking/Other
License: GPLv2
Url: http://linux-nfs.org/
@@ -35,8 +35,7 @@ Source60: nfs4-modalias.conf
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
-Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
-Patch104: nfs-utils-2.3.4-no-werror.patch
+Patch102: nfs-utils-2.3.4-no-werror.patch
BuildRequires: keyutils-devel
BuildRequires: pkgconfig(com_err)
@@ -235,10 +234,12 @@ chmod 0755 %{buildroot}/sbin/mount.nfs
%{_sbindir}/nfsconf
%{_sbindir}/rpc.idmapd
%{_sbindir}/rpc.gssd
+%{_sbindir}/clddb-tool
%{_mandir}/man5/*
%{_mandir}/man7/*
%{_mandir}/man8/exportfs.8*
%{_mandir}/man8/nfsconf.8*
+%{_mandir}/man8/clddb-tool.8*
%{_mandir}/man8/mountd.8*
%{_mandir}/man8/nfsd.8*
%{_mandir}/man8/rpc.mountd.8*