From 93ed313fa157784ee71ebf167952ab6dd3a78fba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 6 Jan 2024 08:19:42 +0100 Subject: nfs-utils: update to 2.6.4 --- ...ocal-copy-of-sys-queue.h-instead-of-the-l.patch | 37 ---------------------- ...drop-not-needed-tools-from-being-compiled.patch | 21 ------------ .../0003-Build-tools-with-host-compiler.patch | 24 -------------- .../patches/patch-support_reexport_fsidd_c | 10 ++++++ .../patches/patch-support_reexport_reexport_c | 10 ++++++ .../patches/patch-tools_rpcgen_Makefile_am | 13 ++++++++ 6 files changed, 33 insertions(+), 82 deletions(-) delete mode 100644 package/nfs-utils/patches/0001-Include-a-local-copy-of-sys-queue.h-instead-of-the-l.patch delete mode 100644 package/nfs-utils/patches/0002-drop-not-needed-tools-from-being-compiled.patch delete mode 100644 package/nfs-utils/patches/0003-Build-tools-with-host-compiler.patch create mode 100644 package/nfs-utils/patches/patch-support_reexport_fsidd_c create mode 100644 package/nfs-utils/patches/patch-support_reexport_reexport_c create mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am (limited to 'package/nfs-utils/patches') diff --git a/package/nfs-utils/patches/0001-Include-a-local-copy-of-sys-queue.h-instead-of-the-l.patch b/package/nfs-utils/patches/0001-Include-a-local-copy-of-sys-queue.h-instead-of-the-l.patch deleted file mode 100644 index 8c01a3254..000000000 --- a/package/nfs-utils/patches/0001-Include-a-local-copy-of-sys-queue.h-instead-of-the-l.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bba2440b57e28d1a63e7bfe635f08908301b1500 Mon Sep 17 00:00:00 2001 -From: OpenADK -Date: Mon, 4 Jan 2021 16:44:11 +0100 -Subject: [PATCH] Include a local copy of sys/queue.h instead of the libc one - -Musl seems to not provide this header for whatever reason. ---- - support/include/conffile.h | 2 +- - utils/mountd/v4root.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/support/include/conffile.h b/support/include/conffile.h -index 7d974fe98f4f3..8d18cace2d5ee 100644 ---- a/support/include/conffile.h -+++ b/support/include/conffile.h -@@ -33,7 +33,7 @@ - #ifndef _CONFFILE_H_ - #define _CONFFILE_H_ - --#include -+#include "queue.h" - #include - #include - #include -diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c -index dd9828eb0c114..4ef909f9e9a6c 100644 ---- a/utils/mountd/v4root.c -+++ b/utils/mountd/v4root.c -@@ -13,7 +13,7 @@ - - #include - #include --#include -+#include "queue.h" - #include - #include - #include diff --git a/package/nfs-utils/patches/0002-drop-not-needed-tools-from-being-compiled.patch b/package/nfs-utils/patches/0002-drop-not-needed-tools-from-being-compiled.patch deleted file mode 100644 index 257ae1de6..000000000 --- a/package/nfs-utils/patches/0002-drop-not-needed-tools-from-being-compiled.patch +++ /dev/null @@ -1,21 +0,0 @@ -From ed62ca8e4466dc92f3f176d1cf38c1d99a07a4a5 Mon Sep 17 00:00:00 2001 -From: Phil Sutter -Date: Mon, 4 Jan 2021 16:47:28 +0100 -Subject: [PATCH] drop not needed tools from being compiled - ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 9b4b0803db394..3389f8c44ed0c 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -12,6 +12,6 @@ if CONFIG_NFSDCLD - OPTDIRS += nfsdclddb - endif - --SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat nfsdclnts $(OPTDIRS) -+SUBDIRS = $(OPTDIRS) - - MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/0003-Build-tools-with-host-compiler.patch b/package/nfs-utils/patches/0003-Build-tools-with-host-compiler.patch deleted file mode 100644 index fb81a1ee8..000000000 --- a/package/nfs-utils/patches/0003-Build-tools-with-host-compiler.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9c48cf1a9e3cbb2dce76696dbf6898eb6886c7b5 Mon Sep 17 00:00:00 2001 -From: Phil Sutter -Date: Mon, 4 Jan 2021 16:49:30 +0100 -Subject: [PATCH] Build tools with host compiler - ---- - tools/rpcgen/Makefile.am | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 457cd5074a1b1..e70af70a7e469 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,5 +1,10 @@ - CLEANFILES = *~ - -+CC=$(CC_FOR_BUILD) -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ - bin_PROGRAMS = rpcgen - man_MANS = rpcgen.1 - diff --git a/package/nfs-utils/patches/patch-support_reexport_fsidd_c b/package/nfs-utils/patches/patch-support_reexport_fsidd_c new file mode 100644 index 000000000..562ed4caa --- /dev/null +++ b/package/nfs-utils/patches/patch-support_reexport_fsidd_c @@ -0,0 +1,10 @@ +--- nfs-utils-2.6.4.orig/support/reexport/fsidd.c 2023-11-17 18:32:39.000000000 +0100 ++++ nfs-utils-2.6.4/support/reexport/fsidd.c 2024-01-04 13:47:58.231661971 +0100 +@@ -6,6 +6,7 @@ + #ifdef HAVE_DLFCN_H + #include + #endif ++#include + #include + + #include "conffile.h" diff --git a/package/nfs-utils/patches/patch-support_reexport_reexport_c b/package/nfs-utils/patches/patch-support_reexport_reexport_c new file mode 100644 index 000000000..9a491bdaf --- /dev/null +++ b/package/nfs-utils/patches/patch-support_reexport_reexport_c @@ -0,0 +1,10 @@ +--- nfs-utils-2.6.4.orig/support/reexport/reexport.c 2023-11-17 18:32:39.000000000 +0100 ++++ nfs-utils-2.6.4/support/reexport/reexport.c 2024-01-04 13:47:43.771377090 +0100 +@@ -5,6 +5,7 @@ + #ifdef HAVE_DLFCN_H + #include + #endif ++#include + #include + #include + #include diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am new file mode 100644 index 000000000..83e03f263 --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am @@ -0,0 +1,13 @@ +--- nfs-utils-2.6.4.orig/tools/rpcgen/Makefile.am 2023-11-17 18:32:39.000000000 +0100 ++++ nfs-utils-2.6.4/tools/rpcgen/Makefile.am 2024-01-04 13:27:43.388279004 +0100 +@@ -1,5 +1,10 @@ + CLEANFILES = *~ + ++CC=$(CC_FOR_BUILD) ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ + bin_PROGRAMS = rpcgen + man_MANS = rpcgen.1 + -- cgit v1.2.3