|
| 1 | +Patch-Source: https://src.fedoraproject.org/rpms/libtirpc/blob/77cf27589f01c5277e5cdbaf9d03b9647359b41a/f/libtirpc.1.3.7-rc3.patch |
| 2 | +--- |
| 3 | +commit 240ee6c774729c9c24812aa8912f1fcf8996b162 |
| 4 | +Author: Rudi Heitbaum < [email protected]> |
| 5 | +Date: Thu Jan 2 08:46:24 2025 -0500 |
| 6 | + |
| 7 | + update signal and key_call declarations to allow compile with gcc-15 |
| 8 | + |
| 9 | + Follow up patch addressing the following declarations: |
| 10 | + sed -n 75,77p libtirpc-1.3.6/src/key_call.c |
| 11 | + cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; |
| 12 | + cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; |
| 13 | + des_block *(*__key_gendes_LOCAL)() = 0; |
| 14 | + |
| 15 | + Signed-off-by: Rudi Heitbaum < [email protected]> |
| 16 | + Signed-off-by: Steve Dickson < [email protected]> |
| 17 | + |
| 18 | +diff --git a/src/auth_time.c b/src/auth_time.c |
| 19 | +index 936dd76..c21b1df 100644 |
| 20 | +--- a/src/auth_time.c |
| 21 | ++++ b/src/auth_time.c |
| 22 | +@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) |
| 23 | + char ut[64], ipuaddr[64]; |
| 24 | + endpoint teps[32]; |
| 25 | + nis_server tsrv; |
| 26 | +- void (*oldsig)() = NULL; /* old alarm handler */ |
| 27 | ++ void (*oldsig)(int) = NULL; /* old alarm handler */ |
| 28 | + struct sockaddr_in sin; |
| 29 | + int s = RPC_ANYSOCK; |
| 30 | + socklen_t len; |
| 31 | +@@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) |
| 32 | + } else { |
| 33 | + int res; |
| 34 | + |
| 35 | +- oldsig = (void (*)())signal(SIGALRM, alarm_hndler); |
| 36 | ++ oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler); |
| 37 | + saw_alarm = 0; /* global tracking the alarm */ |
| 38 | + alarm(20); /* only wait 20 seconds */ |
| 39 | + res = connect(s, (struct sockaddr *)&sin, sizeof(sin)); |
| 40 | +diff --git a/src/key_call.c b/src/key_call.c |
| 41 | +index 9f4b1d2..43f990e 100644 |
| 42 | +--- a/src/key_call.c |
| 43 | ++++ b/src/key_call.c |
| 44 | +@@ -72,9 +72,9 @@ |
| 45 | + * implementations of these functions, and to call those in key_call(). |
| 46 | + */ |
| 47 | + |
| 48 | +-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; |
| 49 | +-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; |
| 50 | +-des_block *(*__key_gendes_LOCAL)() = 0; |
| 51 | ++cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0; |
| 52 | ++cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0; |
| 53 | ++des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0; |
| 54 | + |
| 55 | + static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *); |
| 56 | + |
| 57 | + |
| 58 | +commit d473f1e1f6ba80bfaee4daa058da159305167323 |
| 59 | +Author: Rudi Heitbaum < [email protected]> |
| 60 | +Date: Thu Dec 12 04:16:02 2024 -0500 |
| 61 | + |
| 62 | + Update declarations to allow compile with gcc-15 |
| 63 | + |
| 64 | + This patch fixes some of the compile errors with gcc 15-20241117. |
| 65 | + |
| 66 | + In addition the follow declarations need to be fixed: |
| 67 | + sed -n 75,77p libtirpc-1.3.6/src/key_call.c |
| 68 | + cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; |
| 69 | + cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; |
| 70 | + des_block *(*__key_gendes_LOCAL)() = 0; |
| 71 | + |
| 72 | + Signed-off-by: Rudi Heitbaum < [email protected]> |
| 73 | + Signed-off-by: Steve Dickson < [email protected]> |
| 74 | + |
| 75 | +diff --git a/src/auth_none.c b/src/auth_none.c |
| 76 | +index 0b0bbd1..aca6e71 100644 |
| 77 | +--- a/src/auth_none.c |
| 78 | ++++ b/src/auth_none.c |
| 79 | +@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *, struct opaque_auth *); |
| 80 | + static bool_t authnone_refresh (AUTH *, void *); |
| 81 | + static void authnone_destroy (AUTH *); |
| 82 | + |
| 83 | +-extern bool_t xdr_opaque_auth(); |
| 84 | ++extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); |
| 85 | + |
| 86 | + static struct auth_ops *authnone_ops(); |
| 87 | + |
| 88 | +diff --git a/src/getpublickey.c b/src/getpublickey.c |
| 89 | +index be37a24..4e96c7c 100644 |
| 90 | +--- a/src/getpublickey.c |
| 91 | ++++ b/src/getpublickey.c |
| 92 | +@@ -52,7 +52,7 @@ |
| 93 | + /* |
| 94 | + * Hack to let ypserv/rpc.nisd use AUTH_DES. |
| 95 | + */ |
| 96 | +-int (*__getpublickey_LOCAL)() = 0; |
| 97 | ++int (*__getpublickey_LOCAL)(const char *, char *) = 0; |
| 98 | + |
| 99 | + /* |
| 100 | + * Get somebody's public key |
| 101 | +diff --git a/src/svc_auth_none.c b/src/svc_auth_none.c |
| 102 | +index 887e809..5ca98e9 100644 |
| 103 | +--- a/src/svc_auth_none.c |
| 104 | ++++ b/src/svc_auth_none.c |
| 105 | +@@ -37,8 +37,8 @@ |
| 106 | + |
| 107 | + #include <rpc/rpc.h> |
| 108 | + |
| 109 | +-static bool_t svcauth_none_destroy(); |
| 110 | +-static bool_t svcauth_none_wrap(); |
| 111 | ++static bool_t svcauth_none_destroy(SVCAUTH *); |
| 112 | ++static bool_t svcauth_none_wrap(SVCAUTH *, XDR *, bool_t (*)(XDR *, ...), char *); |
| 113 | + |
| 114 | + struct svc_auth_ops svc_auth_none_ops = { |
| 115 | + svcauth_none_wrap, |
| 116 | + |
| 117 | + |
0 commit comments