From 622819c8f12c7b2e75f4eaecdd65c17ce63ccbdd Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 2 Nov 2021 03:24:52 +0100 Subject: nfs-utils: Update to version 2.5.2 Also update patches. Signed-off-by: Phil Sutter --- package/nfs-utils/Makefile | 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_export_hostname_c | 20 ------------ .../patches/patch-support_include_conffile_h | 11 ------- package/nfs-utils/patches/patch-tools_Makefile_am | 10 ------ .../patches/patch-tools_rpcgen_Makefile_am | 25 -------------- .../patches/patch-tools_rpcgen_rpc_cout_c | 10 ------ .../patches/patch-tools_rpcgen_rpc_main_c | 38 ---------------------- .../nfs-utils/patches/patch-utils_mountd_v4root_c | 11 ------- .../nfs-utils/patches/patch-utils_statd_rmtcall_c | 13 -------- 12 files changed, 84 insertions(+), 140 deletions(-) create mode 100644 package/nfs-utils/patches/0001-Include-a-local-copy-of-sys-queue.h-instead-of-the-l.patch create mode 100644 package/nfs-utils/patches/0002-drop-not-needed-tools-from-being-compiled.patch create mode 100644 package/nfs-utils/patches/0003-Build-tools-with-host-compiler.patch delete mode 100644 package/nfs-utils/patches/patch-support_export_hostname_c delete mode 100644 package/nfs-utils/patches/patch-support_include_conffile_h delete mode 100644 package/nfs-utils/patches/patch-tools_Makefile_am delete mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am delete mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c delete mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c delete mode 100644 package/nfs-utils/patches/patch-utils_mountd_v4root_c delete mode 100644 package/nfs-utils/patches/patch-utils_statd_rmtcall_c diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index fb0982fc7..86e78db8f 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 2.3.1 +PKG_VERSION:= 2.5.2 PKG_RELEASE:= 1 -PKG_HASH:= ca92f1ab86b2af4dcd62d7716d46a6cdec268e83fe8d564cd8ff1464cc495989 +PKG_HASH:= e5ec4f0f29455b0ae03a65ddb1e436bc8e542fd9dc91f3edeb39a15b057d7ddb PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind 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 new file mode 100644 index 000000000..8c01a3254 --- /dev/null +++ b/package/nfs-utils/patches/0001-Include-a-local-copy-of-sys-queue.h-instead-of-the-l.patch @@ -0,0 +1,37 @@ +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 new file mode 100644 index 000000000..257ae1de6 --- /dev/null +++ b/package/nfs-utils/patches/0002-drop-not-needed-tools-from-being-compiled.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 000000000..fb81a1ee8 --- /dev/null +++ b/package/nfs-utils/patches/0003-Build-tools-with-host-compiler.patch @@ -0,0 +1,24 @@ +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_export_hostname_c b/package/nfs-utils/patches/patch-support_export_hostname_c deleted file mode 100644 index 731d18fd9..000000000 --- a/package/nfs-utils/patches/patch-support_export_hostname_c +++ /dev/null @@ -1,20 +0,0 @@ ---- nfs-utils-1.3.4.orig/support/export/hostname.c 2016-08-03 20:25:15.000000000 +0200 -+++ nfs-utils-1.3.4/support/export/hostname.c 2016-10-08 17:55:01.000000000 +0200 -@@ -384,6 +384,7 @@ host_numeric_addrinfo(const struct socka - - ai = host_pton(buf); - -+#if !definded(__UCLIBC__) && defined(__GLIBC__) - /* - * getaddrinfo(AI_NUMERICHOST) never fills in ai_canonname - */ -@@ -394,7 +395,9 @@ host_numeric_addrinfo(const struct socka - ai = NULL; - } - } -+#endif - - return ai; - } -+ - #endif /* !HAVE_GETNAMEINFO */ diff --git a/package/nfs-utils/patches/patch-support_include_conffile_h b/package/nfs-utils/patches/patch-support_include_conffile_h deleted file mode 100644 index f49b79b38..000000000 --- a/package/nfs-utils/patches/patch-support_include_conffile_h +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-2.1.1.orig/support/include/conffile.h 2017-01-12 16:21:39.000000000 +0100 -+++ nfs-utils-2.1.1/support/include/conffile.h 2017-08-12 18:53:54.262608096 +0200 -@@ -33,7 +33,7 @@ - #ifndef _CONFFILE_H_ - #define _CONFFILE_H_ - --#include -+#include "queue.h" - #include - #include - #include diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am deleted file mode 100644 index dda2eeba5..000000000 --- a/package/nfs-utils/patches/patch-tools_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-utils-1.3.0.orig/tools/Makefile.am 2014-03-25 16:12:07.000000000 +0100 -+++ nfs-utils-1.3.0/tools/Makefile.am 2014-05-13 21:09:39.000000000 +0200 -@@ -6,6 +6,6 @@ if CONFIG_RPCGEN - OPTDIRS += rpcgen - endif - --SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) -+SUBDIRS = $(OPTDIRS) - - MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am deleted file mode 100644 index 5da9c311e..000000000 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am +++ /dev/null @@ -1,25 +0,0 @@ ---- nfs-utils-1.3.0.orig/tools/rpcgen/Makefile.am 2014-03-25 16:12:07.000000000 +0100 -+++ nfs-utils-1.3.0/tools/rpcgen/Makefile.am 2014-05-20 11:40:39.333034278 +0200 -@@ -1,7 +1,9 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = rpcgen - rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ -@@ -9,11 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. - rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ - rpc_scan.h rpc_util.h - --rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) --rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) --rpcgen_LDADD=$(LIBTIRPC) -- - MAINTAINERCLEANFILES = Makefile.in - - EXTRA_DIST = rpcgen.new.1 diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c deleted file mode 100644 index a94015405..000000000 --- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_cout.c 2010-09-28 14:24:16.000000000 +0200 -+++ nfs-utils-1.2.3/tools/rpcgen/rpc_cout.c 2010-12-24 15:51:41.000000000 +0100 -@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1 - #include - #include - #include --#include - #include - #include "rpc_parse.h" - #include "rpc_util.h" diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c deleted file mode 100644 index 1d7937005..000000000 --- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c +++ /dev/null @@ -1,38 +0,0 @@ ---- nfs-utils-1.3.4.orig/tools/rpcgen/rpc_main.c 2016-08-03 20:25:15.000000000 +0200 -+++ nfs-utils-1.3.4/tools/rpcgen/rpc_main.c 2016-10-08 09:58:39.000000000 +0200 -@@ -156,11 +156,7 @@ int timerflag; /* TRUE if !indefinite & - int newstyle; /* newstyle of passing arguments (by value) */ - int Cflag = 0 ; /* ANSI C syntax */ - static int allfiles; /* generate all files */ --#ifdef linux - int tirpcflag = 0; /* no tirpc by default */ --#else --int tirpcflag = 1; /* generating code for tirpc, by default */ --#endif - - int - main(int argc, char **argv) -@@ -544,13 +540,8 @@ s_output(int argc, char **argv, char *in - timerflag = 1; - } - --#ifndef linux -- if( !tirpcflag && inetdflag ) -- f_print(fout, "#include /* TIOCNOTTY */\n"); --#else - if( !tirpcflag ) - f_print(fout, "#include /* TIOCNOTTY */\n"); --#endif - if( Cflag && (inetdflag || pmflag ) ) { - f_print(fout, "#ifdef __cplusplus\n"); - f_print(fout, "#include /* getdtablesize, open */\n"); -@@ -563,9 +554,6 @@ s_output(int argc, char **argv, char *in - f_print(fout, "#include \n"); - - f_print(fout, "#include \n"); --#ifndef linux -- f_print(fout, "#include \n"); --#endif - if (inetdflag || !tirpcflag ) { - f_print(fout, "#include \n"); - f_print(fout, "#include \n"); diff --git a/package/nfs-utils/patches/patch-utils_mountd_v4root_c b/package/nfs-utils/patches/patch-utils_mountd_v4root_c deleted file mode 100644 index bba60a48d..000000000 --- a/package/nfs-utils/patches/patch-utils_mountd_v4root_c +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-3e2ab78a2cfbc2d11c31ced8d3f538d5aae757f1.orig/utils/mountd/v4root.c 2016-10-01 21:41:15.000000000 +0200 -+++ nfs-utils-3e2ab78a2cfbc2d11c31ced8d3f538d5aae757f1/utils/mountd/v4root.c 2016-10-02 08:52:21.000000000 +0200 -@@ -13,7 +13,7 @@ - - #include - #include --#include -+#include "queue.h" - #include - #include - #include diff --git a/package/nfs-utils/patches/patch-utils_statd_rmtcall_c b/package/nfs-utils/patches/patch-utils_statd_rmtcall_c deleted file mode 100644 index 102794697..000000000 --- a/package/nfs-utils/patches/patch-utils_statd_rmtcall_c +++ /dev/null @@ -1,13 +0,0 @@ ---- nfs-utils-1.3.4.orig/utils/statd/rmtcall.c 2016-08-03 20:25:15.000000000 +0200 -+++ nfs-utils-1.3.4/utils/statd/rmtcall.c 2016-10-08 17:55:10.000000000 +0200 -@@ -93,8 +93,10 @@ statd_get_socket(void) - __func__); - break; - } -+#if 0 - se = getservbyport(sin.sin_port, "udp"); - if (se == NULL) -+#endif - break; - - if (retries == MAX_BRP_RETRIES) { -- cgit v1.2.3