- include x32 (ILP32 with 64-bit time_t) fix in types patch; release 2

diff --git a/nfs-utils-types.patch b/nfs-utils-types.patch
index 3be26671b4674a4723f79435dbdfccc8916b46ce..7a7d4ca02cae5714979e3f79336d0f28cedb81a2 100644 (file)
--- a/nfs-utils-types.patch
+++ b/nfs-utils-types.patch
@@ -92,3 +92,14 @@
                __func__, current_epoch, recovery_epoch);
  
  out:
+--- nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c.orig       2019-12-01 08:16:29.090420366 +0100
++++ nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c    2019-12-01 08:16:36.084104443 +0100
+@@ -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__, (uint64_t)gracetime);
+ 
+       ret = sqlite_remove_unreclaimed(gracetime);
+ 

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 1edf9008d61f6400003b0747f002dc11512a8f48..5b78eab28dd36e166f6be303a78b7913df26c9a8 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -11,7 +11,7 @@ Summary(ru.UTF-8):    Утилиты для NFS и демоны поддержки
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils
 Version:       2.4.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz