All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1
@ 2022-01-22 18:50 Petr Vorel
  2022-01-22 18:50 ` [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions Petr Vorel
  2022-01-22 19:13 ` [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 Yann E. MORIN
  0 siblings, 2 replies; 6+ messages in thread
From: Petr Vorel @ 2022-01-22 18:50 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti

This version dropped support to NFSv2.

Drop patches backported from this release.

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Changes v1->v2:
* note dropped NFSv2 support

 ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 ---------------
 ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 --------------
 ...track-Use-uint64_t-instead-of-time_t.patch | 66 -------------------
 package/nfs-utils/nfs-utils.hash              |  4 +-
 package/nfs-utils/nfs-utils.mk                |  2 +-
 5 files changed, 3 insertions(+), 169 deletions(-)
 delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch
 delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch
 delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch

diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch
deleted file mode 100644
index 14894602c4..0000000000
--- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel () gmail ! com>
-Date: Thu, 22 Jul 2021 16:15:44 +0000
-Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format
-
-sqlite.c: In function 'sqlite_remove_unreclaimed':
-sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]
-  547 |  ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
-      |                                                                     ~~^
-      |                                                                       |
-      |                                                                       long int
-      |                                                                     %lld
-  548 |    grace_start);
-      |    ~~~~~~~~~~~
-      |    |
-      |    time_t {aka long long int}
-
-Found in Buildroot riscv32 build.
-
-Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log
-
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
-Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
- utils/nfsdcltrack/sqlite.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
-index f79aebb3..cea4a411 100644
---- a/utils/nfsdcltrack/sqlite.c
-+++ b/utils/nfsdcltrack/sqlite.c
-@@ -46,6 +46,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <fcntl.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <sqlite3.h>
- #include <linux/limits.h>
-@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start)
- 	int ret;
- 	char *err = NULL;
- 
--	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
-+	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64,
- 			grace_start);
- 	if (ret < 0) {
- 		return ret;
--- 
-2.25.1
-
diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch
deleted file mode 100644
index 0893959460..0000000000
--- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel () gmail ! com>
-Date: Thu, 22 Jul 2021 16:15:45 +0000
-Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format
-
-nfsdcltrack.c: In function 'cltrack_gracedone':
-nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]
-  528 |  xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
-      |                                             ~~^             ~~~~~~~~~
-      |                                               |             |
-      |                                               long int      time_t {aka long long int}
-      |                                             %lld
-
-Found in Buildroot riscv32 build.
-
-Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log
-
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
-Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
- utils/nfsdcltrack/nfsdcltrack.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
-index e926f1c0..0b37c094 100644
---- a/utils/nfsdcltrack/nfsdcltrack.c
-+++ b/utils/nfsdcltrack/nfsdcltrack.c
-@@ -33,6 +33,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <fcntl.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <libgen.h>
- #include <sys/inotify.h>
-@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr)
- 	if (*tail)
- 		return -EINVAL;
- 
--	xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
-+	xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime);
- 
- 	ret = sqlite_remove_unreclaimed(gracetime);
- 
--- 
-2.25.1
-
diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch
deleted file mode 100644
index 384f4fd806..0000000000
--- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Tue, 27 Jul 2021 21:12:17 -0400
-Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t
-
-With recent commits (4f2a5b64,5a53426c) that fixed
-compile errors on x86_64 machines, caused similar
-errors on i686 machines.
-
-The variable type that was being used was a time_t,
-which changes size between architects, which
-caused the compile error.
-
-Changing the variable to uint64_t fixed the issue.
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
-Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
----
- utils/nfsdcltrack/nfsdcltrack.c | 2 +-
- utils/nfsdcltrack/sqlite.c      | 2 +-
- utils/nfsdcltrack/sqlite.h      | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
-index 0b37c094..7c1c4bcc 100644
---- a/utils/nfsdcltrack/nfsdcltrack.c
-+++ b/utils/nfsdcltrack/nfsdcltrack.c
-@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr)
- {
- 	int ret;
- 	char *tail;
--	time_t gracetime;
-+	uint64_t gracetime;
- 
- 
- 	ret = sqlite_prepare_dbh(storagedir);
-diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
-index cea4a411..cf0c6a45 100644
---- a/utils/nfsdcltrack/sqlite.c
-+++ b/utils/nfsdcltrack/sqlite.c
-@@ -540,7 +540,7 @@ out_err:
-  * remove any client records that were not reclaimed since grace_start.
-  */
- int
--sqlite_remove_unreclaimed(time_t grace_start)
-+sqlite_remove_unreclaimed(uint64_t grace_start)
- {
- 	int ret;
- 	char *err = NULL;
-diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h
-index 06e7c044..ba8cdfa8 100644
---- a/utils/nfsdcltrack/sqlite.h
-+++ b/utils/nfsdcltrack/sqlite.h
-@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen,
- int sqlite_remove_client(const unsigned char *clname, const size_t namelen);
- int sqlite_check_client(const unsigned char *clname, const size_t namelen,
- 				const bool has_session);
--int sqlite_remove_unreclaimed(const time_t grace_start);
-+int sqlite_remove_unreclaimed(const uint64_t grace_start);
- int sqlite_query_reclaiming(const time_t grace_start);
- 
- #endif /* _SQLITE_H */
--- 
-2.32.0
-
diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash
index 2073bebd8a..a73bf80e70 100644
--- a/package/nfs-utils/nfs-utils.hash
+++ b/package/nfs-utils/nfs-utils.hash
@@ -1,4 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc
-sha256  51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd  nfs-utils-2.5.4.tar.xz
+# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc
+sha256  60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df  nfs-utils-2.6.1.tar.xz
 # Locally computed
 sha256  576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de  COPYING
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 07b44b5a93..6a3a801359 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NFS_UTILS_VERSION = 2.5.4
+NFS_UTILS_VERSION = 2.6.1
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
 NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
 NFS_UTILS_LICENSE = GPL-2.0+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-22 19:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-22 18:50 [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 Petr Vorel
2022-01-22 18:50 ` [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions Petr Vorel
2022-01-22 19:02   ` Giulio Benetti
2022-01-22 19:14   ` Yann E. MORIN
2022-01-22 19:35     ` Petr Vorel
2022-01-22 19:13 ` [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.