[Glibc-bsd-commits] r6056 - in trunk/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-05-27 16:22:34 +0000 (Fri, 27 May 2016)
New Revision: 6056

Added:
   trunk/kfreebsd-10/debian/patches/date_r.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
Log:
Avoid FTBFS due to incompatibility of `date -r`, when
SOURCE_DATE_EPOCH is exported in the environment.


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2016-05-27 13:53:00 UTC (rev 6055)
+++ trunk/kfreebsd-10/debian/changelog	2016-05-27 16:22:34 UTC (rev 6056)
@@ -1,3 +1,10 @@
+kfreebsd-10 (10.3~svn300087-1~debug2) UNRELEASED; urgency=medium
+
+  * Avoid FTBFS due to incompatibility of `date -r`, when
+    SOURCE_DATE_EPOCH is exported in the environment.
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Fri, 27 May 2016 14:49:02 +0100
+
 kfreebsd-10 (10.3~svn300087-1~debug1) experimental; urgency=medium
 
   * Pick SVN r300087 from FreeBSD 10.3-RELEASE to fix:

Added: trunk/kfreebsd-10/debian/patches/date_r.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/date_r.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/date_r.diff	2016-05-27 16:22:34 UTC (rev 6056)
@@ -0,0 +1,31 @@
+Date: Fri, 27 May 2016 15:51:47 +0100
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: Avoid FTBFS with SOURCE_DATE_EPOCH
+
+Avoid FTBFS due to incompatibility of `date -r`, when
+SOURCE_DATE_EPOCH is exported in the environment.
+
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -89,7 +89,7 @@
+ touch version
+ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`}
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+-	if ! t=`date -r $SOURCE_DATE_EPOCH 2>/dev/null`; then
++	if ! t=`LANG=C date -ud @$SOURCE_DATE_EPOCH 2>/dev/null`; then
+ 		echo "Invalid SOURCE_DATE_EPOCH" >&2
+ 		exit 1
+ 	fi
+@@ -99,12 +99,6 @@
+ i=`${MAKE:-make} -V KERN_IDENT`
+ compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
+ 
+-if [ -f "${SYSDIR}/../../debian/changelog" ] ; then
+-	# Use timestamp from the most recent debian/changelog entry,
+-	# instead of the exact time of the build.
+-	t=`dpkg-parsechangelog -l"${SYSDIR}/../../debian/changelog" -S"Date"`
+-fi
+-
+ for dir in /usr/bin /usr/local/bin; do
+ 	if [ ! -z "${svnversion}" ] ; then
+ 		break

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2016-05-27 13:53:00 UTC (rev 6055)
+++ trunk/kfreebsd-10/debian/patches/series	2016-05-27 16:22:34 UTC (rev 6056)
@@ -48,3 +48,4 @@
 #EN-15_07.zfs.patch
 #SA-15_21.amd64.patch
 #EN-15_14.ixgbe.patch
+date_r.diff