Write build date in UTC when using SOURCE_DATE_EPOCH

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index e5e973df7956d9f25a9e3abaad55b6a6d8615c07..822a4927da29697cf9c19841999d7121ed95bfb0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openafs (1.6.21-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch: Use UTC
+      for better reproducibility.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 22 Aug 2017 17:22:44 -0400
+
 openafs (1.6.21-1) unstable; urgency=medium
 
   * New upstream release (1.6.21):

diff --git a/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch b/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch
index 1711f7ae944d3440f0d37b3bbae2ca78dc9b61d9..448e3dabcca605001ff6387eb749cbf9f55d4f7d 100644 (file)
--- a/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch
+++ b/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch
@@ -12,7 +12,7 @@ Change-Id: Id379543a4782a7c1267eaa3d9258751d857cc07b
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
-index c8ab053..83313d2 100644
+index c8ab053c4..4c7bd1450 100644
 --- a/src/config/Makefile.version-NOCML.in
 +++ b/src/config/Makefile.version-NOCML.in
 @@ -11,7 +11,7 @@ AFS_component_version_number.o: AFS_component_version_number.c
@@ -20,7 +20,7 @@ index c8ab053..83313d2 100644
  AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
        ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \
 -      echo 'char cml_version_number[]="@(#) OpenAFS '$$VERSION' built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c.NEW && \
-+      echo 'char cml_version_number[]="@(#) OpenAFS '$$VERSION' built ' `date +"%Y-%m-%d" $${SOURCE_DATE_EPOCH:+-d "@$$SOURCE_DATE_EPOCH"}` '";' >AFS_component_version_number.c.NEW && \
++      echo 'char cml_version_number[]="@(#) OpenAFS '$$VERSION' built ' `date +"%Y-%m-%d" $${SOURCE_DATE_EPOCH:+-u -d "@$$SOURCE_DATE_EPOCH"}` '";' >AFS_component_version_number.c.NEW && \
        echo 'char* AFSVersion = "${PACKAGE} '$$VERSION'";' >>AFS_component_version_number.c.NEW && \
        if cmp AFS_component_version_number.c.NEW AFS_component_version_number.c > /dev/null 2>&1 ; then : ; else \
        mv AFS_component_version_number.c.NEW AFS_component_version_number.c ; fi )