[apache2] 01/01: Improve preinst for reproducible build

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit 7abdc58106f53df3da2aa658f2107799a39342c9
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Aug 13 13:30:28 2016 +0200

    Improve preinst for reproducible build
    
    The timestamps inside the tar file are not used for anything. Set them
    to an arbitrary fixed value. Same for permissions (because of umask),
    user, umask.
---
 debian/changelog | 7 +++++++
 debian/rules     | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4dcec89..861d285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.23-5) UNRELEASED; urgency=medium
+
+  * Tweak creation of .tar.gz embedded in preinst to get reproducible
+    build.
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 13 Aug 2016 13:38:30 +0200
+
 apache2 (2.4.23-4) unstable; urgency=medium
 
   * Fix pre-inst script for new installations. Closes: #834169
diff --git a/debian/rules b/debian/rules
index 709623d..0202f75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,14 @@ debian/fixup_conffiles.tgz: \
     debian/config-dir/mods-available/cern_meta.load \
     debian/config-dir/mods-available/ident.load \
     debian/config-dir/mods-available/imagemap.load
-	tar --transform 's,.*/,,' -cz -f $@ $^
+	@# mtime/owner/group/mode are for reproducible build
+	tar \
+		--mtime=2000-01-01T00:00 \
+		--owner=root:0 \
+		--group=root:0 \
+		--mode=0644 \
+		--transform 's,.*/,,' \
+		-cz -f $@ $^
 
 debian/fixup_conffiles.b64: debian/fixup_conffiles.tgz
 	base64 < $< > $@

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