diff --git a/base/comps/components.toml b/base/comps/components.toml index f9cd702c6ef..6d7d4db3d07 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -1762,7 +1762,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.libmicrohttpd] [components.libmnl] [components.libmodplug] -[components.libmodulemd] [components.libmongocrypt] [components.libmpc] [components.libmpcdec] diff --git a/base/comps/libmodulemd/libmodulemd.comp.toml b/base/comps/libmodulemd/libmodulemd.comp.toml new file mode 100644 index 00000000000..0d44a805fbe --- /dev/null +++ b/base/comps/libmodulemd/libmodulemd.comp.toml @@ -0,0 +1,4 @@ +# Pin to Fedora f43 libmodulemd-2.15.4-1.fc43 to pick up upstream CVE fixes. +# https://src.fedoraproject.org/rpms/libmodulemd/c/84b36bf188b6e986117b19adeaad73401eb2ccb1 +[components.libmodulemd] +spec = { type = "upstream", upstream-commit = "84b36bf188b6e986117b19adeaad73401eb2ccb1" } diff --git a/locks/libmodulemd.lock b/locks/libmodulemd.lock index b765c0c9b29..35937bfddce 100644 --- a/locks/libmodulemd.lock +++ b/locks/libmodulemd.lock @@ -1,7 +1,7 @@ # Managed by azldev component update. Do not edit manually. version = 1 import-commit = 'c05d8536fad769dbd27a1ac1a8bd2fcb5d174358' -upstream-commit = 'a7967d787972957a17b1a2b3d59b1bb9cffa9126' +upstream-commit = '84b36bf188b6e986117b19adeaad73401eb2ccb1' manual-bump = 2 -input-fingerprint = 'sha256:e4e8f8e8f3232bfeef35942c763a872dd1af83c4735f4942b721ad33f935d80d' -resolution-input-hash = 'sha256:ee2b4b2a7474232699f7ef1461160019159849dcc0daf2dcff1aabf35416ecec' +input-fingerprint = 'sha256:f6607534e221e2a2ce8a7ba2e1274c2e051cfddd7d994c89bc5f2fdf33f1f9cd' +resolution-input-hash = 'sha256:ce634ea6912bf8cc9d5dae5f9d31b27bffc66dcb36f461e6b66ba07f96f059f1' diff --git a/specs/l/libmodulemd/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg b/specs/l/libmodulemd/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg deleted file mode 100644 index 3cbbce4a359..00000000000 Binary files a/specs/l/libmodulemd/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg and /dev/null differ diff --git a/specs/l/libmodulemd/keyring-10E1B1BC73B4796EE25B9CA42D20EEFCA8895F65.pgp b/specs/l/libmodulemd/keyring-10E1B1BC73B4796EE25B9CA42D20EEFCA8895F65.pgp new file mode 100644 index 00000000000..ba0c3baef8a Binary files /dev/null and b/specs/l/libmodulemd/keyring-10E1B1BC73B4796EE25B9CA42D20EEFCA8895F65.pgp differ diff --git a/specs/l/libmodulemd/libmodulemd.spec b/specs/l/libmodulemd/libmodulemd.spec index 455ec07b543..7bee9929906 100644 --- a/specs/l/libmodulemd/libmodulemd.spec +++ b/specs/l/libmodulemd/libmodulemd.spec @@ -26,8 +26,8 @@ %endif Name: %{upstream_name}%{?v2_suffix} -Version: 2.15.3 -Release: 5%{?dist} +Version: 2.15.4 +Release: 6%{?dist} Summary: Module metadata manipulation library # COPYING: MIT @@ -43,9 +43,13 @@ URL: https://github.com/fedora-modularity/libmodulemd Source0: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz Source1: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz.asc # Key exported from Petr Pisar's keyring -Source2: gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg +Source2: keyring-10E1B1BC73B4796EE25B9CA42D20EEFCA8895F65.pgp +%if (0%{?rhel} && 0%{?rhel} <= 7) BuildRequires: gnupg2 +%else +BuildRequires: openpgpverify +%endif BuildRequires: meson >= 0.47 BuildRequires: pkgconfig BuildRequires: gcc @@ -112,7 +116,11 @@ Development files for %{name}. %prep +%if (0%{?rhel} && 0%{?rhel} <= 7) %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%else +%{openpgpverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%endif %autosetup -p1 -n modulemd-%{version} @@ -185,6 +193,12 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Fri Nov 06 2026 Petr Pisar - 2.15.4-1 +- 2.15.4 bump + +* Mon Oct 12 2026 Jakub Jelen - 2.15.3-2 +- Verify upstream source signatures with openpgpverify + * Fri Jun 12 2026 Petr Pisar - 2.15.3-1 - 2.15.3 bump diff --git a/specs/l/libmodulemd/sources b/specs/l/libmodulemd/sources index cb103ed2edd..50ee547b006 100644 --- a/specs/l/libmodulemd/sources +++ b/specs/l/libmodulemd/sources @@ -1,2 +1,2 @@ -SHA512 (modulemd-2.15.3.tar.xz) = b8c2f80553b66704e8117a6608cbfc1b1a47cb8f260503193c58aff702c2e11cd79b795482d0c9a953ab73e53ecb8133682fe2e8a0755eca1d99b718bbccfde2 -SHA512 (modulemd-2.15.3.tar.xz.asc) = ac08c79ad6ae5be2e8085b2a598848c4121d21fe25a5bd64c05b36a7558d07b2e55fb468ae2633a8d880212b3c711163291070381d04082707d0236e58e21e9b +SHA512 (modulemd-2.15.4.tar.xz) = a9a0f85688588a6d890357e1d95f18f8247178985c5e8c64ca682f95832bc584bf844c927ff7a2b7ad606ff022d659c4a9dc8a2653b4e3ac179fd251c850e1ba +SHA512 (modulemd-2.15.4.tar.xz.asc) = bc3dbbb23d31bb9bf6495143375db42f4f0bbf6e3615b3ab84982212769dc3a39e2311cac4e042ae728902d53eaa2aefbfbc553b9c1145ab755a9115244994c1