[Pkg-gnupg-commit] [gnupg1] 31/35: build reproducibly (Closes: #806494)
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Aug 29 14:48:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg1.
commit 943129156e2a1eaf0029a82bc1497cc363b66a21
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Aug 29 10:18:31 2016 -0400
build reproducibly (Closes: #806494)
---
...ble-SOURCE_DATE_EPOCH-for-reproducibility.patch | 220 +++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +
3 files changed, 223 insertions(+)
diff --git a/debian/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/debian/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 0000000..5a535b2
--- /dev/null
+++ b/debian/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs at g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/debian/patches/series b/debian/patches/series
index a277928..fea2652 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-avoid-looking-for-git-info-during-autoreconf.patch
0002-Update-Danish-translation.patch
0003-change-package-name-to-gnupg1.patch
+0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
diff --git a/debian/rules b/debian/rules
index 016f0af..de7934c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export SOURCE_DATE_EPOCH = \
+ $(shell date -d "$$(dpkg-parsechangelog -c 1 -S Date)" +%s)
%:
dh $@ --with=autoreconf --builddirectory=build-deb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg1.git
More information about the Pkg-gnupg-commit
mailing list