Accepting request 732106 from home:bmwiedemann:branches:mozilla:Factory

added mozilla-bmo1568145.patch to make builds reproducible (boo#1047218)

OBS-URL: https://build.opensuse.org/request/show/732106
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=486

MozillaThunderbird.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 20 08:24:23 UTC 2019 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- added mozilla-bmo1568145.patch to make builds reproducible (boo#1047218)
+
 -------------------------------------------------------------------
 Tue Sep 10 07:33:52 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
 

MozillaThunderbird.spec

@@ -150,6 +150,7 @@ Patch2:         mozilla-kde.patch
 Patch3:         mozilla-aarch64-startup-crash.patch
 Patch4:         fix-missing-return-warning.patch
 Patch5:         thunderbird-locale-build.patch
+Patch6:         mozilla-bmo1568145.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         coreutils fileutils textutils /bin/sh
 Recommends:     libcanberra0
@@ -233,6 +234,7 @@ fi
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 #

mozilla-bmo1568145.patch

@@ -0,0 +1,30 @@
+Author: Bernhard M. Wiedemann <bwiedemann suse de>
+Date: 2019-07-22
+
+Allow to override build date with SOURCE_DATE_EPOCH
+in order to make builds reproducible.
+See https://reproducible-builds.org/ for why this is good
+and https://reproducible-builds.org/specs/source-date-epoch/
+for the definition of this variable.
+
+diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py
+index 6f72697..d4cca96 100644
+--- a/python/mozbuild/mozbuild/action/langpack_manifest.py
++++ b/python/mozbuild/mozbuild/action/langpack_manifest.py
+@@ -16,6 +16,7 @@ import os
+ import json
+ import io
+ import datetime
++import time
+ import requests
+ import mozversioncontrol
+ import mozpack.path as mozpath
+@@ -100,7 +101,7 @@ def get_timestamp_for_locale(path):
+         dt = get_dt_from_hg(path)
+ 
+     if dt is None:
+-        dt = datetime.datetime.utcnow()
++        dt = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
+ 
+     dt = dt.replace(microsecond=0)
+     return dt.strftime("%Y%m%d%H%M%S")