diff --git a/package/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch b/package/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch deleted file mode 100644 index f94be6f39a..0000000000 --- a/package/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 45c1eade8fa7ca62c53e80450b315ccae6db55ea Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Thu, 12 Dec 2024 04:16:02 -0500 -Subject: [PATCH] Update declarations to allow compile with gcc-15 - -This patch fixes some of the compile errors with gcc 15-20241117. - -In addition the follow declarations need to be fixed: - sed -n 75,77p libtirpc-1.3.6/src/key_call.c - cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; - cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; - des_block *(*__key_gendes_LOCAL)() = 0; - -Signed-off-by: Rudi Heitbaum -Signed-off-by: Steve Dickson -Upstream: d473f1e1f6ba80bfaee4daa058da159305167323 -Signed-off-by: Thomas Petazzoni ---- - src/auth_none.c | 2 +- - src/getpublickey.c | 2 +- - src/svc_auth_none.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/auth_none.c b/src/auth_none.c -index 0b0bbd1..aca6e71 100644 ---- a/src/auth_none.c -+++ b/src/auth_none.c -@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *, struct opaque_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/src/getpublickey.c b/src/getpublickey.c -index be37a24..4e96c7c 100644 ---- a/src/getpublickey.c -+++ b/src/getpublickey.c -@@ -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/src/svc_auth_none.c b/src/svc_auth_none.c -index 887e809..5ca98e9 100644 ---- a/src/svc_auth_none.c -+++ b/src/svc_auth_none.c -@@ -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, --- -2.49.0 - diff --git a/package/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch b/package/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch deleted file mode 100644 index 7bd8098bbd..0000000000 --- a/package/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 09d506d24abb9ce506d7a4a4201deff017018779 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Thu, 2 Jan 2025 08:46:24 -0500 -Subject: [PATCH] update signal and key_call declarations to allow compile with - gcc-15 - -Follow up patch addressing the following declarations: - sed -n 75,77p libtirpc-1.3.6/src/key_call.c - cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; - cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; - des_block *(*__key_gendes_LOCAL)() = 0; - -Signed-off-by: Rudi Heitbaum -Signed-off-by: Steve Dickson -Upstream: 240ee6c774729c9c24812aa8912f1fcf8996b162 -Signed-off-by: Thomas Petazzoni ---- - src/auth_time.c | 4 ++-- - src/key_call.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/auth_time.c b/src/auth_time.c -index 936dd76..c21b1df 100644 ---- a/src/auth_time.c -+++ b/src/auth_time.c -@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) - 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, uaddr, netid) - } 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/src/key_call.c b/src/key_call.c -index 9f4b1d2..43f990e 100644 ---- a/src/key_call.c -+++ b/src/key_call.c -@@ -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 *); - --- -2.49.0 - diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 946e30b807..0c94fd80c0 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 03352908461ad2122e5be4a678893aaa2ad2ac45 libtirpc-1.3.6.tar.bz2 +sha1 885aaa0b9c348d06dd8a9e2ae0a1a7343711eb1b libtirpc-1.3.7.tar.bz2 # Locally computed -sha256 bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508 libtirpc-1.3.6.tar.bz2 +sha256 b47d3ac19d3549e54a05d0019a6c400674da716123858cfdb6d3bdd70a66c702 libtirpc-1.3.7.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 2d2675895c..ab15954561 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.6 +LIBTIRPC_VERSION = 1.3.7 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause