diff --git a/gnome-keyring-c89.patch b/gnome-keyring-c89.patch new file mode 100644 index 0000000..d24cb6c --- /dev/null +++ b/gnome-keyring-c89.patch @@ -0,0 +1,21 @@ +S-expressions test: Call gkm_crypto_sign_xsa with correct size type + +The underlying type for gsize can be unsigned int, which is a distinct +type from unsigned long (the type behind CK_ULONG). The mismatch +results in compilation failures with GCC 14. + +Submitted upstream: + +diff --git a/pkcs11/gkm/test-sexp.c b/pkcs11/gkm/test-sexp.c +index ba104a0e5b776669..fccf672353ddf42f 100644 +--- a/pkcs11/gkm/test-sexp.c ++++ b/pkcs11/gkm/test-sexp.c +@@ -224,7 +224,7 @@ test_sign_verify (Test *test, gconstpointer unused) + guchar data[] = TEST_DATA; + guchar data_size = TEST_DATA_SIZE; + guchar signature[128]; +- gsize signature_size = 128; ++ CK_ULONG signature_size = 128; + + /* RSA */ + /* sign some data */ diff --git a/gnome-keyring.spec b/gnome-keyring.spec index acf379f..fbb351f 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -6,7 +6,7 @@ Name: gnome-keyring Version: 42.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Framework for managing passwords and other secrets License: GPLv2+ and LGPLv2+ @@ -14,6 +14,7 @@ URL: https://wiki.gnome.org/Projects/GnomeKeyring Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz # https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/52 Patch0: gnome-keyring-42.0-fix-strncpy.patch +Patch1: gnome-keyring-c89.patch BuildRequires: pkgconfig(gcr-3) >= %{gcr_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -131,6 +132,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la %changelog +* Fri Jan 26 2024 Florian Weimer - 42.1-10 +- Fix C compatibility issue + * Wed Jan 24 2024 Fedora Release Engineering - 42.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild