- updated to 2.6.1

- removed obsolete types patch and part of x32 patch

diff --git a/nfs-utils-types.patch b/nfs-utils-types.patch
deleted file mode 100644 (file)
index 3ee52d3..0000000
--- a/nfs-utils-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-2.4.3/utils/nfsdcltrack/nfsdcltrack.c.orig       2020-05-17 08:13:59.744382256 +0200
-+++ nfs-utils-2.4.3/utils/nfsdcltrack/nfsdcltrack.c    2020-05-17 08:19:47.068916900 +0200
-@@ -525,7 +525,7 @@
-       if (*tail)
-               return -EINVAL;
- 
--      xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
-+      xlog(D_GENERAL, "%s: grace done. gracetime=%lld", __func__, (long long)gracetime);
- 
-       ret = sqlite_remove_unreclaimed(gracetime);
- 

diff --git a/nfs-utils-x32.patch b/nfs-utils-x32.patch
index 77845175a7705e9bbd650c1dffbd8ca4a3e00d81..71cc5cb686a985d56ec33be0e36385d9dd6d87ba 100644 (file)
--- a/nfs-utils-x32.patch
+++ b/nfs-utils-x32.patch
@@ -20,16 +20,3 @@
                     -f $dir/lib64/libroken.so -o \
                     -f $dir/lib/libroken.so \) ; then
           K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
---- nfs-utils-2.3.3/utils/nfsdcltrack/sqlite.c.orig    2018-09-06 20:09:08.000000000 +0200
-+++ nfs-utils-2.3.3/utils/nfsdcltrack/sqlite.c 2018-12-09 20:41:52.172247084 +0100
-@@ -542,8 +542,8 @@
-       int ret;
-       char *err = NULL;
- 
--      ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
--                      grace_start);
-+      ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %lld",
-+                      (long long)grace_start);
-       if (ret < 0) {
-               return ret;
-       } else if ((size_t)ret >= sizeof(buf)) {

diff --git a/nfs-utils.spec b/nfs-utils.spec
index ee6cc7918286b58ccd98c0f43ebc7799e63616cf..b05b5d86516288853aa2029b2b272b9b4091064c 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -10,12 +10,12 @@ Summary(pt_BR.UTF-8):       Os utilitários para o cliente e servidor NFS do Linux
 Summary(ru.UTF-8):     Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils
-Version:       2.5.4
+Version:       2.6.1
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 7e330130ac9677c34bba5ab512036bef
+# Source0-md5: 43445a3563185963b736a7081979fd08
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -50,7 +50,6 @@ Patch4:               %{name}-heimdal.patch
 Patch5:                %{name}-x32.patch
 Patch6:                libnfsidmap-pluginpath.patch
 Patch7:                %{name}-sh.patch
-Patch8:                %{name}-types.patch
 URL:           http://linux-nfs.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -234,7 +233,6 @@ Statyczna biblioteka libnfsidmap.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 %{__libtoolize}