From 14246645354c683e974c1785779f26a872c31b1b336b3c809b24193c414cc20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 27 Mar 2018 12:37:42 +0000 Subject: [PATCH] - do not use the source date epoch as buildtime by default OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=453 --- rpm.changes | 7 +++++++ rpm.spec | 3 ++- source_date_epoch_buildtime.diff | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 source_date_epoch_buildtime.diff diff --git a/rpm.changes b/rpm.changes index 002e9d9..6e973ea 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 27 14:31:28 CEST 2018 - mls@suse.de + +- do not use the source date epoch as buildtime by default + [bnc#1087065] + new patch: source_date_epoch_buildtime.diff + ------------------------------------------------------------------- Mon Mar 5 09:23:16 UTC 2018 - schwab@suse.de diff --git a/rpm.spec b/rpm.spec index 9c4d9e8..1e2faa3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -131,6 +131,7 @@ Patch109: pythondistdeps.diff Patch111: debugedit-bnc1076819.diff Patch112: hardlinks.diff Patch113: debugedit-riscv.patch +Patch114: source_date_epoch_buildtime.diff Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6465: auto-config-update-riscv64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -228,7 +229,7 @@ rm -f rpmdb/db.h %patch -P 85 %patch -P 93 -P 94 -P 99 %patch -P 100 -P 102 -P 103 -P 108 -%patch -P 109 -P 111 -P 112 -P 113 +%patch -P 109 -P 111 -P 112 -P 113 -P 114 %ifarch aarch64 ppc64le riscv64 %patch6464 diff --git a/source_date_epoch_buildtime.diff b/source_date_epoch_buildtime.diff new file mode 100644 index 0000000..78fa800 --- /dev/null +++ b/source_date_epoch_buildtime.diff @@ -0,0 +1,11 @@ +--- ./build/pack.c.orig 2018-03-27 12:21:03.036841297 +0000 ++++ ./build/pack.c 2018-03-27 12:29:56.050400820 +0000 +@@ -161,7 +161,7 @@ static rpm_time_t * getBuildTime(void) + + if (buildTime[0] == 0) { + srcdate = getenv("SOURCE_DATE_EPOCH"); +- if (srcdate) { ++ if (srcdate && rpmExpandNumeric("%{?use_source_date_epoch_as_buildtime}")) { + errno = 0; + epoch = strtol(srcdate, &endptr, 10); + if (srcdate == endptr || *endptr || errno != 0)