AlmaLinux changes

This commit is contained in:
Andrew Lukoshko 2021-09-15 10:04:09 +00:00
parent 8e9d88ce5e
commit a58fa7d52a
2 changed files with 27 additions and 2 deletions

View File

@ -0,0 +1,22 @@
From be415f051a9e049469d884f6cf17bd1c3f217829 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov <dantipov@cloudlinux.com>
Date: Mon, 5 Apr 2021 07:59:32 +0300
Subject: [PATCH] Fix check whether the subkey can be used for signing
---
libdnf/repo/Repo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libdnf/repo/Repo.cpp b/libdnf/repo/Repo.cpp
index 97c84fa75..4934b4d90 100644
--- a/libdnf/repo/Repo.cpp
+++ b/libdnf/repo/Repo.cpp
@@ -726,7 +726,7 @@ static std::vector<Key> rawkey2infos(int fd) {
// _extract_signing_subkey
auto subkey = key->subkeys;
- while (subkey && !key->subkeys->can_sign) {
+ while (subkey && !subkey->can_sign) {
subkey = subkey->next;
}
if (subkey)

View File

@ -56,7 +56,7 @@
Name: libdnf Name: libdnf
Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version} Version: %{libdnf_major_version}.%{libdnf_minor_version}.%{libdnf_micro_version}
Release: 7%{?dist} Release: 7%{?dist}.alma
Summary: Library providing simplified C and Python API to libsolv Summary: Library providing simplified C and Python API to libsolv
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/rpm-software-management/libdnf URL: https://github.com/rpm-software-management/libdnf
@ -69,7 +69,7 @@ Patch4: 0005-Allow-loading-incomplete-cache-and-loading-ext-solv-files-w
Patch5: 0006-Add-new-option-module-stream-switch.patch Patch5: 0006-Add-new-option-module-stream-switch.patch
Patch6: 0007-Fix-removal-step-during-modular-enable-in-context-part.patch Patch6: 0007-Fix-removal-step-during-modular-enable-in-context-part.patch
Patch7: 0008-Update-translations.patch Patch7: 0008-Update-translations.patch
Patch8: libdnf-0.48.0-gpg_subkeys.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
@ -317,6 +317,9 @@ popd
%endif %endif
%changelog %changelog
* Sun May 23 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 0.55.0-7.alma
- Add support for GPG subkeys for repodata signing
* Mon Mar 8 2021 Marek Blaha <mblaha@redhat.com> - 0.55.0-7 * Mon Mar 8 2021 Marek Blaha <mblaha@redhat.com> - 0.55.0-7
- Update translations (RhBug:1820548) - Update translations (RhBug:1820548)