diff --git a/0001-Resurrect-our-reproducable-build-test.patch b/0001-Resurrect-our-reproducable-build-test.patch new file mode 100644 index 0000000000000000000000000000000000000000..b0e9821cd2e648754add6441a2a66f61a9d1a263 --- /dev/null +++ b/0001-Resurrect-our-reproducable-build-test.patch @@ -0,0 +1,38 @@ +From b1f7edf81e4b851f09c5a1c51f8e816815f3e4c7 Mon Sep 17 00:00:00 2001 +From: openeuler-basic +Date: Tue, 28 Apr 2020 19:08:41 +0800 +Subject: [PATCH] Resurrect our reproducable build test + +--- + tests/rpmsigdig.at | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at +index 3c15221..9bf62ef 100644 +--- a/tests/rpmsigdig.at ++++ b/tests/rpmsigdig.at +@@ -140,16 +140,17 @@ runroot rpmbuild -bb --quiet \ + --define "%source_date_epoch_from_changelog 1" \ + --define "%clamp_mtime_to_source_date_epoch 1" \ + /data/SPECS/attrtest.spec +-for v in SHA256HEADER SHA1HEADER SIGMD5 PAYLOADDIGEST; do ++for v in SHA256HEADER SHA1HEADER SIGMD5 PAYLOADDIGEST PAYLOADDIGESTALT; do + runroot rpm -q --qf "${v}: %{${v}}\n" /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm + done + runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm + ], + [0], +-[SHA256HEADER: 8d150309b6988914994ad609ff8267718f23e8034affe260e6d4361a83a45a62 +-SHA1HEADER: 78606c9281c44f34470d26df2caebba117b9d183 +-SIGMD5: 3269c96a8e88bf4514647c570c66723b ++[SHA256HEADER: 272c5eb30fb2caf7abf5ab02ab7a53ef52c71c88545b9ab08a940f724f920baf ++SHA1HEADER: 4d630ee2a75757adfdbd2aed1fe803b5e3c8664d ++SIGMD5: ef85784d929890a1653ed0b959784f50 + PAYLOADDIGEST: 749d8980cc5889419da8cdbe9a5b3292742af8a227db3635f84966481b7612a8 ++PAYLOADDIGESTALT: 749d8980cc5889419da8cdbe9a5b3292742af8a227db3635f84966481b7612a8 + /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm: + Header SHA256 digest: OK + Header SHA1 digest: OK +-- +1.8.3.1 + diff --git a/0001-Unset-SOURCE_DATE_EPOCH-for-the-test-suite.patch b/0001-Unset-SOURCE_DATE_EPOCH-for-the-test-suite.patch new file mode 100644 index 0000000000000000000000000000000000000000..f2fcd113b453a46e3f20e404892fec2c392ed6ab --- /dev/null +++ b/0001-Unset-SOURCE_DATE_EPOCH-for-the-test-suite.patch @@ -0,0 +1,29 @@ +From c24ff314616f93129c508bfda5b9334ab20330a2 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen +Date: Tue, 31 Mar 2020 13:29:48 +0300 +Subject: [PATCH] Unset SOURCE_DATE_EPOCH for the test-suite + +Fixes the reproducable build test failing in Fedora rpm builds due to +%source_date_epoch_from_changelog being set on the outside, which +leaks the SOURCE_DATE_EPOCH environment into the test-suite and +changes the expectation. +--- + tests/atlocal.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/atlocal.in b/tests/atlocal.in +index 95baca5..a41752f 100644 +--- a/tests/atlocal.in ++++ b/tests/atlocal.in +@@ -27,6 +27,8 @@ export HOME + TZ=UTC + export TZ + ++unset SOURCE_DATE_EPOCH ++ + TOPDIR="${RPMTEST}/build" + + RPM_XFAIL=${RPM_XFAIL-1} +-- +1.8.3.1 + diff --git a/rpm.spec b/rpm.spec index f2281b6c2d1567197dcb774332cdc54bc8c40d59..4c87fc25541bbb1929096962f8e8c2274845c644 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,6 +13,8 @@ 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: 0001-Unset-SOURCE_DATE_EPOCH-for-the-test-suite.patch +Patch9: 0001-Resurrect-our-reproducable-build-test.patch Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch Patch9001: bugfix-rpm-4.14.2-fix-tty-failed.patch