diff options
Diffstat (limited to 'package/nfs-utils/patches')
10 files changed, 28 insertions, 133 deletions
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 <sys/queue.h> -+#include "queue.h" - #include <ctype.h> - #include <stdint.h> - #include <stdbool.h> 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 <dlfcn.h> + #endif ++#include <unistd.h> + #include <event2/event.h> + + #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 <dlfcn.h> + #endif ++#include <unistd.h> + #include <sys/types.h> + #include <sys/vfs.h> + #include <errno.h> 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 index 5da9c311e..83e03f263 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am @@ -1,25 +1,13 @@ ---- 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 +--- 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) --LIBTOOL = @LIBTOOL@ --tag=CC ++CC=$(CC_FOR_BUILD) +CFLAGS=$(CFLAGS_FOR_BUILD) +CPPFLAGS=$(CPPFLAGS_FOR_BUILD) +LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ + bin_PROGRAMS = rpcgen + man_MANS = rpcgen.1 - 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 <stdio.h> - #include <string.h> - #include <stdlib.h> --#include <malloc.h> - #include <ctype.h> - #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 <sys/ttycom.h>/* TIOCNOTTY */\n"); --#else - if( !tirpcflag ) - f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n"); --#endif - if( Cflag && (inetdflag || pmflag ) ) { - f_print(fout, "#ifdef __cplusplus\n"); - f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n"); -@@ -563,9 +554,6 @@ s_output(int argc, char **argv, char *in - f_print(fout, "#include <sys/types.h>\n"); - - f_print(fout, "#include <memory.h>\n"); --#ifndef linux -- f_print(fout, "#include <stropts.h>\n"); --#endif - if (inetdflag || !tirpcflag ) { - f_print(fout, "#include <sys/socket.h>\n"); - f_print(fout, "#include <netinet/in.h>\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 <sys/types.h> - #include <sys/stat.h> --#include <sys/queue.h> -+#include "queue.h" - #include <stdio.h> - #include <stdlib.h> - #include <ctype.h> 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) { |