mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-10 19:22:10 +01:00
117 lines
3.9 KiB
Diff
117 lines
3.9 KiB
Diff
Patch-Source: https://src.fedoraproject.org/rpms/libtirpc/blob/77cf27589f01c5277e5cdbaf9d03b9647359b41a/f/libtirpc.1.3.7-rc3.patch
|
|
---
|
|
commit 240ee6c774729c9c24812aa8912f1fcf8996b162
|
|
Author: Rudi Heitbaum <rudi@heitbaum.com>
|
|
Date: Thu Jan 2 08:46:24 2025 -0500
|
|
|
|
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 <rudi@heitbaum.com>
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
|
|
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 *);
|
|
|
|
|
|
commit d473f1e1f6ba80bfaee4daa058da159305167323
|
|
Author: Rudi Heitbaum <rudi@heitbaum.com>
|
|
Date: Thu Dec 12 04:16:02 2024 -0500
|
|
|
|
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 <rudi@heitbaum.com>
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
|
|
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 <rpc/rpc.h>
|
|
|
|
-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,
|
|
|