[Pkg-mailman-hackers] Bug#915300: [PATCH] mailman reproducible build x2

[Andreas Henriksson]

Control: tags -1 + patch

Please see attached patch that removes the unused TRUE
from the shipped Makefile. (If you can confirm the Makefile
is pointless to ship, you might want to opt for stop shipping
the file instead.)

Regards,
Andreas Henriksson
-------------- next part --------------
diff -Nru mailman-2.1.29/debian/changelog mailman-2.1.29/debian/changelog
--- mailman-2.1.29/debian/changelog	2018-09-05 07:03:24.000000000 +0200
+++ mailman-2.1.29/debian/changelog	2018-12-08 13:00:29.000000000 +0100
@@ -1,3 +1,12 @@
+mailman (1:2.1.29-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/patches/93_reproducible_build_2.patch (Closes: #915300)
+    - drop the unused TRUE variable
+    - fixes reproducible builds on merged-usr vs non-merged systems
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 08 Dec 2018 13:00:29 +0100
+
 mailman (1:2.1.29-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mailman-2.1.29/debian/patches/93_reproducible_build_2.patch mailman-2.1.29/debian/patches/93_reproducible_build_2.patch
--- mailman-2.1.29/debian/patches/93_reproducible_build_2.patch	1970-01-01 01:00:00.000000000 +0100
+++ mailman-2.1.29/debian/patches/93_reproducible_build_2.patch	2018-12-08 13:00:25.000000000 +0100
@@ -0,0 +1,33 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: reproducible build - merged-usr vs non-merged
+
+The templates folder is build and then installed under examples
+in the debian package. The TRUE path is looked up during build
+from PATH and on merged-usr systems (where /bin points to /usr/bin)
+the true tool is found in /usr/bin/true since PATH normally contains
+/usr/bin before /bin. On non-merged systems the path is found as
+/bin/true. This makes the build unreproducible between merged-usr
+and non-merged systems, but it has no other impact than that since
+the TRUE variable is not used/referenced from anywhere (and the
+file is an example to start with so not used at all).
+
+
+Since I'm not sure if the generated Makefile should just be removed
+completely, instead this patch just removes the unused TRUE
+variable.
+
+(It's not only TRUE that is unused, eg. also CHMOD. But only TRUE
+casues reproducability problems on merged-usr vs non-merged.)
+
+https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/mailman.html
+
+--- a/templates/Makefile.in
++++ b/templates/Makefile.in
+@@ -30,7 +30,6 @@
+ CC=		@CC@
+ CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+-TRUE=		@TRUE@
+ 
+ DEFS=   	@DEFS@
+ 
diff -Nru mailman-2.1.29/debian/patches/series mailman-2.1.29/debian/patches/series
--- mailman-2.1.29/debian/patches/series	2018-06-23 15:21:41.000000000 +0200
+++ mailman-2.1.29/debian/patches/series	2018-12-08 12:55:00.000000000 +0100
@@ -9,3 +9,4 @@
 66_donot_let_cache_html_pages.patch
 79_archiver_slash.patch
 92_reproducible_build.patch
+93_reproducible_build_2.patch