diff --git a/package/nfs-utils/0001-statd-fix-memory-leak-in-sm_mon_1_svc-when-existing-.patch b/package/nfs-utils/0001-statd-fix-memory-leak-in-sm_mon_1_svc-when-existing-.patch deleted file mode 100644 index d3a5bf991f..0000000000 --- a/package/nfs-utils/0001-statd-fix-memory-leak-in-sm_mon_1_svc-when-existing-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cf80edaeb9b120b7a533e0d3aea2f05cfcab85ae Mon Sep 17 00:00:00 2001 -From: xuchenchen -Date: Sat, 15 Aug 2026 13:58:16 -0400 -Subject: [PATCH] statd: fix memory leak in sm_mon_1_svc() when existing host - re-monitors - -When an already-monitored host sends a new SM_MON request with a -different priv cookie, the code sets existing=1 and reuses the -existing notify_list entry. However, clnt->dns_name is overwritten -with the newly allocated dnsname without freeing the old value, -causing a memory leak. - -Since statd is a long-running daemon, repeated SM_MON requests with -changing cookies will accumulate leaked strings. - -Fix by freeing the old dns_name before overwriting it. - -Signed-off-by: xuchenchen -Signed-off-by: Steve Dickson -Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=cf80edaeb9b120b7a533e0d3aea2f05cfcab85ae ---- - utils/statd/monitor.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c -index c76589ca..76ef16f1 100644 ---- a/utils/statd/monitor.c -+++ b/utils/statd/monitor.c -@@ -187,6 +187,8 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) - NL_MY_VERS(clnt) = id->my_vers; - NL_MY_PROC(clnt) = id->my_proc; - memcpy(NL_PRIV(clnt), argp->priv, SM_PRIV_SIZE); -+ if (existing) -+ free(clnt->dns_name); - clnt->dns_name = dnsname; - - /* --- -2.53.0 - diff --git a/package/nfs-utils/0002-getport-fix-missing-stddef.h-inclusion.patch b/package/nfs-utils/0002-getport-fix-missing-stddef.h-inclusion.patch deleted file mode 100644 index a85390cdec..0000000000 --- a/package/nfs-utils/0002-getport-fix-missing-stddef.h-inclusion.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cec8eeb69dc65eb91e0cb23ebff23530d9397425 Mon Sep 17 00:00:00 2001 -From: Jaipaul Cheernam -Date: Sat, 15 Aug 2026 14:00:36 -0400 -Subject: [PATCH] getport: fix missing stddef.h inclusion - -getport.c uses offsetof() but does not include . On glibc -this works because offsetof is pulled in transitively, but on musl it -is not available without the explicit include, causing: - - getport.c:459:41: error: implicit declaration of function 'offsetof' - -Signed-off-by: Jaipaul Cheernam -Signed-off-by: Steve Dickson -Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=cec8eeb69dc65eb91e0cb23ebff23530d9397425 ---- - support/nfs/getport.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support/nfs/getport.c b/support/nfs/getport.c -index 608e185b..6bd2f713 100644 ---- a/support/nfs/getport.c -+++ b/support/nfs/getport.c -@@ -27,6 +27,7 @@ - #endif - - #include -+#include - #include - #include - #include --- -2.53.0 - diff --git a/package/nfs-utils/0003-exportfs-link-failure-with-disable-nfsdctl.patch b/package/nfs-utils/0003-exportfs-link-failure-with-disable-nfsdctl.patch deleted file mode 100644 index f1668c5b97..0000000000 --- a/package/nfs-utils/0003-exportfs-link-failure-with-disable-nfsdctl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 67ed1bdb1af1c70a5fd3b377a997401b7676b827 Mon Sep 17 00:00:00 2001 -From: jaipaul Cheernam -Date: Sat, 15 Aug 2026 14:20:03 -0400 -Subject: [PATCH] exportfs: link failure with --disable-nfsdctl - -Building nfs-utils 2.9.2 with --disable-nfsdctl fails to link -exportfs. This is a regression from 2.9.1. - -Signed-off-by: Steve Dickson -Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=67ed1bdb1af1c70a5fd3b377a997401b7676b827 ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4ea19715..2ce1e129 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -256,8 +256,6 @@ PKG_CHECK_MODULES(LIBNL3, libnl-3.0 >= 3.1) - PKG_CHECK_MODULES(LIBNLGENL3, libnl-genl-3.0 >= 3.1) - - AC_CHECK_HEADERS(linux/nfsd_netlink.h) --AC_DEFINE([HAVE_NFSD_NETLINK], 1, -- [Define to 1 if nfsd generic netlink support is available]) - - # ensure the system netlink headers have the latest features - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], -@@ -279,6 +277,8 @@ AC_ARG_ENABLE(nfsdctl, - enable_nfsdctl="yes") - AM_CONDITIONAL(CONFIG_NFSDCTL, [test "$enable_nfsdctl" = "yes" ]) - if test "$enable_nfsdctl" = yes; then -+ AC_DEFINE([HAVE_NFSD_NETLINK], 1, -+ [Define to 1 if nfsd generic netlink support is available]) - PKG_CHECK_MODULES(LIBREADLINE, readline) - fi - --- -2.53.0 - diff --git a/package/nfs-utils/0004-getport-Fix-switch-case-on-old-compilers.patch b/package/nfs-utils/0004-getport-Fix-switch-case-on-old-compilers.patch deleted file mode 100644 index 692bc8bd3b..0000000000 --- a/package/nfs-utils/0004-getport-Fix-switch-case-on-old-compilers.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7b886f3502977040461a8b31f5948a128f7069e2 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 20 Aug 2026 01:03:10 +0200 -Subject: [FTBFS,PATCH,nfs-utils 1/1] getport: Fix switch case on old compilers -Cc: Steve Dickson , - Giulio Benetti , - Julien Olivain - -Buildroot distro compiles with fairly old compilers, which defaults to -old C11 standard (some of still used compilers don't even have newer -standard than C11). Workaround code which requires C23 with using { }. - -This fixes error: - - getport.c:460:3: error: a label can only be part of a statement and a declaration is not a statement - size_t path_len = len - offsetof(struct sockaddr_un, sun_path); - ^~~~~~ - -Fixes: 1a6dcd74 ("Removed warnings in nfs_sockaddr2universal()") -Signed-off-by: Petr Vorel -Upstream: https://lore.kernel.org/linux-nfs/20260819232049.438643-1-petr.vorel@gmail.com/ ---- - support/nfs/getport.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/support/nfs/getport.c b/support/nfs/getport.c -index 6bd2f713..18ea0777 100644 ---- a/support/nfs/getport.c -+++ b/support/nfs/getport.c -@@ -456,9 +456,10 @@ char *nfs_sockaddr2universal(const struct sockaddr *sap) - int len = sizeof(struct sockaddr); - - switch (sap->sa_family) { -- case AF_LOCAL: -+ case AF_LOCAL: { - size_t path_len = len - offsetof(struct sockaddr_un, sun_path); - return strndup(sun->sun_path, path_len); -+ } - case AF_INET: - if (inet_ntop(AF_INET, (const void *)&sin->sin_addr.s_addr, - buf, (socklen_t)sizeof(buf)) == NULL) --- -2.53.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 93f8e463a1..1353a1a39d 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.2/sha256sums.asc -sha256 e1dd8a9c95af15492065942cc3b52b1339ffd586baa2280ed86c9d3dc4097e8c nfs-utils-2.9.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/3.1.1/sha256sums.asc +sha256 7dbc05eb8b32828b322872b759a62cb3979cb4118f344dd8616813d1390e84e0 nfs-utils-3.1.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 6e0fb1a04c..4b7c9fc12d 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.9.2 +NFS_UTILS_VERSION = 3.1.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+