From 5a103aa4931082cab20338a90b829d30db40f91c Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Jun 16 2022 12:42:05 +0000 Subject: Give error message for failed PGP key import due to missing SHA1 support Resolves: #2069877 --- diff --git a/0001-Give-error-message-for-failed-PGP-key-import.patch b/0001-Give-error-message-for-failed-PGP-key-import.patch new file mode 100644 index 0000000..c3ae790 --- /dev/null +++ b/0001-Give-error-message-for-failed-PGP-key-import.patch @@ -0,0 +1,25 @@ +From b105f03f956e6e1523df2ac3fffc86b924fd6e1b Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Jun 2022 14:29:01 +0200 +Subject: [PATCH] Give error message for failed PGP key import + +due to missing SHA1 support +--- + rpmio/rpmpgp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c +index d0688ebe9..71f8ed192 100644 +--- a/rpmio/rpmpgp.c ++++ b/rpmio/rpmpgp.c +@@ -860,6 +860,7 @@ int pgpPubkeyFingerprint(const uint8_t *h, size_t hlen, + *fplen = dlen; + } else { + free(d); ++ rpmlog(RPMLOG_ERR, _("Failed calculating fingerprint of public key. SHA1 not supported.\n")); + } + } + +-- +2.36.1 + diff --git a/rpm.spec b/rpm.spec index c864f79..77b0ac7 100644 --- a/rpm.spec +++ b/rpm.spec @@ -32,7 +32,7 @@ %global rpmver 4.16.1.3 #global snapver rc1 -%global rel 12 +%global rel 13 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -87,6 +87,7 @@ Patch113: rpm-4.16.1.3-fix-spurious-transfiletriggerpostun-execution.patch Patch906: rpm-4.7.1-geode-i686.patch # Probably to be upstreamed in slightly different form Patch907: rpm-4.15.x-ldflags.patch +Patch908: 0001-Give-error-message-for-failed-PGP-key-import.patch # Not yet (all) upstream, debugedit DWARF5 # https://code.wildebeest.org/git/user/mjw/rpm/log/?h=gcc-dwarf5-4.16.1.2 @@ -611,6 +612,9 @@ fi %doc doc/librpm/html/* %changelog +* Thu Jun 16 2022 Florian Festi - 4.16.1.3-13 +- Error message for failed key import (#2069877) + * Tue Apr 05 2022 Michal Domonkos - 4.16.1.3-12 - Fix minor ABI regression in rpmcli.h (#2037352)