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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-06-27 14:00:57 +0000 (Sat, 27 Jun 2015)
New Revision: 5716

Modified:
   branches/jessie/kfreebsd-10/debian/changelog
   branches/jessie/kfreebsd-10/debian/rules
Log:
In the kfreebsd-source binary-indep package, clamp timestamps
to be no later than the last debian/changelog entry.
(Closes: #788238)


Modified: branches/jessie/kfreebsd-10/debian/changelog
===================================================================
--- branches/jessie/kfreebsd-10/debian/changelog	2015-06-09 16:39:48 UTC (rev 5715)
+++ branches/jessie/kfreebsd-10/debian/changelog	2015-06-27 14:00:57 UTC (rev 5716)
@@ -3,6 +3,9 @@
   * Create tarballs of upstream source, and of the kfreebsd-source
     binary-indep package, using a reproducible stable file order.
     (Closes: #786615)
+  * In the kfreebsd-source binary-indep package, clamp timestamps
+    to be no later than the last debian/changelog entry.
+    (Closes: #788238)
   * Pick SVN r282873 from FreeBSD 10.1-RELEASE to fix:
     - EN-15:05: Fix deadlock on reboot with UFS tuned with SU+J.
       (Closes: #786619)

Modified: branches/jessie/kfreebsd-10/debian/rules
===================================================================
--- branches/jessie/kfreebsd-10/debian/rules	2015-06-09 16:39:48 UTC (rev 5715)
+++ branches/jessie/kfreebsd-10/debian/rules	2015-06-27 14:00:57 UTC (rev 5716)
@@ -44,6 +44,7 @@
 ORIG_DIR	:= $(source)-$(tar_version)
 ORIG_TAR	:= $(source)_$(tar_version).orig.tar.xz
 PATH		:= /usr/lib/freebsd:$(PATH)
+BUILD_DATE	?= $(shell dpkg-parsechangelog --show-field=Date)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -169,8 +170,10 @@
 
 	mkdir -p $(SOURCE_PACKAGE)/usr/src
 	chown -R root.src $(SRC_DIR)
-	# Avoid the top-level directory timestamp changing
-	touch $(SRC_DIR) --reference=$(SRC_DIR)/sys
+	# Clamp timestamps to be no newer than last changelog entry, see
+	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
+	find $(SRC_DIR) -newermt "$(BUILD_DATE)" -print0 \
+	 | xargs -0r touch --no-dereference --date="$(BUILD_DATE)"
 	# 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 \