git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 55452e6ae71869880f8c85d5dba9aa24d7147d8b Mon Sep 17 00:00:00 2001
   2 From: Rudi Heitbaum <rudi@heitbaum.com>
   3 Date: Thu, 2 Jan 2025 08:46:24 -0500
   4 Subject: [PATCH 2/2] update signal and key_call declarations to allow compile
   5  with gcc-15
   6
   7 Follow up patch addressing the following declarations:
   8   sed -n 75,77p libtirpc-1.3.6/src/key_call.c
   9   cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
  10   cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
  11   des_block *(*__key_gendes_LOCAL)() = 0;
  12
  13 Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=240ee6c774729c9c24812aa8912f1fcf8996b162]
  14 Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
  15 Signed-off-by: Steve Dickson <steved@redhat.com>
  16 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  17 ---
  18  src/auth_time.c | 4 ++--
  19  src/key_call.c  | 6 +++---
  20  2 files changed, 5 insertions(+), 5 deletions(-)
  21
  22 diff --git a/src/auth_time.c b/src/auth_time.c
  23 index 936dd76..c21b1df 100644
  24 --- a/src/auth_time.c
  25 +++ b/src/auth_time.c
  26 @@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
  27         char                    ut[64], ipuaddr[64];
  28         endpoint                teps[32];
  29         nis_server              tsrv;
  30 -       void                    (*oldsig)() = NULL; /* old alarm handler */
  31 +       void                    (*oldsig)(int) = NULL; /* old alarm handler */
  32         struct sockaddr_in      sin;
  33         int                     s = RPC_ANYSOCK;
  34         socklen_t len;
  35 @@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
  36                 } else {
  37                         int res;
  38
  39 -                       oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
  40 +                       oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler);
  41                         saw_alarm = 0; /* global tracking the alarm */
  42                         alarm(20); /* only wait 20 seconds */
  43                         res = connect(s, (struct sockaddr *)&sin, sizeof(sin));
  44 diff --git a/src/key_call.c b/src/key_call.c
  45 index 9f4b1d2..43f990e 100644
  46 --- a/src/key_call.c
  47 +++ b/src/key_call.c
  48 @@ -72,9 +72,9 @@
  49   * implementations of these functions, and to call those in key_call().
  50   */
  51
  52 -cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
  53 -cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
  54 -des_block *(*__key_gendes_LOCAL)() = 0;
  55 +cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0;
  56 +cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0;
  57 +des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0;
  58
  59  static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
  60