[Glibc-bsd-commits] r5711 - branches/jessie/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-05-23 14:27:46 +0000 (Sat, 23 May 2015)
New Revision: 5711

Modified:
   branches/jessie/kfreebsd-10/debian/changelog
   branches/jessie/kfreebsd-10/debian/rules
Log:
Create tarballs of upstream source, and of the kfreebsd-source
binary-indep package, using a reproducible stable file order.
(Closes: #786615)

(Although, in jessie-kfreebsd we keep the existing orig.tar.xz, so
that is not reproducible yet.)


Modified: branches/jessie/kfreebsd-10/debian/changelog
===================================================================
--- branches/jessie/kfreebsd-10/debian/changelog	2015-05-23 14:24:28 UTC (rev 5710)
+++ branches/jessie/kfreebsd-10/debian/changelog	2015-05-23 14:27:46 UTC (rev 5711)
@@ -1,3 +1,11 @@
+kfreebsd-10 (10.1~svn274115-4+kbsd8u1) UNRELEASED; urgency=medium
+
+  * Create tarballs of upstream source, and of the kfreebsd-source
+    binary-indep package, using a reproducible stable file order.
+    (Closes: #786615)
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 23 May 2015 14:57:14 +0100
+
 kfreebsd-10 (10.1~svn274115-4) unstable; urgency=high
 
   * Pick SVN r281232 from FreeBSD 10.1-RELEASE to fix:

Modified: branches/jessie/kfreebsd-10/debian/rules
===================================================================
--- branches/jessie/kfreebsd-10/debian/rules	2015-05-23 14:24:28 UTC (rev 5710)
+++ branches/jessie/kfreebsd-10/debian/rules	2015-05-23 14:27:46 UTC (rev 5711)
@@ -95,7 +95,12 @@
 	rm -rf $(ORIG_DIR)
 	svn export --ignore-keywords -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
-	tar --numeric-owner --owner 0 --group 0 -cJf ../$(ORIG_TAR) $(ORIG_DIR)
+	# Create tarball with files sorted in a stable order, see
+	# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs
+	find $(ORIG_DIR) -print0 | LC_ALL=C sort -z \
+	 | tar --null --no-recursion --files-from - \
+	    --numeric-owner --owner 0 --group 0 \
+	    -cJf ../$(ORIG_TAR)
 	rm -rf $(ORIG_DIR)
 
 control: clean
@@ -166,7 +171,11 @@
 	chown -R root.src $(SRC_DIR)
 	# Avoid the top-level directory timestamp changing
 	touch $(SRC_DIR) --reference=$(SRC_DIR)/sys
-	tar cfJ $(SOURCE_PACKAGE)/usr/src/$(SRC_TAR) $(SRC_DIR)
+	# Create tarball with files sorted in a stable order, see
+	# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs
+	find $(SRC_DIR) -print0 | LC_ALL=C sort -z \
+	 | tar --null --no-recursion --files-from - \
+	    -cJf $(SOURCE_PACKAGE)/usr/src/$(SRC_TAR)
 
 	touch install-indep-stamp