[Buildroot] [RFC][PATCH] package/nfs-utils: bump version to 2.9.2
Petr Vorel <[email protected]>
| Newsgroups | net.busybox.buildroot |
|---|---|
| Message-ID | <[email protected]> |
Remove patches upstreamed in this release. Release announce: https://lore.kernel.org/linux-nfs/[email protected]/ Signed-off-by: Petr Vorel <[email protected]> --- [RFC] Building nfs-utils 2.9.2 with --disable-nfsdctl fails to link exportfs [1]. This is a regression from 2.9.1. Buildroot uses --disable-nfsdctl => we should probably wait for the fix. Kind regards, Petr [1] https://lore.kernel.org/linux-nfs/[email protected]/ ..._file-fix-missing-string.h-inclusion.patch | 28 ------- ....h-file-to-deal-with-old-Linux-api-a.patch | 77 ------------------- ...kend_sqlite.c-fix-getrandom-fallback.patch | 30 -------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 138 deletions(-) delete mode 100644 package/nfs-utils/0001-fh_key_file-fix-missing-string.h-inclusion.patch delete mode 100644 package/nfs-utils/0002-Introduce-compat.h-file-to-deal-with-old-Linux-api-a.patch delete mode 100644 package/nfs-utils/0003-support-backend_sqlite.c-fix-getrandom-fallback.patch diff --git a/package/nfs-utils/0001-fh_key_file-fix-missing-string.h-inclusion.patch b/package/nfs-utils/0001-fh_key_file-fix-missing-string.h-inclusion.patch deleted file mode 100644 index 838d519d5a..0000000000 --- a/package/nfs-utils/0001-fh_key_file-fix-missing-string.h-inclusion.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2d99ff0aa8a3b4d20558bce742edaaed9d24b3cb Mon Sep 17 00:00:00 2001 -From: Giulio Benetti <[email protected]> -Date: Tue, 7 Apr 2026 17:23:13 +0200 -Subject: [PATCH] fh_key_file: fix missing string.h inclusion - -Add #include <string.h> to fix build failure. - -Upstream: https://lore.kernel.org/linux-nfs/[email protected]/T/#t -Signed-off-by: Giulio Benetti <[email protected]> ---- - support/nfs/fh_key_file.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support/nfs/fh_key_file.c b/support/nfs/fh_key_file.c -index 5f5eafc1..81ea1500 100644 ---- a/support/nfs/fh_key_file.c -+++ b/support/nfs/fh_key_file.c -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <unistd.h> - #include <errno.h> -+#include <string.h> - #include <uuid/uuid.h> - - #include "nfslib.h" --- -2.47.3 - diff --git a/package/nfs-utils/0002-Introduce-compat.h-file-to-deal-with-old-Linux-api-a.patch b/package/nfs-utils/0002-Introduce-compat.h-file-to-deal-with-old-Linux-api-a.patch deleted file mode 100644 index c5c57c6503..0000000000 --- a/package/nfs-utils/0002-Introduce-compat.h-file-to-deal-with-old-Linux-api-a.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 218e1b572123f527bd92c17ebb7ac00c2a7e6c01 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti <[email protected]> -Date: Tue, 7 Apr 2026 17:47:40 +0200 -Subject: [PATCH] Introduce compat.h file to deal with old Linux api and fix - build failure due to missing NETLINK_EXT_ACK - -In compat.h check if NETLINK_EXT_ACK exists, otherwise define it to fix -build failure and where at the moment <linux/netlink.h> is included -let's include "compat.h" - -Upstream: https://lore.kernel.org/linux-nfs/[email protected]/T/#u -Signed-off-by: Giulio Benetti <[email protected]> ---- - support/export/cache.c | 2 +- - support/export/cache_flush.c | 2 ++ - support/include/compat.h | 10 ++++++++++ - utils/nfsdctl/nfsdctl.c | 1 + - 4 files changed, 14 insertions(+), 1 deletion(-) - create mode 100644 support/include/compat.h - -diff --git a/support/export/cache.c b/support/export/cache.c -index 2f128d7d..65008f51 100644 ---- a/support/export/cache.c -+++ b/support/export/cache.c -@@ -40,7 +40,7 @@ - #include <netlink/genl/ctrl.h> - #include <netlink/msg.h> - #include <netlink/attr.h> --#include <linux/netlink.h> -+#include "compat.h" - - #ifdef USE_SYSTEM_NFSD_NETLINK_H - #include <linux/nfsd_netlink.h> -diff --git a/support/export/cache_flush.c b/support/export/cache_flush.c -index ed7b964f..2a24dec7 100644 ---- a/support/export/cache_flush.c -+++ b/support/export/cache_flush.c -@@ -38,6 +38,8 @@ extern int no_netlink; - #include "sunrpc_netlink.h" - #endif - -+#include "compat.h" -+ - static int nl_send_flush(struct nl_sock *sock, int family, int cmd) - { - struct nl_msg *msg; -diff --git a/support/include/compat.h b/support/include/compat.h -new file mode 100644 -index 00000000..83229b65 ---- /dev/null -+++ b/support/include/compat.h -@@ -0,0 +1,10 @@ -+#ifndef COMPAT_H -+#define COMPAT_H -+ -+#include <linux/netlink.h> -+ -+#ifndef NETLINK_EXT_ACK -+#define NETLINK_EXT_ACK 11 -+#endif -+ -+#endif /* COMPAT_H */ -diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c -index 016dd2eb..c7126748 100644 ---- a/utils/nfsdctl/nfsdctl.c -+++ b/utils/nfsdctl/nfsdctl.c -@@ -26,6 +26,7 @@ - #include <netlink/msg.h> - #include <netlink/attr.h> - #include <linux/netlink.h> -+#include "compat.h" - - #include <readline/readline.h> - #include <readline/history.h> --- -2.47.3 - diff --git a/package/nfs-utils/0003-support-backend_sqlite.c-fix-getrandom-fallback.patch b/package/nfs-utils/0003-support-backend_sqlite.c-fix-getrandom-fallback.patch deleted file mode 100644 index 86d615ca34..0000000000 --- a/package/nfs-utils/0003-support-backend_sqlite.c-fix-getrandom-fallback.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dbd44e7d6d4140e5e9d01f0a6daf6f3e45e5acbc Mon Sep 17 00:00:00 2001 -From: Giulio Benetti <[email protected]> -Date: Wed, 8 Apr 2026 14:28:28 +0200 -Subject: [PATCH] support/backend_sqlite.c: fix getrandom() fallback - -In old Linux/Glibc versions __NR_getrandom is defined in <sys/random.h> -so let's add it to fix build failure. - -Upstream: https://lore.kernel.org/linux-nfs/[email protected]/T/#u -Signed-off-by: Giulio Benetti <[email protected]> ---- - support/reexport/backend_sqlite.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/support/reexport/backend_sqlite.c b/support/reexport/backend_sqlite.c -index 0eb5ea37..a1e981e4 100644 ---- a/support/reexport/backend_sqlite.c -+++ b/support/reexport/backend_sqlite.c -@@ -9,6 +9,8 @@ - #include <string.h> - #include <unistd.h> - -+#include <sys/syscall.h> -+ - #ifdef HAVE_GETRANDOM - # include <sys/random.h> - # if !defined(SYS_getrandom) && defined(__NR_getrandom) --- -2.47.3 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 19315e60a3..93f8e463a1 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.9.1/sha256sums.asc -sha256 302846343bf509f8f884c23bdbd0fe853b7f7cbb6572060a9082279d13b21a2c nfs-utils-2.9.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.9.2/sha256sums.asc +sha256 e1dd8a9c95af15492065942cc3b52b1339ffd586baa2280ed86c9d3dc4097e8c nfs-utils-2.9.2.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index df9fdbc052..8a3a745316 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.9.1 +NFS_UTILS_VERSION = 2.9.2 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.53.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot