From e010476a7aa4548e47e6d76455cb09d289851ab9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Oct 2016 19:31:41 +0200 Subject: fix nfs-utils/rpcbind for musl toolchains, patches mostly from Alpine Linux --- .../patches/patch-support_export_hostname_c | 20 ++++++++++++++++++++ .../patches/patch-support_include_conffile_h | 11 +++++++++++ .../nfs-utils/patches/patch-tools_rpcgen_rpc_main_c | 10 +++++----- .../nfs-utils/patches/patch-utils_mount_network_c | 10 ++++++++++ .../nfs-utils/patches/patch-utils_mountd_v4root_c | 11 +++++++++++ .../nfs-utils/patches/patch-utils_statd_rmtcall_c | 13 +++++++++++++ 6 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 package/nfs-utils/patches/patch-support_export_hostname_c create mode 100644 package/nfs-utils/patches/patch-support_include_conffile_h create mode 100644 package/nfs-utils/patches/patch-utils_mount_network_c create mode 100644 package/nfs-utils/patches/patch-utils_mountd_v4root_c create mode 100644 package/nfs-utils/patches/patch-utils_statd_rmtcall_c (limited to 'package/nfs-utils') diff --git a/package/nfs-utils/patches/patch-support_export_hostname_c b/package/nfs-utils/patches/patch-support_export_hostname_c new file mode 100644 index 000000000..731d18fd9 --- /dev/null +++ b/package/nfs-utils/patches/patch-support_export_hostname_c @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000..526d3cd3f --- /dev/null +++ b/package/nfs-utils/patches/patch-support_include_conffile_h @@ -0,0 +1,11 @@ +--- nfs-utils-3e2ab78a2cfbc2d11c31ced8d3f538d5aae757f1.orig/support/include/conffile.h 2016-10-01 21:41:15.000000000 +0200 ++++ nfs-utils-3e2ab78a2cfbc2d11c31ced8d3f538d5aae757f1/support/include/conffile.h 2016-10-02 08:47:53.000000000 +0200 +@@ -33,7 +33,7 @@ + #ifndef _CONFFILE_H_ + #define _CONFFILE_H_ + +-#include ++#include "queue.h" + #include + #include + diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c index 078212ba3..1d7937005 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c +++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c @@ -1,6 +1,6 @@ ---- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_main.c 2010-09-28 14:24:16.000000000 +0200 -+++ nfs-utils-1.2.3/tools/rpcgen/rpc_main.c 2010-12-24 23:45:11.000000000 +0100 -@@ -155,11 +155,7 @@ int timerflag; /* TRUE if !indefinite & +--- 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 */ @@ -12,7 +12,7 @@ int main(int argc, char **argv) -@@ -543,13 +539,8 @@ s_output(int argc, char **argv, char *in +@@ -544,13 +540,8 @@ s_output(int argc, char **argv, char *in timerflag = 1; } @@ -26,7 +26,7 @@ if( Cflag && (inetdflag || pmflag ) ) { f_print(fout, "#ifdef __cplusplus\n"); f_print(fout, "#include /* getdtablesize, open */\n"); -@@ -562,9 +553,6 @@ s_output(int argc, char **argv, char *in +@@ -563,9 +554,6 @@ s_output(int argc, char **argv, char *in f_print(fout, "#include \n"); f_print(fout, "#include \n"); diff --git a/package/nfs-utils/patches/patch-utils_mount_network_c b/package/nfs-utils/patches/patch-utils_mount_network_c new file mode 100644 index 000000000..fe8400b26 --- /dev/null +++ b/package/nfs-utils/patches/patch-utils_mount_network_c @@ -0,0 +1,10 @@ +--- nfs-utils-1.3.4.orig/utils/mount/network.c 2016-08-03 20:25:15.000000000 +0200 ++++ nfs-utils-1.3.4/utils/mount/network.c 2016-10-08 18:01:13.000000000 +0200 +@@ -38,7 +38,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/package/nfs-utils/patches/patch-utils_mountd_v4root_c b/package/nfs-utils/patches/patch-utils_mountd_v4root_c new file mode 100644 index 000000000..bba60a48d --- /dev/null +++ b/package/nfs-utils/patches/patch-utils_mountd_v4root_c @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..102794697 --- /dev/null +++ b/package/nfs-utils/patches/patch-utils_statd_rmtcall_c @@ -0,0 +1,13 @@ +--- 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