pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- do not use the source date epoch as buildtime by default

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=453
This commit is contained in:
Michael Schröder 2018-03-27 12:37:42 +00:00 committed by Git OBS Bridge
parent 187f41c4ef
commit 1424664535
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpm.changes
View File

@ -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

3
rpm.spec
View File

@ -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

11
source_date_epoch_buildtime.diff Normal file
View File

@ -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)