From 567faa5515fc314e2c251c8ee14fe8e4186a3d97 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 11 Mar 2025 15:00:58 -0700 Subject: [PATCH] libtirpc: Fix build with gcc-15/C23 Update declarations to allow building with gcc-15 with C23 std being default now. Fixes: error: conflicting types for 'xdr_opaque_auth Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...rations-to-allow-compile-with-gcc-15.patch | 64 +++++++++++++++++++ ...d-key_call-declarations-to-allow-com.patch | 60 +++++++++++++++++ .../libtirpc/libtirpc_1.3.6.bb | 5 +- 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch new file mode 100644 index 00000000000..7bfe7c29248 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch @@ -0,0 +1,64 @@ +From b526c0a90953f47d4cbf7ef01e9ac13e9e76904a Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Thu, 12 Dec 2024 04:16:02 -0500 +Subject: [PATCH 1/2] 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; + +Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d473f1e1f6ba80bfaee4daa058da159305167323] +Signed-off-by: Rudi Heitbaum +Signed-off-by: Steve Dickson +Signed-off-by: Khem Raj +--- + 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, diff --git a/meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch b/meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch new file mode 100644 index 00000000000..83e2105a1a4 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch @@ -0,0 +1,60 @@ +From 55452e6ae71869880f8c85d5dba9aa24d7147d8b Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Thu, 2 Jan 2025 08:46:24 -0500 +Subject: [PATCH 2/2] 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; + +Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=240ee6c774729c9c24812aa8912f1fcf8996b162] +Signed-off-by: Rudi Heitbaum +Signed-off-by: Steve Dickson +Signed-off-by: Khem Raj +--- + 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 *); + diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb index 6834e06c257..6ea9a725dbf 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb @@ -9,7 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ PROVIDES = "virtual/librpc" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ + file://0001-Update-declarations-to-allow-compile-with-gcc-15.patch \ + file://0002-update-signal-and-key_call-declarations-to-allow-com.patch \ + " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" SRC_URI[sha256sum] = "bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508" -- 2.47.3