From dc581c2063e5c990b1b3152efd47ea5a08eb2e18 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 20 Nov 2024 09:39:47 +0000 Subject: [PATCH] libtirpc: gcc-15 upstream fixes ref: - https://sourceforge.net/p/libtirpc/mailman/message/58851697/ - https://sourceforge.net/p/libtirpc/mailman/message/59113888/ --- .../libtirpc-0001-fix-build-with-gcc-15.patch | 35 +++++++++++++++++++ .../libtirpc-0002-fix-build-with-gcc-15.patch | 35 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 packages/network/libtirpc/patches/libtirpc-0001-fix-build-with-gcc-15.patch create mode 100644 packages/network/libtirpc/patches/libtirpc-0002-fix-build-with-gcc-15.patch diff --git a/packages/network/libtirpc/patches/libtirpc-0001-fix-build-with-gcc-15.patch b/packages/network/libtirpc/patches/libtirpc-0001-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..71d4e0c976 --- /dev/null +++ b/packages/network/libtirpc/patches/libtirpc-0001-fix-build-with-gcc-15.patch @@ -0,0 +1,35 @@ +--- a/src/auth_none.c 2024-11-20 09:02:12.504925593 +0000 ++++ b/src/auth_none.c 2024-11-20 09:03:45.129971786 +0000 +@@ -62,7 +62,7 @@ + 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(); + +--- a/src/svc_auth_none.c 2024-11-20 09:10:27.426038143 +0000 ++++ b/src/svc_auth_none.c 2024-11-20 09:10:27.426038143 +0000 +@@ -37,8 +37,8 @@ + + #include + +-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, +--- a/src/getpublickey.c 2024-11-20 09:16:57.168954233 +0000 ++++ b/src/getpublickey.c 2024-11-20 09:16:57.168954233 +0000 +@@ -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/packages/network/libtirpc/patches/libtirpc-0002-fix-build-with-gcc-15.patch b/packages/network/libtirpc/patches/libtirpc-0002-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..b81851dbb6 --- /dev/null +++ b/packages/network/libtirpc/patches/libtirpc-0002-fix-build-with-gcc-15.patch @@ -0,0 +1,35 @@ +--- libtirpc-1.3.6/src/auth_time.c 2024-10-17 07:50:55.000000000 +0000 ++++ libtirpc-1.3.6/src/auth_time.c 2024-12-12 13:55:14.420375907 +0000 +@@ -248,7 +248,7 @@ + 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 @@ + } 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)); +--- libtirpc-1.3.6/src/key_call.c 2024-10-17 07:50:55.000000000 +0000 ++++ libtirpc-1.3.6/src/key_call.c 2024-12-12 13:49:15.720634534 +0000 +@@ -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 *); +