[Buildroot] [PATCH v3 0/2] libnfs fix and bump

[Buildroot] [PATCH v3 0/2] libnfs fix and bump

[Thomas Petazzoni via buildroot]

Hello,

This is a small v3 that builds on top of what Andreas Ziegler
proposed.

Changes v2 -> v3:

- Properly add my own changes that I had forgotten to integrate in the
  libnfs bump commit

Changes v1 -> v2:

- split the fix into a separate commit that can be backported to
  2026.05.x

- bump to 7.0.1 instead of 7.0.0

Best regards,

Thomas Petazzoni

Andreas Ziegler (1):
  package/libnfs: bump version to 7.0.1

Thomas Petazzoni (1):
  package/libnfs: fix gnutls support

 ...t-and-use-const-qualifier-from-point.patch |  37 ------
 ...t-qualifier-from-pointer-target-type.patch | 117 ------------------
 ...void-cast-to-allow-compile-for-arm32.patch |  68 ----------
 package/libnfs/libnfs.hash                    |   2 +-
 package/libnfs/libnfs.mk                      |   2 +-
 5 files changed, 2 insertions(+), 224 deletions(-)
 delete mode 100644 package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch
 delete mode 100644 package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch
 delete mode 100644 package/libnfs/0003-socket-use-void-cast-to-allow-compile-for-arm32.patch

-- 
2.55.0

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

[Buildroot] [PATCH v3 1/2] package/libnfs: fix gnutls support

[Thomas Petazzoni via buildroot]

In Buildroot commit a035a0f99fa3bbeca776d741bbdeb6c04b3b35c8, libnfs
was bumped from 5.0.3 to 6.0.2, and 6.0.2 brought optional gnutls
support.

Unfortunately, the gnutls support was a bit buggy, as the libnfs
library ends up using gnutls symbols without being linked to
libgnutls, causing build failures down the road when other packages
try to link against libnfs.

We backport 3 commits from upstream 6.0.2..7.0.0 to address this
issue.

Fixes:

  https://autobuild.buildroot.net/results/b070248b2bceaceaaed8e826b1247ccfba1ba9fb
  https://autobuild.buildroot.net/results/e1461b76121addd8f04f08819b2e3e453a12c679
  https://autobuild.buildroot.net/results/87c79193d2ea86f47e36232fe514837ad99c5f30

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 ...t-gnutls-into-main-library-as-it-is-.patch | 26 ++++++++++++
 ...t-gnutls-into-main-library-as-it-is-.patch | 29 +++++++++++++
 ...defined-reference-if-libnfs-was-buil.patch | 41 +++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch
 create mode 100644 package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch
 create mode 100644 package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch

diff --git a/package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch b/package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch
new file mode 100644
index 0000000000..b61f162670
--- /dev/null
+++ b/package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch
@@ -0,0 +1,26 @@
+From f054ce197a286fdd2fcb33ec1d9c236c5976adfb Mon Sep 17 00:00:00 2001
+From: fundawang <fundawang@yeah.net>
+Date: Sun, 26 Jan 2025 16:39:03 +0800
+Subject: [PATCH] move link against gnutls into main library, as it is
+ referenced by tls/libtls.la
+
+Upstream: d205297a10bf8d7f8846bf42f0ed618543a561a9
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ lib/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 82376cb..33be5e4 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -48,5 +48,5 @@ libnfs_la_LIBADD = \
+ 
+ if HAVE_TLS
+ libnfs_la_CPPFLAGS += -I$(abs_top_srcdir)/tls
+-libnfs_la_LIBADD += ../tls/libtls.la
++libnfs_la_LIBADD += ../tls/libtls.la -lgnutls
+ endif
+-- 
+2.55.0
+
diff --git a/package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch b/package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch
new file mode 100644
index 0000000000..b4446115d4
--- /dev/null
+++ b/package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch
@@ -0,0 +1,29 @@
+From 74437cb4e9d47daeeb3f851c5b14eb0d207ceb17 Mon Sep 17 00:00:00 2001
+From: fundawang <fundawang@yeah.net>
+Date: Sun, 26 Jan 2025 16:39:59 +0800
+Subject: [PATCH] move link against gnutls into main library, as it is
+ referenced by tls/libtls.la
+
+Upstream: 546c9ed8624403078ef993138b56dce4c3558523
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ utils/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index bd584b8..2ae7636 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -16,9 +16,6 @@ AM_CPPFLAGS = \
+ 	"-D_U_=__attribute__((unused))"
+ 
+ COMMON_LIBS = ../lib/libnfs.la $(LIBSOCKET)
+-if HAVE_TLS
+-COMMON_LIBS += -lgnutls
+-endif
+ 
+ nfs_cat_LDADD = $(COMMON_LIBS)
+ nfs_ls_LDADD = $(COMMON_LIBS)
+-- 
+2.55.0
+
diff --git a/package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch b/package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch
new file mode 100644
index 0000000000..e8080a60b8
--- /dev/null
+++ b/package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch
@@ -0,0 +1,41 @@
+From 8c6bf2f173fdca0a954ed206b3a386e33b5de47b Mon Sep 17 00:00:00 2001
+From: Andreas Ziegler <15275159+aeolio@users.noreply.github.com>
+Date: Sun, 28 Jun 2026 06:20:48 +0000
+Subject: [PATCH] autotools: fix 'undefined reference' if libnfs was built with
+ gnutls support (#587)
+
+Signed-off-by: Andreas Ziegler <15275159+aeolio@users.noreply.github.com>
+Upstream: a3e86449217fe5429c38e2b06c4f7e6b3cd3be32
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ configure.ac | 2 ++
+ libnfs.pc.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a012004..6e5100f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,6 +284,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ [[const char *v = GNUTLS_VERSION;]])],[libnfs_cv_HAVE_TLS=yes],[libnfs_cv_HAVE_TLS=no])])
+ if test x"$libnfs_cv_HAVE_TLS" = x"yes"; then
+     AC_DEFINE(HAVE_TLS,1,[Whether we have linux tls support])
++    # tell pkg-config that gnutls needs to be linked also
++    AC_SUBST(tls_library,"-lgnutls")
+ fi
+ AM_CONDITIONAL([HAVE_TLS], [test $libnfs_cv_HAVE_TLS = yes])
+ 
+diff --git a/libnfs.pc.in b/libnfs.pc.in
+index fdc012c..42be7b2 100644
+--- a/libnfs.pc.in
++++ b/libnfs.pc.in
+@@ -10,5 +10,5 @@ Description: libnfs is a client library for accessing NFS shares over a network.
+ Version: @VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} -lnfs
++Libs: -L${libdir} -lnfs @tls_library@
+ Cflags: -I${includedir}
+-- 
+2.55.0
+
-- 
2.55.0

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

[Buildroot] [PATCH v3 2/2] package/libnfs: bump version to 7.0.1

[Thomas Petazzoni via buildroot]

From: Andreas Ziegler <br025@umbiko.net>

Change log:
https://github.com/sahlberg/libnfs/compare/libnfs-6.0.2...libnfs-7.0.1

All patches are dropped as they are all included in 7.0.1.

Signed-off-by: Andreas Ziegler <br025@umbiko.net>
[Thomas: bump to 7.0.1]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 ...t-and-use-const-qualifier-from-point.patch |  37 ------
 ...t-qualifier-from-pointer-target-type.patch | 117 ------------------
 ...void-cast-to-allow-compile-for-arm32.patch |  68 ----------
 ...t-gnutls-into-main-library-as-it-is-.patch |  26 ----
 ...t-gnutls-into-main-library-as-it-is-.patch |  29 -----
 ...defined-reference-if-libnfs-was-buil.patch |  41 ------
 package/libnfs/libnfs.hash                    |   2 +-
 package/libnfs/libnfs.mk                      |   2 +-
 8 files changed, 2 insertions(+), 320 deletions(-)
 delete mode 100644 package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch
 delete mode 100644 package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch
 delete mode 100644 package/libnfs/0003-socket-use-void-cast-to-allow-compile-for-arm32.patch
 delete mode 100644 package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch
 delete mode 100644 package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch
 delete mode 100644 package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch

diff --git a/package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch b/package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch
deleted file mode 100644
index d463ecd356..0000000000
--- a/package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 89a795fee97a3da348c28dbd58500100a13dcec0 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sun, 25 Jan 2026 08:30:43 +0000
-Subject: [PATCH] Do not edit const and use const qualifier from pointer target
- type
-
-Fixes:
-    ../../lib/libnfs.c: In function 'nfs_set_context_args':
-    ../../lib/libnfs.c:301:30: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
-      301 |                 char *strp = strchr(val, ',');
-          |                              ^~~~~~
-
-Upstream: https://github.com/sahlberg/libnfs/commit/89a795fee97a3da348c28dbd58500100a13dcec0
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- lib/libnfs.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/libnfs.c b/lib/libnfs.c
-index bbe6666..162492b 100755
---- a/lib/libnfs.c
-+++ b/lib/libnfs.c
-@@ -316,9 +316,8 @@ nfs_set_context_args(struct nfs_context *nfs, const char *arg, const char *val)
- 	} else if (!strcmp(arg, "wsize")) {
- 		nfs_set_writemax(nfs, atoi(val));
- 	} else if (!strcmp(arg, "readdir-buffer")) {
--		char *strp = strchr(val, ',');
-+		const char *strp = strchr(val, ',');
- 		if (strp) {
--			*strp = 0;
- 			strp++;
- 			nfs_set_readdir_max_buffer_size(nfs, atoi(val), atoi(strp));
- 		} else {
--- 
-2.47.3
-
diff --git a/package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch b/package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch
deleted file mode 100644
index 6fe8f6433b..0000000000
--- a/package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 6a06cb6dba0065705179329729cca2f95a842a63 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sun, 25 Jan 2026 08:42:18 +0000
-Subject: [PATCH] use const qualifier from pointer target type
-
-Fixes:
-    ../../lib/nfs_v3.c: In function 'nfs3_mknod_async':
-    ../../lib/nfs_v3.c:3260:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
-     3260 |         ptr = strrchr(path, '/');
-          |             ^
-    ../../lib/nfs_v3.c: In function 'nfs3_unlink_async':
-    ../../lib/nfs_v3.c:3361:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
-     3361 |         ptr = strrchr(path, '/');
-          |             ^
-    ../../lib/nfs_v3.c: In function 'nfs3_rmdir_async':
-    ../../lib/nfs_v3.c:3472:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
-     3472 |         ptr = strrchr(path, '/');
-          |             ^
-    ../../lib/nfs_v3.c: In function 'nfs3_mkdir2_async':
-    ../../lib/nfs_v3.c:3574:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
-     3574 |         ptr = strrchr(path, '/');
-          |             ^
-
-Upstream: https://github.com/sahlberg/libnfs/commit/6a06cb6dba0065705179329729cca2f95a842a63
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- lib/nfs_v3.c | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/lib/nfs_v3.c b/lib/nfs_v3.c
-index addd0ae..2c32fff 100644
---- a/lib/nfs_v3.c
-+++ b/lib/nfs_v3.c
-@@ -3244,7 +3244,7 @@ int
- nfs3_mknod_async(struct nfs_context *nfs, const char *path, int mode, int dev,
-                  nfs_cb cb, void *private_data)
- {
--	char *ptr;
-+	const char *ptr;
- 	struct mknod_cb_data *cb_data;
- 
- 	cb_data = malloc(sizeof(struct mknod_cb_data));
-@@ -3262,8 +3262,8 @@ nfs3_mknod_async(struct nfs_context *nfs, const char *path, int mode, int dev,
-                                       "buffer for mknod path");
-                         return -1;
-                 }
--                ptr = strrchr(cb_data->path, '/');
--                *ptr = 0;
-+                char *ptr2 = strrchr(cb_data->path, '/');
-+                *ptr2 = 0;
-         } else {
-                 cb_data->path = malloc(strlen(path) + 2);
-                 if (cb_data->path == NULL) {
-@@ -3353,7 +3353,7 @@ nfs3_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb,
-                   void *private_data)
- {
- 	char *new_path;
--	char *ptr;
-+	const char *ptr;
- 
-         ptr = strrchr(path, '/');
-         if (ptr) {
-@@ -3363,8 +3363,8 @@ nfs3_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb,
-                                       "buffer for unlink path");
-                         return -1;
-                 }
--                ptr = strrchr(new_path, '/');
--                *ptr = 0;
-+                char *ptr2 = strrchr(new_path, '/');
-+                *ptr2 = 0;
-         } else {
-                 new_path = malloc(strlen(path) + 2);
-                 if (new_path == NULL) {
-@@ -3464,7 +3464,7 @@ nfs3_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb,
-                  void *private_data)
- {
- 	char *new_path;
--	char *ptr;
-+	const char *ptr;
- 
-         ptr = strrchr(path, '/');
-         if (ptr) {
-@@ -3474,8 +3474,8 @@ nfs3_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb,
-                                       "buffer for rmdir path");
-                         return -1;
-                 }
--                ptr = strrchr(new_path, '/');
--                *ptr = 0;
-+                char *ptr2 = strrchr(new_path, '/');
-+                *ptr2 = 0;
-         } else {
-                 new_path = malloc(strlen(path) + 2);
-                 if (new_path == NULL) {
-@@ -3566,7 +3566,7 @@ nfs3_mkdir2_async(struct nfs_context *nfs, const char *path, int mode,
-                  nfs_cb cb, void *private_data)
- {
- 	char *new_path;
--	char *ptr;
-+	const char *ptr;
- 
-         ptr = strrchr(path, '/');
-         if (ptr) {
-@@ -3576,8 +3576,8 @@ nfs3_mkdir2_async(struct nfs_context *nfs, const char *path, int mode,
-                                       "buffer for mkdir path");
-                         return -1;
-                 }
--                ptr = strrchr(new_path, '/');
--                *ptr = 0;
-+                char *ptr2 = strrchr(new_path, '/');
-+                *ptr2 = 0;
-         } else {
-                 new_path = malloc(strlen(path) + 2);
-                 if (new_path == NULL) {
--- 
-2.47.3
-
diff --git a/package/libnfs/0003-socket-use-void-cast-to-allow-compile-for-arm32.patch b/package/libnfs/0003-socket-use-void-cast-to-allow-compile-for-arm32.patch
deleted file mode 100644
index 1f71a391e7..0000000000
--- a/package/libnfs/0003-socket-use-void-cast-to-allow-compile-for-arm32.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c66dc9a65723e610fd02da38471d68b8289eb074 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Tue, 14 Jan 2025 14:09:36 +0000
-Subject: [PATCH] socket: use void cast to allow compile for arm32
-
-When compiling for arm32 the error: cast increases required alignment
-of target type occurs.
-
-/lib/socket.c: In function 'rpc_read_from_socket':
-lib/socket.c:586:49: error: cast increases required alignment of target type [-Werror=cast-align]
-  586 |                         rpc->rm_xid[1] = ntohl(*(uint32_t *)&buf[0]);
-      |                                                 ^
-lib/socket.c:587:61: error: cast increases required alignment of target type [-Werror=cast-align]
-  587 |                         rpc->pdu = rpc_find_pdu(rpc, ntohl(*(uint32_t *)&buf[0]));
-      |                                                             ^
-lib/socket.c:799:35: error: cast increases required alignment of target type [-Werror=cast-align]
-  799 |                                 *((uint32_t *)rpc->inbuf) = htonl(rpc->rm_xid[1]);
-      |                                   ^
-lib/socket.c:861:71: error: cast increases required alignment of target type [-Werror=cast-align]
-  861 |                                                 const READ3res *res = (READ3res *) rpc->pdu->zdr_decode_buf;
-      |                                                                       ^
-
-cast via (void *) to allow the compile to suceed, as all of the source buffers should be 32bit aligned.
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
-
-Upstream: https://github.com/sahlberg/libnfs/commit/a01d42a0d9682d3e506d3c78680db8c7d158fe88
-Signed-off-by: Florian Larysch <fl@n621.de>
----
- lib/socket.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/socket.c b/lib/socket.c
-index f51ca4d..5b9fce5 100644
---- a/lib/socket.c
-+++ b/lib/socket.c
-@@ -583,8 +583,8 @@ rpc_read_from_socket(struct rpc_context *rpc)
- 		}
- 		if (!rpc->is_server_context) {
- 			rpc->rm_xid[0] = count;
--			rpc->rm_xid[1] = ntohl(*(uint32_t *)&buf[0]);
--			rpc->pdu = rpc_find_pdu(rpc, ntohl(*(uint32_t *)&buf[0]));
-+			rpc->rm_xid[1] = ntohl(*(uint32_t *)(void *)&buf[0]);
-+			rpc->pdu = rpc_find_pdu(rpc, ntohl(*(uint32_t *)(void *)&buf[0]));
- 			if (rpc->pdu == NULL) {
- 				rpc_set_error(rpc, "Failed to match incoming PDU/XID."
- 						" Ignoring PDU");
-@@ -796,7 +796,7 @@ rpc_read_from_socket(struct rpc_context *rpc)
-                                 }
- 
-                                 /* Copy the next 4 bytes into inbuf */
--                                *((uint32_t *)rpc->inbuf) = htonl(rpc->rm_xid[1]);
-+                                *((uint32_t *)(void *)rpc->inbuf) = htonl(rpc->rm_xid[1]);
- 
-                                 /* but set inpos to 0, we will update it above
-                                  * that we have already read these 4 bytes in
-@@ -858,7 +858,7 @@ rpc_read_from_socket(struct rpc_context *rpc)
-                                                  * If the READ failed, bail out here as there is no
-                                                  * data.
-                                                  */
--                                                const READ3res *res = (READ3res *) rpc->pdu->zdr_decode_buf;
-+                                                const READ3res *res = (READ3res *)(void *) rpc->pdu->zdr_decode_buf;
-                                                 if (res->status != NFS3_OK) {
-                                                         goto payload_finished;
-                                                 }
--- 
-2.53.0
-
diff --git a/package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch b/package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch
deleted file mode 100644
index b61f162670..0000000000
--- a/package/libnfs/0004-move-link-against-gnutls-into-main-library-as-it-is-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f054ce197a286fdd2fcb33ec1d9c236c5976adfb Mon Sep 17 00:00:00 2001
-From: fundawang <fundawang@yeah.net>
-Date: Sun, 26 Jan 2025 16:39:03 +0800
-Subject: [PATCH] move link against gnutls into main library, as it is
- referenced by tls/libtls.la
-
-Upstream: d205297a10bf8d7f8846bf42f0ed618543a561a9
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- lib/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 82376cb..33be5e4 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -48,5 +48,5 @@ libnfs_la_LIBADD = \
- 
- if HAVE_TLS
- libnfs_la_CPPFLAGS += -I$(abs_top_srcdir)/tls
--libnfs_la_LIBADD += ../tls/libtls.la
-+libnfs_la_LIBADD += ../tls/libtls.la -lgnutls
- endif
--- 
-2.55.0
-
diff --git a/package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch b/package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch
deleted file mode 100644
index b4446115d4..0000000000
--- a/package/libnfs/0005-move-link-against-gnutls-into-main-library-as-it-is-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 74437cb4e9d47daeeb3f851c5b14eb0d207ceb17 Mon Sep 17 00:00:00 2001
-From: fundawang <fundawang@yeah.net>
-Date: Sun, 26 Jan 2025 16:39:59 +0800
-Subject: [PATCH] move link against gnutls into main library, as it is
- referenced by tls/libtls.la
-
-Upstream: 546c9ed8624403078ef993138b56dce4c3558523
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- utils/Makefile.am | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index bd584b8..2ae7636 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -16,9 +16,6 @@ AM_CPPFLAGS = \
- 	"-D_U_=__attribute__((unused))"
- 
- COMMON_LIBS = ../lib/libnfs.la $(LIBSOCKET)
--if HAVE_TLS
--COMMON_LIBS += -lgnutls
--endif
- 
- nfs_cat_LDADD = $(COMMON_LIBS)
- nfs_ls_LDADD = $(COMMON_LIBS)
--- 
-2.55.0
-
diff --git a/package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch b/package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch
deleted file mode 100644
index e8080a60b8..0000000000
--- a/package/libnfs/0006-autotools-fix-undefined-reference-if-libnfs-was-buil.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8c6bf2f173fdca0a954ed206b3a386e33b5de47b Mon Sep 17 00:00:00 2001
-From: Andreas Ziegler <15275159+aeolio@users.noreply.github.com>
-Date: Sun, 28 Jun 2026 06:20:48 +0000
-Subject: [PATCH] autotools: fix 'undefined reference' if libnfs was built with
- gnutls support (#587)
-
-Signed-off-by: Andreas Ziegler <15275159+aeolio@users.noreply.github.com>
-Upstream: a3e86449217fe5429c38e2b06c4f7e6b3cd3be32
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- configure.ac | 2 ++
- libnfs.pc.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a012004..6e5100f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -284,6 +284,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- [[const char *v = GNUTLS_VERSION;]])],[libnfs_cv_HAVE_TLS=yes],[libnfs_cv_HAVE_TLS=no])])
- if test x"$libnfs_cv_HAVE_TLS" = x"yes"; then
-     AC_DEFINE(HAVE_TLS,1,[Whether we have linux tls support])
-+    # tell pkg-config that gnutls needs to be linked also
-+    AC_SUBST(tls_library,"-lgnutls")
- fi
- AM_CONDITIONAL([HAVE_TLS], [test $libnfs_cv_HAVE_TLS = yes])
- 
-diff --git a/libnfs.pc.in b/libnfs.pc.in
-index fdc012c..42be7b2 100644
---- a/libnfs.pc.in
-+++ b/libnfs.pc.in
-@@ -10,5 +10,5 @@ Description: libnfs is a client library for accessing NFS shares over a network.
- Version: @VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} -lnfs
-+Libs: -L${libdir} -lnfs @tls_library@
- Cflags: -I${includedir}
--- 
-2.55.0
-
diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash
index c0e5ef5c81..a94cc07337 100644
--- a/package/libnfs/libnfs.hash
+++ b/package/libnfs/libnfs.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  4e5459cc3e0242447879004e9ad28286d4d27daa42cbdcde423248fad911e747  libnfs-6.0.2.tar.gz
+sha256  ba62a2705f7100727b8ea37741e6bb6d5e2ff9ec61fee4d77360793eca5eddc2  libnfs-7.0.1.tar.gz
 sha256  edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5  COPYING
 sha256  d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1  LICENCE-BSD.txt
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENCE-LGPL-2.1.txt
diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk
index 12afb7c697..8333521214 100644
--- a/package/libnfs/libnfs.mk
+++ b/package/libnfs/libnfs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNFS_VERSION = 6.0.2
+LIBNFS_VERSION = 7.0.1
 LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION))
 LIBNFS_INSTALL_STAGING = YES
 LIBNFS_AUTORECONF = YES
-- 
2.55.0

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

Re: [Buildroot] [PATCH v3 1/2] package/libnfs: fix gnutls support

[Andreas Ziegler]

Hi Thomas,

Thank you for taking care of this!

On 2026-08-28 19:40, Thomas Petazzoni wrote:
> In Buildroot commit a035a0f99fa3bbeca776d741bbdeb6c04b3b35c8, libnfs
> was bumped from 5.0.3 to 6.0.2, and 6.0.2 brought optional gnutls
> support.
> 
> Unfortunately, the gnutls support was a bit buggy, as the libnfs
> library ends up using gnutls symbols without being linked to
> libgnutls, causing build failures down the road when other packages
> try to link against libnfs.
> 
> We backport 3 commits from upstream 6.0.2..7.0.0 to address this
> issue.
> 
> Fixes:
> 
>   
> https://autobuild.buildroot.net/results/b070248b2bceaceaaed8e826b1247ccfba1ba9fb
>   
> https://autobuild.buildroot.net/results/e1461b76121addd8f04f08819b2e3e453a12c679
>   
> https://autobuild.buildroot.net/results/87c79193d2ea86f47e36232fe514837ad99c5f30
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Andreas Ziegler <br025@umbiko.net>
---
Tested on x86_64 (build, run)

Kind regards,
Andreas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/libnfs: bump version to 7.0.1

[Andreas Ziegler]

On 2026-08-28 19:40, Thomas Petazzoni wrote:
> From: Andreas Ziegler <br025@umbiko.net>
> 
> Change log:
> https://github.com/sahlberg/libnfs/compare/libnfs-6.0.2...libnfs-7.0.1
> 
> All patches are dropped as they are all included in 7.0.1.
> 
> Signed-off-by: Andreas Ziegler <br025@umbiko.net>
> [Thomas: bump to 7.0.1]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Andreas Ziegler <br025@umbiko.net>
---
Tested on aarch64 (build, run)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 1/2] package/libnfs: fix gnutls support

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes:

 > In Buildroot commit a035a0f99fa3bbeca776d741bbdeb6c04b3b35c8, libnfs
 > was bumped from 5.0.3 to 6.0.2, and 6.0.2 brought optional gnutls
 > support.

 > Unfortunately, the gnutls support was a bit buggy, as the libnfs
 > library ends up using gnutls symbols without being linked to
 > libgnutls, causing build failures down the road when other packages
 > try to link against libnfs.

 > We backport 3 commits from upstream 6.0.2..7.0.0 to address this
 > issue.

 > Fixes:

 >   https://autobuild.buildroot.net/results/b070248b2bceaceaaed8e826b1247ccfba1ba9fb
 >   https://autobuild.buildroot.net/results/e1461b76121addd8f04f08819b2e3e453a12c679
 >   https://autobuild.buildroot.net/results/87c79193d2ea86f47e36232fe514837ad99c5f30

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/libnfs: bump version to 7.0.1

[Thomas Petazzoni via buildroot]

On Fri, Aug 28, 2026 at 09:40:57PM +0200, Thomas Petazzoni via buildroot wrote:
> From: Andreas Ziegler <br025@umbiko.net>
> 
> Change log:
> https://github.com/sahlberg/libnfs/compare/libnfs-6.0.2...libnfs-7.0.1
> 
> All patches are dropped as they are all included in 7.0.1.
> 
> Signed-off-by: Andreas Ziegler <br025@umbiko.net>
> [Thomas: bump to 7.0.1]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot