From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] libtirpc: Version bump. 1.3.6 -> 1.3.7
Date: Fri, 29 Aug 2025 11:46:37 +0200 [thread overview]
Message-ID: <20250829094637.2620969-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20250828174226.79594-1-christian.melki@t2data.com>
Thanks, applied as 8086b38437c88d4c1312abdb882573649664dc61.
Michael
[sent from post-receive hook]
On Fri, 29 Aug 2025 11:46:37 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly syntax changes for newer compilers.
> https://git.linux-nfs.org/?p=steved/libtirpc.git;a=shortlog;h=refs/tags/libtirpc-1-3-7
>
> * Remove patchset. Included in new version.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250828174226.79594-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/libtirpc-1.3.6/0001-Update-declarations-to-allow-compile-with-gcc-15.patch b/patches/libtirpc-1.3.6/0001-Update-declarations-to-allow-compile-with-gcc-15.patch
> deleted file mode 100644
> index 67104675a07f..000000000000
> --- a/patches/libtirpc-1.3.6/0001-Update-declarations-to-allow-compile-with-gcc-15.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -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 0b0bbd148ad0..aca6e71d3e85 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 be37a2499b2b..4e96c7c1a75a 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 887e80979763..5ca98e9e0dc5 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,
> diff --git a/patches/libtirpc-1.3.6/0002-update-signal-and-key_call-declarations-to-allow-com.patch b/patches/libtirpc-1.3.6/0002-update-signal-and-key_call-declarations-to-allow-com.patch
> deleted file mode 100644
> index 9f40ef7e073a..000000000000
> --- a/patches/libtirpc-1.3.6/0002-update-signal-and-key_call-declarations-to-allow-com.patch
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -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 936dd7600b33..c21b1df2ec55 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 9f4b1d2eaf3f..43f990e7dba7 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/patches/libtirpc-1.3.6/series b/patches/libtirpc-1.3.6/series
> deleted file mode 100644
> index 2753b232e768..000000000000
> --- a/patches/libtirpc-1.3.6/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Update-declarations-to-allow-compile-with-gcc-15.patch
> -0002-update-signal-and-key_call-declarations-to-allow-com.patch
> -# 9b7afcfca14257e558acdea77ad13f9b - git-ptx-patches magic
> diff --git a/rules/libtirpc.make b/rules/libtirpc.make
> index 9b39b9a53e16..ff57d8216158 100644
> --- a/rules/libtirpc.make
> +++ b/rules/libtirpc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBTIRPC) += libtirpc
> #
> # Paths and names
> #
> -LIBTIRPC_VERSION := 1.3.6
> -LIBTIRPC_MD5 := 8de9e6af16c4bc65ba40d0924745f5b7
> +LIBTIRPC_VERSION := 1.3.7
> +LIBTIRPC_MD5 := 74f97df306b8d6149d3d9898a1d44c6e
> LIBTIRPC := libtirpc-$(LIBTIRPC_VERSION)
> LIBTIRPC_SUFFIX := tar.bz2
> LIBTIRPC_URL := $(call ptx/mirror, SF, libtirpc/$(LIBTIRPC).$(LIBTIRPC_SUFFIX))
prev parent reply other threads:[~2025-08-29 9:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-28 17:42 [ptxdist] [PATCH] " Christian Melki
2025-08-29 9:46 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250829094637.2620969-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox