This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository armagetronad.
commit 8541c469f0734afd404b5e27fb0b4775b31d9dd9 Author: Markus Koschany <[email protected]> Date: Sun Jun 25 16:58:37 2017 +0200 Update reproducible-build.patch. Use SOURCE_DATE_EPOCH variable or remove any occurences of the date command. Closes: #861773 Thanks: Chris Lamb for the report. --- debian/patches/reproducible-build.patch | 82 ++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch index 4d5b931..7e34423 100644 --- a/debian/patches/reproducible-build.patch +++ b/debian/patches/reproducible-build.patch @@ -6,68 +6,108 @@ Make the build reproducible. Forwarded: no --- - src/doc/HtmlMakefile | 4 ++-- - src/doc/Makefile.in | 4 ++-- - src/doc/html.m4.in | 2 +- - src/doc/net/Makefile.in | 4 ++-- - 4 files changed, 7 insertions(+), 7 deletions(-) + src/doc/HtmlMakefile | 11 +++++++++-- + src/doc/Makefile.in | 11 +++++++++-- + src/doc/html.m4.in | 2 -- + src/doc/net/Makefile.in | 11 +++++++++-- + src/doc/net/sig.m4 | 3 --- + 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/doc/HtmlMakefile b/src/doc/HtmlMakefile -index c979997..9d44d87 100644 +index c979997..715362d 100644 --- a/src/doc/HtmlMakefile +++ b/src/doc/HtmlMakefile -@@ -15,9 +15,9 @@ $(htmlm4): $(top_builddir)/config.status Makefile $(top_srcdir)/src/doc/html.m4. +@@ -12,12 +12,19 @@ htmlm4 = $(top_builddir)/src/doc/html.m4 + $(htmlm4): $(top_builddir)/config.status Makefile $(top_srcdir)/src/doc/html.m4.in + cd ${top_builddir}; ./config.status src/doc/html.m4 + ++DATE_FMT = %Y-%m-%d ++ifdef SOURCE_DATE_EPOCH ++ BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") ++else ++ BUILD_DATE ?= $(shell date "+$(DATE_FMT)") ++endif ++ if HAVE_M4 %.html : $(srcdir)/%.html.m4 %.html.dep $(htmlm4) Makefile if DATE_R - { echo "define(CHANGEDATE,`date +"%b %d %Y" -r $<`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -+ { echo "define(CHANGEDATE, 20160712) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ ++{ echo "define(CHANGEDATE, $(BUILD_DATE)) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ else - { echo "define(CHANGEDATE,`date +"%b %d %Y"`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -+ { echo "define(CHANGEDATE, 20160712) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ ++ { echo "define(CHANGEDATE, $(BUILD_DATE)) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ endif %.dep: %.m4 Makefile diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in -index a2e5d4e..df92eff 100644 +index 34cc5ff..21be664 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in -@@ -740,8 +740,8 @@ $(htmlm4): $(top_builddir)/config.status Makefile $(top_srcdir)/src/doc/html.m4. +@@ -683,9 +683,16 @@ uninstall-am: uninstall-htmlDATA + $(htmlm4): $(top_builddir)/config.status Makefile $(top_srcdir)/src/doc/html.m4.in cd ${top_builddir}; ./config.status src/doc/html.m4 ++DATE_FMT = %Y-%m-%d ++ifdef SOURCE_DATE_EPOCH ++ BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") ++else ++ BUILD_DATE ?= $(shell date "+$(DATE_FMT)") ++endif ++ @HAVE_M4_TRUE@%.html : $(srcdir)/%.html.m4 %.html.dep $(htmlm4) Makefile -@DATE_R_TRUE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE,`date +"%b %d %Y" -r $<`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -@DATE_R_FALSE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE,`date +"%b %d %Y"`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -+@DATE_R_TRUE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, 20160712) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -+@DATE_R_FALSE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, 20160712) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ ++@DATE_R_TRUE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, $(BUILD_DATE)) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ ++@DATE_R_FALSE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, $(BUILD_DATE)) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ @HAVE_M4_TRUE@%.dep: %.m4 Makefile @HAVE_M4_TRUE@ echo $*.dep ":\\" > $@ diff --git a/src/doc/html.m4.in b/src/doc/html.m4.in -index 8c75527..9127fb2 100644 +index 8c75527..45932ba 100644 --- a/src/doc/html.m4.in +++ b/src/doc/html.m4.in -@@ -6,7 +6,7 @@ define(HEADSTART,dnl +@@ -6,8 +6,6 @@ define(HEADSTART,dnl <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> changequote([,])dnl - <meta name="date" content="esyscmd(echo -n [`date +%Y-%m-%dT%H:%M:%S+01:00`])"> -+ <meta name="date" content="esyscmd(echo -n [20160712])"> - +- <meta name="author" content="Manuel Moos"> <title>$1</title>)dnl + define(HEAD,HEADSTART($1)</head><body>)dnl diff --git a/src/doc/net/Makefile.in b/src/doc/net/Makefile.in -index 5cc08c4..4944d61 100644 +index c1132a8..5f8b222 100644 --- a/src/doc/net/Makefile.in +++ b/src/doc/net/Makefile.in -@@ -549,8 +549,8 @@ $(htmlm4): $(top_builddir)/config.status Makefile $(top_srcdir)/src/doc/html.m4. +@@ -471,9 +471,16 @@ uninstall-am: uninstall-htmlDATA + $(htmlm4): $(top_builddir)/config.status Makefile $(top_srcdir)/src/doc/html.m4.in cd ${top_builddir}; ./config.status src/doc/html.m4 ++DATE_FMT = %Y-%m-%d ++ifdef SOURCE_DATE_EPOCH ++ BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") ++else ++ BUILD_DATE ?= $(shell date "+$(DATE_FMT)") ++endif ++ @HAVE_M4_TRUE@%.html : $(srcdir)/%.html.m4 %.html.dep $(htmlm4) Makefile -@DATE_R_TRUE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE,`date +"%b %d %Y" -r $<`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -@DATE_R_FALSE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE,`date +"%b %d %Y"`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -+@DATE_R_TRUE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, 20160712) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ -+@DATE_R_FALSE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, 20160712) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ ++@DATE_R_TRUE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, $(BUILD_DATE)) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ ++@DATE_R_FALSE@@HAVE_M4_TRUE@ { echo "define(CHANGEDATE, $(BUILD_DATE)) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@ @HAVE_M4_TRUE@%.dep: %.m4 Makefile @HAVE_M4_TRUE@ echo $*.dep ":\\" > $@ +diff --git a/src/doc/net/sig.m4 b/src/doc/net/sig.m4 +index 7a8177a..1eade94 100644 +--- a/src/doc/net/sig.m4 ++++ b/src/doc/net/sig.m4 +@@ -2,8 +2,5 @@ + <p align=center>This Page was created by + Manuel Moos(MAILMANGLE( z-man, users, sf.net )). + +-<p align=center> +-Last modification: esyscmd(date) +-</p> + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/armagetronad.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
