summaryrefslogtreecommitdiff
path: root/package/libtirpc/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/libtirpc/patches')
-rw-r--r--package/libtirpc/patches/patch-Makefile_am54
-rw-r--r--package/libtirpc/patches/patch-configure_ac23
-rw-r--r--package/libtirpc/patches/patch-src_auth_none_c11
-rw-r--r--package/libtirpc/patches/patch-src_auth_time_c20
-rw-r--r--package/libtirpc/patches/patch-src_clnt_bcast_c15
-rw-r--r--package/libtirpc/patches/patch-src_clnt_fd_locks_h11
-rw-r--r--package/libtirpc/patches/patch-src_getpublickey_c11
-rw-r--r--package/libtirpc/patches/patch-src_key_call_c15
-rw-r--r--package/libtirpc/patches/patch-src_svc_auth_c12
-rw-r--r--package/libtirpc/patches/patch-src_svc_auth_none_c13
10 files changed, 85 insertions, 100 deletions
diff --git a/package/libtirpc/patches/patch-Makefile_am b/package/libtirpc/patches/patch-Makefile_am
deleted file mode 100644
index 80bc6991c..000000000
--- a/package/libtirpc/patches/patch-Makefile_am
+++ /dev/null
@@ -1,54 +0,0 @@
---- libtirpc-1.0.1.orig/Makefile.am 2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/Makefile.am 2015-11-29 16:38:58.340674483 +0100
-@@ -1,6 +1,12 @@
--SUBDIRS = src man doc
-+SUBDIRS = src man doc rpcgen
- ACLOCAL_AMFLAGS = -I m4
-
-+GENFILES = tirpc/rpcsvc/crypt.h \
-+ tirpc/rpcsvc/mount.h \
-+ tirpc/rpcsvc/nfs_prot.h \
-+ tirpc/rpcsvc/rquota.h \
-+ tirpc/rpc/rpcb_prot.h
-+
- noinst_HEADERS = tirpc/reentrant.h \
- tirpc/getpeereid.h \
- tirpc/libc_private.h \
-@@ -8,7 +14,9 @@ noinst_HEADERS = tirpc/reentrant.
-
- nobase_include_HEADERS = tirpc/netconfig.h \
- tirpc/rpcsvc/crypt.x \
-- tirpc/rpcsvc/crypt.h \
-+ tirpc/rpcsvc/mount.x \
-+ tirpc/rpcsvc/nfs_prot.x \
-+ tirpc/rpcsvc/rquota.x \
- tirpc/rpc/xdr.h \
- tirpc/rpc/types.h \
- tirpc/rpc/svc_soc.h \
-@@ -21,7 +29,6 @@ nobase_include_HEADERS = tirpc/netconfig
- tirpc/rpc/rpcent.h \
- tirpc/rpc/rpc_com.h \
- tirpc/rpc/rpcb_prot.x \
-- tirpc/rpc/rpcb_prot.h \
- tirpc/rpc/rpcb_clnt.h \
- tirpc/rpc/raw.h \
- tirpc/rpc/pmap_rmt.h \
-@@ -48,5 +55,17 @@ endif
- pkgconfigdir=$(libdir)/pkgconfig
- pkgconfig_DATA = libtirpc.pc
-
--CLEANFILES = cscope.* *~
-+nobase_nodist_include_HEADERS = $(GENFILES)
-+BUILT_SOURCES = $(GENFILES)
-+
-+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen
-+ mkdir -p $(dir $@)
-+ $(top_builddir)/rpcgen/rpcgen -h -o $@ $<
-+
-+$(top_builddir)/rpcgen/rpcgen: force
-+ cd rpcgen && $(MAKE)
-+
-+force:
-+
-+CLEANFILES = cscope.* *~ $(GENFILES)
- DISTCLEANFILES = Makefile.in libtirpc*.tar.gz
diff --git a/package/libtirpc/patches/patch-configure_ac b/package/libtirpc/patches/patch-configure_ac
deleted file mode 100644
index 659bdad8c..000000000
--- a/package/libtirpc/patches/patch-configure_ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- libtirpc-1.0.1.orig/configure.ac 2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/configure.ac 2015-11-29 16:38:38.817971632 +0100
-@@ -89,7 +89,19 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h li
- AC_CHECK_LIB([pthread], [pthread_create])
- AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
-
--AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
-+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-+
-+AC_MSG_CHECKING([for a C compiler for build tools])
-+if test $cross_compiling = yes; then
-+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-+else
-+ CC_FOR_BUILD=$CC
-+fi
-+AC_MSG_RESULT([$CC_FOR_BUILD])
-+AC_SUBST(CC_FOR_BUILD)
-+
-+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile])
-+
- AC_OUTPUT(libtirpc.pc)
-
-
diff --git a/package/libtirpc/patches/patch-src_auth_none_c b/package/libtirpc/patches/patch-src_auth_none_c
new file mode 100644
index 000000000..765711342
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_auth_none_c
@@ -0,0 +1,11 @@
+--- libtirpc-1.3.6.orig/src/auth_none.c 2024-10-17 09:50:55.000000000 +0200
++++ libtirpc-1.3.6/src/auth_none.c 2025-04-30 13:30:55.736451017 +0200
+@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *,
+ static bool_t authnone_refresh (AUTH *, void *);
+ static void authnone_destroy (AUTH *);
+
+-extern bool_t xdr_opaque_auth();
++extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
+
+ static struct auth_ops *authnone_ops();
+
diff --git a/package/libtirpc/patches/patch-src_auth_time_c b/package/libtirpc/patches/patch-src_auth_time_c
new file mode 100644
index 000000000..67bfd0e80
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_auth_time_c
@@ -0,0 +1,20 @@
+--- libtirpc-1.3.6.orig/src/auth_time.c 2024-10-17 09:50:55.000000000 +0200
++++ libtirpc-1.3.6/src/auth_time.c 2025-04-30 13:33:25.507704020 +0200
+@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, ua
+ char ut[64], ipuaddr[64];
+ endpoint teps[32];
+ nis_server tsrv;
+- void (*oldsig)() = NULL; /* old alarm handler */
++ void (*oldsig)(int) = NULL; /* old alarm handler */
+ struct sockaddr_in sin;
+ int s = RPC_ANYSOCK;
+ socklen_t len;
+@@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, ua
+ } else {
+ int res;
+
+- oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
++ oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler);
+ saw_alarm = 0; /* global tracking the alarm */
+ alarm(20); /* only wait 20 seconds */
+ res = connect(s, (struct sockaddr *)&sin, sizeof(sin));
diff --git a/package/libtirpc/patches/patch-src_clnt_bcast_c b/package/libtirpc/patches/patch-src_clnt_bcast_c
index d2dd1a38c..86f56c7f2 100644
--- a/package/libtirpc/patches/patch-src_clnt_bcast_c
+++ b/package/libtirpc/patches/patch-src_clnt_bcast_c
@@ -1,18 +1,11 @@
---- libtirpc-1.0.1.orig/src/clnt_bcast.c 2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/src/clnt_bcast.c 2016-01-28 15:46:15.322676441 +0100
-@@ -40,7 +40,6 @@
+--- libtirpc-1.3.4.orig/src/clnt_bcast.c 2023-10-07 09:54:42.000000000 +0200
++++ libtirpc-1.3.4/src/clnt_bcast.c 2024-02-08 16:26:57.298094444 +0100
+@@ -40,7 +40,7 @@
*/
#include <sys/socket.h>
#include <sys/types.h>
-#include <sys/queue.h>
++#include "queue.h"
#include <net/if.h>
#include <netinet/in.h>
-@@ -62,6 +61,7 @@
- #include <err.h>
- #include <string.h>
-
-+#include "queue.h"
- #include "rpc_com.h"
- #include "debug.h"
-
diff --git a/package/libtirpc/patches/patch-src_clnt_fd_locks_h b/package/libtirpc/patches/patch-src_clnt_fd_locks_h
new file mode 100644
index 000000000..6927fca68
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_clnt_fd_locks_h
@@ -0,0 +1,11 @@
+--- libtirpc-1.3.4.orig/src/clnt_fd_locks.h 2023-10-07 09:54:42.000000000 +0200
++++ libtirpc-1.3.4/src/clnt_fd_locks.h 2024-02-08 16:25:34.795598116 +0100
+@@ -30,7 +30,7 @@
+ #ifndef _CLNT_FD_LOCKS_H
+ #define _CLNT_FD_LOCKS_H
+
+-#include <sys/queue.h>
++#include "queue.h"
+ #include <errno.h>
+ #include <reentrant.h>
+ #include <rpc/xdr.h>
diff --git a/package/libtirpc/patches/patch-src_getpublickey_c b/package/libtirpc/patches/patch-src_getpublickey_c
new file mode 100644
index 000000000..637d6be22
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_getpublickey_c
@@ -0,0 +1,11 @@
+--- libtirpc-1.3.6.orig/src/getpublickey.c 2024-10-17 09:50:55.000000000 +0200
++++ libtirpc-1.3.6/src/getpublickey.c 2025-04-30 13:30:55.736451017 +0200
+@@ -52,7 +52,7 @@
+ /*
+ * Hack to let ypserv/rpc.nisd use AUTH_DES.
+ */
+-int (*__getpublickey_LOCAL)() = 0;
++int (*__getpublickey_LOCAL)(const char *, char *) = 0;
+
+ /*
+ * Get somebody's public key
diff --git a/package/libtirpc/patches/patch-src_key_call_c b/package/libtirpc/patches/patch-src_key_call_c
new file mode 100644
index 000000000..8a1c12921
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_key_call_c
@@ -0,0 +1,15 @@
+--- libtirpc-1.3.6.orig/src/key_call.c 2024-10-17 09:50:55.000000000 +0200
++++ libtirpc-1.3.6/src/key_call.c 2025-04-30 13:33:25.507704020 +0200
+@@ -72,9 +72,9 @@
+ * implementations of these functions, and to call those in key_call().
+ */
+
+-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
+-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
+-des_block *(*__key_gendes_LOCAL)() = 0;
++cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0;
++cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0;
++des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0;
+
+ static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
+
diff --git a/package/libtirpc/patches/patch-src_svc_auth_c b/package/libtirpc/patches/patch-src_svc_auth_c
deleted file mode 100644
index 05436f3b7..000000000
--- a/package/libtirpc/patches/patch-src_svc_auth_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libtirpc-1.0.1.orig/src/svc_auth.c 2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/src/svc_auth.c 2015-11-29 16:39:17.807381054 +0100
-@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch
- case AUTH_SHORT:
- dummy = _svcauth_short(rqst, msg);
- return (dummy);
-- case AUTH_DES:
-- dummy = _svcauth_des(rqst, msg);
-- return (dummy);
- #ifdef HAVE_RPCSEC_GSS
- case RPCSEC_GSS:
- dummy = _svcauth_gss(rqst, msg, no_dispatch);
diff --git a/package/libtirpc/patches/patch-src_svc_auth_none_c b/package/libtirpc/patches/patch-src_svc_auth_none_c
new file mode 100644
index 000000000..c21c67692
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_svc_auth_none_c
@@ -0,0 +1,13 @@
+--- libtirpc-1.3.6.orig/src/svc_auth_none.c 2024-10-17 09:50:55.000000000 +0200
++++ libtirpc-1.3.6/src/svc_auth_none.c 2025-04-30 13:30:55.736451017 +0200
+@@ -37,8 +37,8 @@
+
+ #include <rpc/rpc.h>
+
+-static bool_t svcauth_none_destroy();
+-static bool_t svcauth_none_wrap();
++static bool_t svcauth_none_destroy(SVCAUTH *);
++static bool_t svcauth_none_wrap(SVCAUTH *, XDR *, bool_t (*)(XDR *, ...), char *);
+
+ struct svc_auth_ops svc_auth_none_ops = {
+ svcauth_none_wrap,