diff --git a/backport-Specify-the-private-key-in-rpm-addsign.patch b/backport-Specify-the-private-key-in-rpm-addsign.patch new file mode 100644 index 0000000..49d8d55 --- /dev/null +++ b/backport-Specify-the-private-key-in-rpm-addsign.patch @@ -0,0 +1,32 @@ +From 3141bf74ffcc0650c64611066ede8718a98ecebe Mon Sep 17 00:00:00 2001 +From: xujing +Date: Thu, 5 Sep 2024 16:28:17 +0800 +Subject: [PATCH] Specify the private key in "rpm --addsign" + +Conflict:adapt context +Reference:https://github.com/rpm-software-management/rpm/commit/3141bf74ffcc0650c64611066ede8718a98ecebe + +Using "*.secret" may cause "rpm --addsign" to fail, and the testcase +is actually related only to rpm.org-rsa-2048-test.secret. + +Fix https://github.com/rpm-software-management/rpm/issues/3277 +--- + tests/rpmsigdig.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at +index e62c63415..262a68c71 100644 +--- a/tests/rpmsigdig.at ++++ b/tests/rpmsigdig.at +@@ -917,7 +917,7 @@ AT_SETUP([rpmsign --addsign]) + AT_SETUP([rpmsign --addsign]) + AT_KEYWORDS([rpmsign signature]) + RPMDB_INIT +-gpg2 --import ${RPMTEST}/data/keys/*.secret ++gpg2 --import ${RPMTEST}/data/keys/rpm.org-rsa-2048-test.secret + # Our keys have no passphrases to be asked, silence GPG_TTY warning + export GPG_TTY="" + +-- +2.33.0 + diff --git a/rpm.spec b/rpm.spec index 0cc6ef2..3522941 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.18.2 -Release: 16 +Release: 17 Summary: RPM Package Manager License: GPL-2.0-or-later URL: https://rpm.org/ @@ -46,6 +46,7 @@ Patch6024: backport-Fix-root-relocation-regression.patch Patch6025: backport-Fix-crash-on-Lua-file-trigger-exiting-with-return-ed.patch Patch6026: backport-Fix-V-option-usage-in-our-tests.patch Patch6027: backport-Remove-libtool-la-symlinks.patch +Patch6028: backport-Specify-the-private-key-in-rpm-addsign.patch Patch9000: Add-digest-list-plugin.patch Patch9001: Add-IMA-digest-list-support.patch @@ -334,6 +335,9 @@ make clean %exclude %{_mandir}/man8/rpmspec.8* %changelog +* Sun Sep 29 2024 hugel - 4.18.2-17 +- Fix testcase failed of rpm addsign + * Wed Sep 18 2024 Funda Wang - 4.18.2-16 - Remove symlinks towards libtool .la also - cleanup spec