[Pkg-gnupg-commit] [gnupg2] 100/112: make gnupg2 reproducible by not regenerating documentation date

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 750237302d55926684cf52a3d4805dbea630b0a9
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Aug 29 12:40:43 2016 -0400

    make gnupg2 reproducible by not regenerating documentation date
---
 ...regenerating-defsincdate-use-shipped-file.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/0003-avoid-regenerating-defsincdate-use-shipped-file.patch b/debian/patches/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
new file mode 100644
index 0000000..e81572b
--- /dev/null
+++ b/debian/patches/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
@@ -0,0 +1,37 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Mon, 29 Aug 2016 12:34:42 -0400
+Subject: avoid regenerating defsincdate (use shipped file)
+
+upstream ships doc/defsincdate in its tarballs.  but doc/Makefile.am
+tries to rewrite doc/defsincdate if it notices that any of the files
+have been modified more recently, and it does so assuming that we're
+running from a git repo.
+
+However, we'd rather ship the documents cleanly without regenerating
+defsincdate -- we don't have a git repo available (debian builds from
+upstream tarballs) and any changes to the texinfo files (e.g. from
+debian/patches/) might result in different dates on the files than we
+expect after they're applied by dpkg or quilt or whatever, which makes
+the datestamp unreproducible.
+---
+ doc/Makefile.am | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 52ac398..8b6b1a5 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -157,13 +157,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+ 
+ dist-hook: defsincdate
+ 
+-defsincdate: $(gnupg_TEXINFOS)
+-	: >defsincdate ; \
+-	if test -e $(top_srcdir)/.git; then \
+-	  (cd $(srcdir) && git log -1 --format='%ct' \
+-               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+-	fi
+-
+ defs.inc : defsincdate Makefile mkdefsinc
+ 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
+ 	./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
diff --git a/debian/patches/series b/debian/patches/series
index 160913f..33cbf93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-avoid-beta-warning.patch
 0002-Avoid-simple-memory-dumps-via-ptrace.patch
+0003-avoid-regenerating-defsincdate-use-shipped-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git