From 1d52e5b2772573c592b9ffeaca2b4b7c71e182cd Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:05:32 +0000 Subject: [PATCH] import UBI libsecret-0.21.2-7.el10 --- .gitignore | 2 +- .libsecret.metadata | 1 - ...ve-unnecessary-inclusion-of-gcrypt.h.patch | 26 +++ SPECS/libsecret.spec => libsecret.spec | 163 +++++++++++++++--- sources | 1 + 5 files changed, 167 insertions(+), 26 deletions(-) delete mode 100644 .libsecret.metadata create mode 100644 0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch rename SPECS/libsecret.spec => libsecret.spec (53%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index f32a6d6..c830a08 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libsecret-0.18.6.tar.xz +libsecret-0.21.2.tar.xz diff --git a/.libsecret.metadata b/.libsecret.metadata deleted file mode 100644 index 00c5183..0000000 --- a/.libsecret.metadata +++ /dev/null @@ -1 +0,0 @@ -e840a40062c135f4eec41f057a326d9ed519ff4f SOURCES/libsecret-0.18.6.tar.xz diff --git a/0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch b/0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch new file mode 100644 index 0000000..57c2b0e --- /dev/null +++ b/0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch @@ -0,0 +1,26 @@ +From 7f31c832306c10f4e92ac31124e144abff282e46 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 11 Dec 2023 08:39:58 +0900 +Subject: [PATCH] tests: Remove unnecessary inclusion of + +Signed-off-by: Daiki Ueno +--- + egg/test-hkdf.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/egg/test-hkdf.c b/egg/test-hkdf.c +index 289e702..d90233c 100644 +--- a/egg/test-hkdf.c ++++ b/egg/test-hkdf.c +@@ -32,8 +32,6 @@ + #include "egg/egg-secure-memory.h" + #include "egg/egg-testing.h" + +-#include +- + #undef G_DISABLE_ASSERT + + EGG_SECURE_DEFINE_GLIB_GLOBALS (); +-- +2.43.0 + diff --git a/SPECS/libsecret.spec b/libsecret.spec similarity index 53% rename from SPECS/libsecret.spec rename to libsecret.spec index 58afee2..93017d5 100644 --- a/SPECS/libsecret.spec +++ b/libsecret.spec @@ -5,23 +5,35 @@ %global has_valgrind 1 %endif +%bcond_without gnutls + Name: libsecret -Version: 0.18.6 -Release: 1%{?dist} +Version: 0.21.2 +Release: 7%{?dist} Summary: Library for storing and retrieving passwords and other secrets -License: LGPLv2+ +# libsecret/mock/aes.py is Apache-2.0 +# libsecret/mock/hkdf.py is GPL-2.0-or-later OR TGPPL-1.0 +# part of libsecret/mock/dh.py is LicenseRef-Fedora-Public-Domain +License: LGPL-2.1-or-later AND Apache-2.0 AND (GPL-2.0-or-later OR TGPPL-1.0) AND LicenseRef-Fedora-Public-Domain URL: https://wiki.gnome.org/Projects/Libsecret -Source0: http://download.gnome.org/sources/libsecret/%{release_version}/libsecret-%{version}.tar.xz +Source0: https://download.gnome.org/sources/libsecret/%{release_version}/libsecret-%{version}.tar.xz +# https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/133 +Patch: 0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel -BuildRequires: intltool -BuildRequires: libgcrypt-devel >= 1.2.2 -BuildRequires: vala -BuildRequires: gtk-doc -BuildRequires: libxslt-devel BuildRequires: docbook-style-xsl +BuildRequires: gettext +BuildRequires: gi-docgen +BuildRequires: meson +BuildRequires: vala +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +%if %{with gnutls} +BuildRequires: pkgconfig(gnutls) >= 3.8.2 +%else +BuildRequires: pkgconfig(libgcrypt) >= 1.2.2 +%endif +BuildRequires: /usr/bin/xsltproc %if 0%{?has_valgrind} BuildRequires: valgrind-devel %endif @@ -44,7 +56,7 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 # Use system valgrind headers instead %if 0%{?has_valgrind} @@ -53,41 +65,144 @@ rm -rf build/valgrind/ %build -%configure --disable-static -make %{?_smp_mflags} +%meson \ +%if %{with gnutls} +-Dcrypto=gnutls \ +%else +-Dcrypto=libgcrypt \ +%endif +%{nil} + +%meson_build %install -%make_install - -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%meson_install %find_lang libsecret -%ldconfig_scriptlets - - %files -f libsecret.lang %license COPYING -%doc AUTHORS NEWS README +%doc NEWS README.md %{_bindir}/secret-tool -%{_libdir}/libsecret-1.so.* +%{_libdir}/libsecret-1.so.0* +%dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Secret-1.typelib -%doc %{_mandir}/man1/secret-tool.1.gz +%{_mandir}/man1/secret-tool.1* %files devel +%license COPYING docs/reference/COPYING %{_includedir}/libsecret-1/ %{_libdir}/libsecret-1.so %{_libdir}/pkgconfig/libsecret-1.pc %{_libdir}/pkgconfig/libsecret-unstable.pc +%dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/Secret-1.gir +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/libsecret-1.deps %{_datadir}/vala/vapi/libsecret-1.vapi -%doc %{_datadir}/gtk-doc/ +%doc %{_docdir}/libsecret-1/ %changelog +* Tue Oct 29 2024 Troy Dawson - 0.21.2-7 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Aug 19 2024 Tomas Popela - 0.21.2-6 +- Fix SDPX license + +* Mon Jun 24 2024 Troy Dawson - 0.21.2-5 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.21.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.21.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Dec 10 2023 Daiki Ueno - 0.21.2-2 +- Use GnuTLS as the default crypto backend + +* Sat Dec 09 2023 Kalev Lember - 0.21.2-1 +- Update to 0.21.2 + +* Tue Sep 19 2023 Kalev Lember - 0.21.1-1 +- Update to 0.21.1 + +* Fri Aug 11 2023 Kalev Lember - 0.21.0-1 +- Update to 0.21.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 0.20.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.20.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.20.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Feb 21 2022 David King - 0.20.5-1 +- Update to 0.20.5 + +* Thu Jan 20 2022 Fedora Release Engineering - 0.20.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.20.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.20.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Nov 10 2020 Kalev Lember - 0.20.4-1 +- Update to 0.20.4 + +* Tue Jul 28 2020 Fedora Release Engineering - 0.20.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 20 2020 Kalev Lember - 0.20.3-1 +- Update to 0.20.3 + +* Mon Apr 06 2020 Kalev Lember - 0.20.2-2 +- Drop gnome-keyring recommends again (#1781864) + +* Wed Mar 11 2020 Kalev Lember - 0.20.2-1 +- Update to 0.20.2 + +* Tue Jan 28 2020 Kalev Lember - 0.20.1-1 +- Update to 0.20.1 + +* Tue Jan 14 2020 Kalev Lember - 0.20.0-1 +- Update to 0.20.0 + +* Fri Sep 06 2019 Kalev Lember - 0.19.1-1 +- Update to 0.19.1 + +* Fri Sep 06 2019 Kalev Lember - 0.19.0-2 +- Recommend gnome-keyring (#1725412) + +* Thu Sep 05 2019 Kalev Lember - 0.19.0-1 +- Update to 0.19.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.18.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Mar 02 2019 Kalev Lember - 0.18.8-1 +- Update to 0.18.8 + +* Fri Feb 01 2019 Fedora Release Engineering - 0.18.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Dec 29 2018 Kalev Lember - 0.18.7-1 +- Update to 0.18.7 +- Fix unowned gir and vala directories +- Tighten soname glob to avoid unnoticed soname bumps + +* Fri Jul 13 2018 Fedora Release Engineering - 0.18.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 29 2018 Kalev Lember - 0.18.6-1 - Update to 0.18.6 - Use valgrind_arches macro instead of hardcoding valgrind arch list diff --git a/sources b/sources new file mode 100644 index 0000000..9b0988c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libsecret-0.21.2.tar.xz) = 7aafa29de9aef31e656f805ccea33816270d7e2e51322952fa005fcfe3953b1d4caa80ddb6456a0f3c76b392c083510cdef7ab17d82155248df2cf0d31c9dda4