[Glibc-bsd-commits] r5996 - in trunk/ctfutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-10 21:10:53 +0000 (Sun, 10 Apr 2016)
New Revision: 5996

Modified:
   trunk/ctfutils/debian/changelog
   trunk/ctfutils/debian/control
   trunk/ctfutils/debian/patches/compat_opensolaris.diff
   trunk/ctfutils/debian/patches/ulong_t.diff
   trunk/ctfutils/debian/rules
Log:
* New upstream snapshot of 10.3-RELEASE
* Make get-orig-source tarball reproducible
* Refresh patches:
  - compat_opensolaris.diff
  - ulong_t.diff
* Now using Standards-Version 3.9.8 (no changes needed)


Modified: trunk/ctfutils/debian/changelog
===================================================================
--- trunk/ctfutils/debian/changelog	2016-04-10 18:13:49 UTC (rev 5995)
+++ trunk/ctfutils/debian/changelog	2016-04-10 21:10:53 UTC (rev 5996)
@@ -1,3 +1,14 @@
+ctfutils (10.3~svn297264-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot of 10.3-RELEASE
+  * Make get-orig-source tarball reproducible
+  * Refresh patches:
+    - compat_opensolaris.diff
+    - ulong_t.diff
+  * Now using Standards-Version 3.9.8 (no changes needed)
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 10 Apr 2016 20:58:12 +0100
+
 ctfutils (9.2-5.1) unstable; urgency=low
   
   * Non-maintainer upload.

Modified: trunk/ctfutils/debian/control
===================================================================
--- trunk/ctfutils/debian/control	2016-04-10 18:13:49 UTC (rev 5995)
+++ trunk/ctfutils/debian/control	2016-04-10 21:10:53 UTC (rev 5996)
@@ -11,7 +11,7 @@
  libelf-freebsd-dev,
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/ctfutils/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/ctfutils/
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
 
 Package: ctfutils
 Architecture: any

Modified: trunk/ctfutils/debian/patches/compat_opensolaris.diff
===================================================================
--- trunk/ctfutils/debian/patches/compat_opensolaris.diff	2016-04-10 18:13:49 UTC (rev 5995)
+++ trunk/ctfutils/debian/patches/compat_opensolaris.diff	2016-04-10 21:10:53 UTC (rev 5996)
@@ -30,22 +30,6 @@
  #define ftello64	ftello
  #define lseek64		lseek
  #define fseeko64	fseeko
---- a/cddl/compat/opensolaris/include/stdlib.h
-+++ b/cddl/compat/opensolaris/include/stdlib.h
-@@ -27,11 +27,11 @@
-  *
-  */
- 
-+#include_next <stdlib.h>
-+
- #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_
- #define _COMPAT_OPENSOLARIS_STDLIB_H_
- 
--#include_next <stdlib.h>
--
- #define getexecname	getprogname
- 
- #endif
 --- a/cddl/compat/opensolaris/include/alloca.h
 +++ b/cddl/compat/opensolaris/include/alloca.h
 @@ -27,6 +27,10 @@

Modified: trunk/ctfutils/debian/patches/ulong_t.diff
===================================================================
--- trunk/ctfutils/debian/patches/ulong_t.diff	2016-04-10 18:13:49 UTC (rev 5995)
+++ trunk/ctfutils/debian/patches/ulong_t.diff	2016-04-10 21:10:53 UTC (rev 5996)
@@ -1,11 +1,11 @@
 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
 +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
-@@ -380,7 +380,7 @@
+@@ -383,7 +383,7 @@
   * High order bit is 31 (or 63 in _LP64 kernel).
   */
  static __inline int
 -highbit(ulong_t i)
 +highbit(unsigned long i)
  {
- 	register int h = 1;
- 
+ #if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL)
+ 	return (flsl(i));

Modified: trunk/ctfutils/debian/rules
===================================================================
--- trunk/ctfutils/debian/rules	2016-04-10 18:13:49 UTC (rev 5995)
+++ trunk/ctfutils/debian/rules	2016-04-10 21:10:53 UTC (rev 5996)
@@ -47,10 +47,11 @@
 #SVN		:= https://svn0.us-west.freebsd.org/base/head
 
 SOURCE = ctfutils
-ORIGDIR = $(SOURCE)-$(tar_version)
-TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
+ORIG_DIR = $(SOURCE)-$(tar_version)
+ORIG_TAR = $(SOURCE)_$(tar_version).orig.tar.gz
 
 PATH := /usr/lib/freebsd:$(PATH)
+SOURCE_DATE_EPOCH ?= $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s)
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
@@ -61,7 +62,7 @@
 export SHLIB_MAJOR = 0
 
 get-orig-source:
-	rm -rf $(ORIGDIR)
+	rm -rf $(ORIG_DIR)
 	for i in \
 		cddl/compat/opensolaris \
 		sys/cddl/compat/opensolaris \
@@ -78,10 +79,19 @@
 		cddl/usr.bin/ctfdump \
 		cddl/usr.bin/ctfmerge \
 	         ; do \
-	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	    svn export $(SVN)/$$i $(ORIG_DIR)/$$i || : ; \
 	done
-	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
-	rm -rf $(ORIGDIR)
+	# Clamp timestamps to be no newer than last changelog entry, see
+	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
+	find $(ORIG_DIR) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 \
+	 | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
+	# 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)
 
 build: build-arch build-indep