[tth] 01/01: Imported Debian patch 4.05+ds-2 (reproducible build + refresh)
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository tth.
commit de96df840e0fa807c5397c5ce6161751f8935627
Author: Jerome Benoit <calculus@rezozer.net>
Date: Sun Oct 25 03:25:07 2015 +0100
Imported Debian patch 4.05+ds-2 (reproducible build + refresh)
---
debian/changelog | 11 +++++++++
debian/control | 2 +-
debian/copyright | 4 +--
debian/patches/reproducible_build.patch | 44 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 --
6 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d8bdae1..fecf604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tth (4.05+ds-2) unstable; urgency=medium
+
+ * Secure release (Closes: #792181): reproducible builds --- thanks to
+ Reiner Herrmann <reiner@reiner-h.de> for providing the patch.
+ * Debianization:
+ - Standards Version, bump to 3.9.6;
+ - debian/copyrigth, refresh;
+ - debian/rules, harden.
+
+ -- Jerome Benoit <calculus@rezozer.net> Sun, 25 Oct 2015 02:19:55 +0000
+
tth (4.05+ds-1) unstable; urgency=medium
* New upstream version.
diff --git a/debian/control b/debian/control
index 69c0b03..7baac6d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jerome Benoit <calculus@rezozer.net>
Build-Depends:
debhelper (>= 9), flex,
texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://hutchinson.belmont.ma.us/tth
Vcs-Git: git://anonscm.debian.org/debian-tex/tth.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-tex/tth.git
diff --git a/debian/copyright b/debian/copyright
index f695d8c..4b31c6c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,12 +7,12 @@ Comment:
by cleaning up and by wiping out material not meant for UN*X source.
Files: *
-Copyright: 1997-2014 Ian Hutchinson <ihutch@mit.edu>
+Copyright: 1997-2015 Ian Hutchinson <ihutch@mit.edu>
License: GPL-2+
Files: debian/*
Copyright:
- 2012-2014 Jerome Benoit <calculus@rezozer.net>
+ 2012-2015 Jerome Benoit <calculus@rezozer.net>
2001-2011 Ian Maclaine-cross <iml@debian.org>
License: GPL-2+
Comment:
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
new file mode 100644
index 0000000..33b14e0
--- /dev/null
+++ b/debian/patches/reproducible_build.patch
@@ -0,0 +1,44 @@
+Description: Don't embed timestamp into HTML
+ For generated HTML files, the current timestamp is embedded.
+ As this prevents the package from building reproducible and
+ provides no useful information it can be removed. For more
+ information, see <https://wiki.debian.org/ReproducibleBuilds>.
+Origin: debian
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Last-Update: 2015-07-12
+
+Index: tth-4.05+ds/tthg.lex
+===================================================================
+--- tth-4.05+ds.orig/tthg.lex
++++ tth-4.05+ds/tthg.lex
+@@ -5977,7 +5977,6 @@ char ttver[]=TTH_VERSION;
+ char ttname[20];
+ time_t secs_elapsed;
+ time_t make_time=939087164;
+-char timestr[]="On 00 Jan 2000, 00:00.";
+ FILE *fdin=0;
+ int horizmode=1; /* In signoff use font tags not divs */
+ char main_input[TTH_CHARLEN];
+@@ -6135,20 +6134,12 @@ char main_output[TTH_CHARLEN];
+ yylex();
+ fprintf(stderr, "Number of lines processed approximately %d\n",
+ tth_num_lines-1);
+- /* Time stamp */
+- time(&secs_elapsed);
+- spoint=ctime(&secs_elapsed);
+- strncpy(timestr+3,spoint+8,2);
+- strncpy(timestr+6,spoint+4,3);
+- strncpy(timestr+10,spoint+20,4);
+- strncpy(timestr+16,spoint+11,5);
+- if(raw==2)*timestr=0; /* Not if -r2 */
+ if(raw!=1 && raw != 4){
+ fprintf(tth_fdout,"\n<br /><br /><hr /><small>File translated from\n\
+ T<sub>%sE%s</sub>X\nby <a href=\"http://hutchinson.belmont.ma.us/tth/\";>\n\
+ T<sub>%sT%s</sub>%s</a>,\n\
+-version %s.<br />%s</small>\n",TTH_SMALL,TTH_SIZEEND,TTH_SMALL,TTH_SIZEEND
+- ,TTH_NAME,TTH_VERSION,timestr);
++version %s.</small>\n",TTH_SMALL,TTH_SIZEEND,TTH_SMALL,TTH_SIZEEND
++ ,TTH_NAME,TTH_VERSION);
+ }
+ if(raw!=1){
+ if(tth_htmlstyle&3)fprintf(tth_fdout,"</div></body>");
diff --git a/debian/patches/series b/debian/patches/series
index 8e030db..2bd4fa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+reproducible_build.patch
fix-upstream-tools-ps2png.patch
fix-upstream-man-tth_1.patch
fix-upstream-warning.patch
diff --git a/debian/rules b/debian/rules
index 3c0f2fe..2f5193f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
default:
@uscan --no-conf --dehs --report || true
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/tth.git
Reply to: