1 Commits

Author SHA256 Message Date
ce57aa5bba Sync changes to SLFO-1.2 branch 2025-08-20 09:44:07 +02:00
4 changed files with 26 additions and 164 deletions

View File

@@ -1,69 +0,0 @@
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

View File

@@ -1,65 +0,0 @@
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

View File

@@ -1,20 +1,20 @@
-------------------------------------------------------------------
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>
Mon Feb 17 07:29:41 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
- 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>
* configure.ac: Using autoupdate updated to the latest autoconf macros
* svc_fd_create: skip getsockname on a non-network socket
* detect whether linker supports --version-script
* check for gss_pname_to_uid or hardcode an early return if we can't use aname to localname
* test for IPV6_PKTINFO and potentially define __APPLE_USE_RFC_3542 to expose
* macos uses the same mutex primitives as linux and so can use these defines
* check for struct rpcent in netdb.h before redefining
* include string.h when we need a memset prototype for
* attempt to use machine/endian.h if endian.h does not exist
* updated macOS support for tirpc [2/7] SOL_IP vs IPPROTO_IP
* check for getpeereid
* rpcb_prot.x: Update _PATH_RPCBINDSOCK
* Move rpcbind.sock to /run
- update to 1.3.5:
* Try using a new abstract address when connecting to rpcbind
@@ -28,17 +28,17 @@ Sun Aug 18 13:22:07 UTC 2024 - Dirk Müller <dmueller@suse.com>
error in authgss_refresh()".
-------------------------------------------------------------------
Wed Oct 11 12:38:02 UTC 2023 - Thomas Blume <thomas.blume@suse.com>
Tue Oct 17 15:04:18 UTC 2023 - Thomas Blume <Thomas.Blume@suse.com>
- update to 1.3.4 (bsc#1199467)
* binddynport.c honor ip_local_reserved_ports
* gss-api: expose gss major/minor error in authgss_refresh()
* rpcb_clnt.c: Eliminate double frees in delete_cache()
* rpcb_clnt.c: memory leak in destroy_addr
* portmapper: allow TCP-only portmapper
* getnetconfigent: avoid potential DoS issue by removing unnecessary sleep
* clnt_raw.c: fix a possible null pointer dereference
* bindresvport.c: fix a potential resource leakage
* binddynport.c honor ip_local_reserved_ports
* gss-api: expose gss major/minor error in authgss_refresh()
* rpcb_clnt.c: Eliminate double frees in delete_cache()
* rpcb_clnt.c: memory leak in destroy_addr
* portmapper: allow TCP-only portmapper
* getnetconfigent: avoid potential DoS issue by removing unnecessary sleep
* clnt_raw.c: fix a possible null pointer dereference
* bindresvport.c: fix a potential resource leakage
-------------------------------------------------------------------
Fri Aug 19 15:27:29 UTC 2022 - Dirk Müller <dmueller@suse.com>
@@ -189,7 +189,7 @@ Mon Mar 11 15:23:12 UTC 2019 - Michal Suchanek <msuchanek@suse.de>
-------------------------------------------------------------------
Thu Apr 12 08:06:23 UTC 2018 - Thomas.Blume@suse.com
- fix socket leak introduced by change-rpc-protocol-version-order patch
- fix socket leak introduced by change-rpc-protocol-version-order patch
(bsc#1087925)
- add 0001-Fix-regression-introduced-by-change-rpc-version-orde.patch
@@ -270,7 +270,7 @@ Mon Nov 13 15:58:42 CET 2017 - kukuk@suse.de
- 015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch:
removed, merged upstream
- patch6_7.diff: obsolete
- Replace explicit_bzero.patch with
- Replace explicit_bzero.patch with
004-replace-bzero-with-memset.patch from git
- Rename libtirpc-new-path-rpcbindsock.patch to
001-new-rpcbindsock-path.patch
@@ -296,7 +296,7 @@ Wed Jul 5 13:22:53 UTC 2017 - schwab@suse.de
-------------------------------------------------------------------
Mon Mar 14 15:17:59 CET 2016 - kukuk@suse.de
- Add some patches to get libtirpc compiled without needing glibc
- Add some patches to get libtirpc compiled without needing glibc
deprecated functions:
- 015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch
- 014-Add-des_crypt.c-and-des_impl.c-to-become-independent.patch

View File

@@ -26,10 +26,6 @@ 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)