From bf22e8bbe2ff6e094031e1482df39d58f142a6c4 Mon Sep 17 00:00:00 2001
From: Yangyang Shen <shenyangyang4@huawei.com>
Date: Wed, 13 May 2020 14:53:22 +0800
Subject: [PATCH] solve the failure of rpmsigdig.at test because of upstream
 commit mission

---
 ...-test-s-SHA256HEADER-SHA1HEADER-SIGM.patch | 46 +++++++++++++++++++
 rpm.spec                                      | 15 ++++--
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 change-rpmsigdig-test-s-SHA256HEADER-SHA1HEADER-SIGM.patch

diff --git a/change-rpmsigdig-test-s-SHA256HEADER-SHA1HEADER-SIGM.patch b/change-rpmsigdig-test-s-SHA256HEADER-SHA1HEADER-SIGM.patch
new file mode 100644
index 0000000..d483e6b
--- /dev/null
+++ b/change-rpmsigdig-test-s-SHA256HEADER-SHA1HEADER-SIGM.patch
@@ -0,0 +1,46 @@
+From ab2179452c5be276a6b96c591afded485c7e58c3 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed, 13 Nov 2019 11:38:07 +0200
+Subject: [PATCH] change rpmsigdig test's SHA256HEADER SHA1HEADER SIGMD5 value
+
+---
+ tests/rpmsigdig.at | 6 +++---
+ tests/rpmtests     | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at
+index 3c15221..91c205e 100644
+--- a/tests/rpmsigdig.at
++++ b/tests/rpmsigdig.at
+@@ -146,9 +146,9 @@ done
+ runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
+ ],
+ [0],
+-[SHA256HEADER: 8d150309b6988914994ad609ff8267718f23e8034affe260e6d4361a83a45a62
+-SHA1HEADER: 78606c9281c44f34470d26df2caebba117b9d183
+-SIGMD5: 3269c96a8e88bf4514647c570c66723b
++[SHA256HEADER: 340fcc0e848922c0a0c5e9f988482683038b4c753d29ef4682a3ca279cef2ef4
++SHA1HEADER: 12352190a4557cd595387fbf0474ae65fd324158
++SIGMD5: 3dc56bbd5166fca1d2c7cb637a057049
+ PAYLOADDIGEST: 749d8980cc5889419da8cdbe9a5b3292742af8a227db3635f84966481b7612a8
+ /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm:
+     Header SHA256 digest: OK
+diff --git a/tests/rpmtests b/tests/rpmtests
+index 6fa80e3..ae95856 100644
+--- a/tests/rpmtests
++++ b/tests/rpmtests
+@@ -14547,9 +14547,9 @@ runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
+ at_status=$? at_failed=false
+ $at_check_filter
+ at_fn_diff_devnull "$at_stderr" || at_failed=:
+-echo >>"$at_stdout"; $as_echo "SHA256HEADER: 8d150309b6988914994ad609ff8267718f23e8034affe260e6d4361a83a45a62
+-SHA1HEADER: 78606c9281c44f34470d26df2caebba117b9d183
+-SIGMD5: 3269c96a8e88bf4514647c570c66723b
++echo >>"$at_stdout"; $as_echo "SHA256HEADER: 340fcc0e848922c0a0c5e9f988482683038b4c753d29ef4682a3ca279cef2ef4
++SHA1HEADER: 12352190a4557cd595387fbf0474ae65fd324158
++SIGMD5: 3dc56bbd5166fca1d2c7cb637a057049
+ PAYLOADDIGEST: 749d8980cc5889419da8cdbe9a5b3292742af8a227db3635f84966481b7612a8
+ /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm:
+     Header SHA256 digest: OK
+-- 
+
diff --git a/rpm.spec b/rpm.spec
index f2281b6..be3e454 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.15.1
-Release:       14
+Release:       15
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -13,10 +13,11 @@ Patch4: skip-updating-the-preferences.patch
 Patch5: add-dist-to-release-by-default.patch
 Patch6: Silence-spurious-error-message-from-lsetfilecon-on-E.patch
 Patch7: revert-always-execute-file-trigger-scriptlet-callbac.patch
+Patch8: change-rpmsigdig-test-s-SHA256HEADER-SHA1HEADER-SIGM.patch
 
-Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
-Patch9001: bugfix-rpm-4.14.2-fix-tty-failed.patch
-Patch9002: bugfix-rpm-4.14.2-wait-once-get-rpmlock-fail.patch
+Patch9: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
+Patch10: bugfix-rpm-4.14.2-fix-tty-failed.patch
+Patch11: bugfix-rpm-4.14.2-wait-once-get-rpmlock-fail.patch
 
 BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel libdb-devel 
 BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
@@ -285,6 +286,12 @@ make check || (cat tests/rpmtests.log; exit 0)
 %{_mandir}/man1/gendiff.1*
 
 %changelog
+* Wed May 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-15
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:solve the failure of rpmsigdig.at test
+
 * Mon Mar 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-14
 - Type:bugfix
 - ID:NA