- updated to 2.3.4

- added types patch (don't assume 64-bit long)

diff --git a/nfs-utils-types.patch b/nfs-utils-types.patch
new file mode 100644 (file)
index 0000000..87ac8f9
--- /dev/null
+++ b/nfs-utils-types.patch
@@ -0,0 +1,101 @@
+--- nfs-utils-2.3.4/utils/nfsdcld/sqlite.c.orig        2019-05-10 21:09:49.000000000 +0200
++++ nfs-utils-2.3.4/utils/nfsdcld/sqlite.c     2019-06-01 21:18:49.456790606 +0200
+@@ -55,7 +55,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <limits.h>
+ #include <sqlite3.h>
+ #include <linux/limits.h>
+@@ -535,7 +535,7 @@
+               xlog(L_ERROR, "Unable to begin transaction: %s", err);
+               goto rollback;
+       }
+-      ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";",
++      ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\";",
+                       current_epoch);
+       if (ret < 0) {
+               xlog(L_ERROR, "sprintf failed!");
+@@ -550,7 +550,7 @@
+               xlog(L_ERROR, "Unable to clear records from current epoch: %s", err);
+               goto rollback;
+       }
+-      ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" "
++      ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016"PRIx64"\" "
+                               "SELECT id FROM attached.clients;",
+                               current_epoch);
+       if (ret < 0) {
+@@ -703,7 +703,7 @@
+       int ret;
+       sqlite3_stmt *stmt = NULL;
+ 
+-      ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" "
++      ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016"PRIx64"\" "
+                               "VALUES (?);", current_epoch);
+       if (ret < 0) {
+               xlog(L_ERROR, "sprintf failed!");
+@@ -748,7 +748,7 @@
+       int ret;
+       sqlite3_stmt *stmt = NULL;
+ 
+-      ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" "
++      ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\" "
+                               "WHERE id==?;", current_epoch);
+       if (ret < 0) {
+               xlog(L_ERROR, "sprintf failed!");
+@@ -798,7 +798,7 @@
+       int ret;
+       sqlite3_stmt *stmt = NULL;
+ 
+-      ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM  \"rec-%016lx\" "
++      ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM  \"rec-%016"PRIx64"\" "
+                               "WHERE id==?;", recovery_epoch);
+       if (ret < 0) {
+               xlog(L_ERROR, "sprintf failed!");
+@@ -873,7 +873,7 @@
+               tcur++;
+ 
+               ret = snprintf(buf, sizeof(buf), "UPDATE grace "
+-                              "SET current = %ld, recovery = %ld;",
++                              "SET current = %"PRId64", recovery = %"PRId64";",
+                               (int64_t)tcur, (int64_t)trec);
+               if (ret < 0) {
+                       xlog(L_ERROR, "sprintf failed!");
+@@ -891,7 +891,7 @@
+                       goto rollback;
+               }
+ 
+-              ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" "
++              ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016"PRIx64"\" "
+                               "(id BLOB PRIMARY KEY);",
+                               tcur);
+               if (ret < 0) {
+@@ -915,7 +915,7 @@
+                * values in the grace table, just clear out the records for
+                * the current reboot epoch.
+                */
+-              ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";",
++              ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\";",
+                               tcur);
+               if (ret < 0) {
+                       xlog(L_ERROR, "sprintf failed!");
+@@ -976,7 +976,7 @@
+               goto rollback;
+       }
+ 
+-      ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";",
++      ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016"PRIx64"\";",
+               recovery_epoch);
+       if (ret < 0) {
+               xlog(L_ERROR, "sprintf failed!");
+@@ -1027,7 +1027,7 @@
+               return -EINVAL;
+       }
+ 
+-      ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";",
++      ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016"PRIx64"\";",
+               recovery_epoch);
+       if (ret < 0) {
+               xlog(L_ERROR, "sprintf failed!");

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 2165b9f6eb5eda6dd8b7677eed6ab66c9163a5e8..2eb8f61c551e63cb75b48568f4f3640c48c2cabe 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.3.3
-Release:       2
+Version:       2.3.4
+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: b6c9c032995af1c08fea9fbcc1ce33e9
+# Source0-md5: 70fdbb678c21c4d8b362b43247f4b39a
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -49,6 +49,7 @@ Patch3:               %{name}-union-mount.patch
 Patch4:                %{name}-heimdal.patch
 Patch5:                %{name}-x32.patch
 Patch6:                libnfsidmap-pluginpath.patch
+Patch7:                %{name}-types.patch
 URL:           http://linux-nfs.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -229,6 +230,7 @@ Statyczna biblioteka libnfsidmap.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -475,6 +477,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README html
+%attr(755,root,root) /sbin/nfsdcld
 %attr(755,root,root) /sbin/nfsdcltrack
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
@@ -502,6 +505,7 @@ fi
 %{_mandir}/man8/exportfs.8*
 %{_mandir}/man8/mountd.8*
 %{_mandir}/man8/nfsd.8*
+%{_mandir}/man8/nfsdcld.8*
 %{_mandir}/man8/nfsdcltrack.8*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
@@ -531,7 +535,6 @@ fi
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
 %attr(755,root,root) /sbin/blkmapd
-%attr(755,root,root) /sbin/osd_login
 %attr(755,root,root) /sbin/rpc.gssd
 %attr(755,root,root) %{_sbindir}/mountstats
 %attr(755,root,root) %{_sbindir}/nfsiostat