forked from pool/libtirpc
Compare commits
4 Commits
Author | SHA256 | Date | |
---|---|---|---|
87ed136655 | |||
|
c890c6c327 | ||
fe6fea2d98 | |||
|
2bb98118d6 |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f
|
||||
size 565188
|
69
libtirpc-1.3.6-gcc15-part1.patch
Normal file
69
libtirpc-1.3.6-gcc15-part1.patch
Normal file
@@ -0,0 +1,69 @@
|
||||
|
||||
git.linux-nfs.org/?p=steved/libtirpc.git;a=patch;h=d473f1e
|
||||
|
||||
|
||||
From d473f1e1f6ba80bfaee4daa058da159305167323 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
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 <rudi@heitbaum.com>
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
---
|
||||
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 <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,
|
||||
--
|
||||
1.8.3.1
|
||||
|
65
libtirpc-1.3.6-gcc15-part2.patch
Normal file
65
libtirpc-1.3.6-gcc15-part2.patch
Normal file
@@ -0,0 +1,65 @@
|
||||
|
||||
git.linux-nfs.org/?p=steved/libtirpc.git;a=patch;h=240ee6c
|
||||
|
||||
|
||||
From 240ee6c774729c9c24812aa8912f1fcf8996b162 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
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 <rudi@heitbaum.com>
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
---
|
||||
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 *);
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
BIN
libtirpc-1.3.6.tar.bz2
(Stored with Git LFS)
Normal file
BIN
libtirpc-1.3.6.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 21 20:57:11 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
|
||||
|
||||
- add patches from upstream to fix gcc-15 compile time errors:
|
||||
* libtirpc-1.3.6-gcc15-part1.patch
|
||||
* libtirpc-1.3.6-gcc15-part2.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 29 11:12:27 UTC 2024 - Petr Vorel <pvorel@suse.cz>
|
||||
|
||||
- update to 1.3.6:
|
||||
* http://sourceforge.net/projects/libtirpc/files/libtirpc/1.3.6/Release-1.3.6.txt
|
||||
* https://lore.kernel.org/linux-nfs/91ef3508-d0a6-48db-adfc-4f7831fba74e@redhat.com/
|
||||
* rpcbind config changes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 18 13:22:07 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
@@ -18,7 +18,7 @@
|
||||
|
||||
%define debug_package_requires libtirpc3 = %{version}-%{release}
|
||||
Name: libtirpc
|
||||
Version: 1.3.5
|
||||
Version: 1.3.6
|
||||
Release: 0
|
||||
Summary: Transport Independent RPC Library
|
||||
License: BSD-3-Clause
|
||||
@@ -26,6 +26,10 @@ Group: Development/Libraries/C and C++
|
||||
URL: https://sourceforge.net/projects/libtirpc/
|
||||
Source: https://download.sourceforge.net/libtirpc/%{name}-%{version}.tar.bz2
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM libtirpc-1.3.6-gcc15-part1.patch -- git.linux-nfs.org/?p=steved/libtirpc.git;a=patch;h=d473f1e
|
||||
Patch1: libtirpc-1.3.6-gcc15-part1.patch
|
||||
# PATCH-FIX-UPSTREAM libtirpc-1.3.6-gcc15-part2.patch -- git.linux-nfs.org/?p=steved/libtirpc.git;a=patch;h=240ee6c
|
||||
Patch2: libtirpc-1.3.6-gcc15-part2.patch
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(krb5)
|
||||
|
||||
|
Reference in New Issue
Block a user