Fix C compatibility issue
Related to: <https://fedoraproject.org/wiki/Changes/PortingToModernC> <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
This commit is contained in:
parent
8ed7c3f609
commit
7d554956a4
21
gnome-keyring-c89.patch
Normal file
21
gnome-keyring-c89.patch
Normal file
@ -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: <https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/63>
|
||||||
|
|
||||||
|
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 */
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: gnome-keyring
|
Name: gnome-keyring
|
||||||
Version: 42.1
|
Version: 42.1
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
Summary: Framework for managing passwords and other secrets
|
Summary: Framework for managing passwords and other secrets
|
||||||
|
|
||||||
License: GPLv2+ and LGPLv2+
|
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
|
Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz
|
||||||
# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/52
|
# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/52
|
||||||
Patch0: gnome-keyring-42.0-fix-strncpy.patch
|
Patch0: gnome-keyring-42.0-fix-strncpy.patch
|
||||||
|
Patch1: gnome-keyring-c89.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
|
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||||
@ -131,6 +132,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 26 2024 Florian Weimer <fweimer@redhat.com> - 42.1-10
|
||||||
|
- Fix C compatibility issue
|
||||||
|
|
||||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 42.1-9
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 42.1-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user