summaryrefslogtreecommitdiff
path: root/backport-Specify-the-private-key-in-rpm-addsign.patch
diff options
context:
space:
mode:
Diffstat (limited to 'backport-Specify-the-private-key-in-rpm-addsign.patch')
-rw-r--r--backport-Specify-the-private-key-in-rpm-addsign.patch32
1 files changed, 32 insertions, 0 deletions
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 <xujing125@huawei.com>
+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
+