From 26edbcbb395793acaa0ef01b26cf300de7dff08e Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 25 Aug 2025 12:02:50 -0400 Subject: [PATCH] libtirpc: update to 1.3.7 Release notes: https://sourceforge.net/projects/libtirpc/files/libtirpc/1.3.7/Release-1-3-7.txt Removed upstreamed patches. Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc (Intel N150 based box) Signed-off-by: John Audia --- libs/libtirpc/Makefile | 4 +- ...rations-to-allow-compile-with-gcc-15.patch | 56 ------------------- ...d-key_call-declarations-to-allow-com.patch | 54 ------------------ 3 files changed, 2 insertions(+), 112 deletions(-) delete mode 100644 libs/libtirpc/patches/001-Update-declarations-to-allow-compile-with-gcc-15.patch delete mode 100644 libs/libtirpc/patches/002-update-signal-and-key_call-declarations-to-allow-com.patch diff --git a/libs/libtirpc/Makefile b/libs/libtirpc/Makefile index 2df260602d..537f404d37 100644 --- a/libs/libtirpc/Makefile +++ b/libs/libtirpc/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtirpc -PKG_VERSION:=1.3.6 +PKG_VERSION:=1.3.7 PKG_RELEASE:=1 PKG_SOURCE_URL:=@SF/libtirpc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508 +PKG_HASH:=b47d3ac19d3549e54a05d0019a6c400674da716123858cfdb6d3bdd70a66c702 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING diff --git a/libs/libtirpc/patches/001-Update-declarations-to-allow-compile-with-gcc-15.patch b/libs/libtirpc/patches/001-Update-declarations-to-allow-compile-with-gcc-15.patch deleted file mode 100644 index 0751498834..0000000000 --- a/libs/libtirpc/patches/001-Update-declarations-to-allow-compile-with-gcc-15.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d473f1e1f6ba80bfaee4daa058da159305167323 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 ---- - src/auth_none.c | 2 +- - src/getpublickey.c | 2 +- - src/svc_auth_none.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - ---- a/src/auth_none.c -+++ b/src/auth_none.c -@@ -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(); - ---- 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 ---- 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, diff --git a/libs/libtirpc/patches/002-update-signal-and-key_call-declarations-to-allow-com.patch b/libs/libtirpc/patches/002-update-signal-and-key_call-declarations-to-allow-com.patch deleted file mode 100644 index 9a6c063503..0000000000 --- a/libs/libtirpc/patches/002-update-signal-and-key_call-declarations-to-allow-com.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 240ee6c774729c9c24812aa8912f1fcf8996b162 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 ---- - src/auth_time.c | 4 ++-- - src/key_call.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - ---- a/src/auth_time.c -+++ b/src/auth_time.c -@@ -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)); ---- 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 *); -