From c3bab200d97460028d842d76484b4c08fb947fef Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 4 Dec 2024 11:04:41 +0100 Subject: [PATCH] Require gpgrt 1.51 * configure.ac (NEED_GPGRT_VERSION): Bump to 1.51. * g10/keydb.c (internal_keydb_update_keyblock) [!USE_TOFU]: Mark an arg unused. * common/homedir.c (create_common_conf) [!BUILD_WITH_KEYBOXD]: Mark an arg unused. --- common/homedir.c | 4 +++- configure.ac | 2 +- g10/keydb.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/homedir.c b/common/homedir.c index 8ef402b33..d26ddd902 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -292,7 +292,9 @@ create_common_conf (const char *dname) gpg_strerror (gpg_error_from_syserror ())); } } -#endif /* BUILD_WITH_KEYBOXD */ +#else /* BUILD_WITH_KEYBOXD */ + (void)dname; +#endif /* !BUILD_WITH_KEYBOXD */ } diff --git a/configure.ac b/configure.ac index dea5cc8d8..68d74b9aa 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) # As well as the source info for the man pages. AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg26", [swdb tag for this branch]) -NEED_GPGRT_VERSION=1.50 +NEED_GPGRT_VERSION=1.51 NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.11.0 diff --git a/g10/keydb.c b/g10/keydb.c index 62ffdc23c..590b45713 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -1422,6 +1422,8 @@ internal_keydb_update_keyblock (ctrl_t ctrl, KEYDB_HANDLE hd, kbnode_t kb) #ifdef USE_TOFU tofu_notice_key_changed (ctrl, kb); +#else + (void)ctrl; #endif memset (&desc, 0, sizeof (desc));