[Glibc-bsd-commits] r6064 - in trunk/zfsutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-05-30 13:27:52 +0000 (Mon, 30 May 2016)
New Revision: 6064

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/disable_libjail.diff
   trunk/zfsutils/debian/rules
Log:
* Update svn_revision regex to allow +suffix
* svn export with --ignore-keywords and re-pack upstream source
* Refresh patch debian/patches/disable_libjail.diff
* Abort on any error during svn export


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2016-05-30 13:06:26 UTC (rev 6063)
+++ trunk/zfsutils/debian/changelog	2016-05-30 13:27:52 UTC (rev 6064)
@@ -1,3 +1,12 @@
+zfsutils (10.1~svn272500+ds1-1) UNRELEASED; urgency=medium
+
+  * Update svn_revision regex to allow +suffix
+  * svn export with --ignore-keywords and re-pack upstream source
+  * Refresh patch debian/patches/disable_libjail.diff
+  * Abort on any error during svn export
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Mon, 30 May 2016 14:11:59 +0100
+
 zfsutils (10.1~svn272500-1) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/zfsutils/debian/patches/disable_libjail.diff
===================================================================
--- trunk/zfsutils/debian/patches/disable_libjail.diff	2016-05-30 13:06:26 UTC (rev 6063)
+++ trunk/zfsutils/debian/patches/disable_libjail.diff	2016-05-30 13:27:52 UTC (rev 6064)
@@ -1,16 +1,14 @@
-Index: zfsutils/cddl/sbin/zfs/Makefile
-===================================================================
---- zfsutils.orig/cddl/sbin/zfs/Makefile
-+++ zfsutils/cddl/sbin/zfs/Makefile
+--- a/cddl/sbin/zfs/Makefile
++++ b/cddl/sbin/zfs/Makefile
 @@ -1,5 +1,7 @@
- # $FreeBSD: releng/10.1/cddl/sbin/zfs/Makefile 248571 2013-03-21 08:38:03Z mm $
+ # $FreeBSD$
  
 +.include <bsd.own.mk>
 +
  .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
  
  PROG=	zfs
-@@ -22,8 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
+@@ -22,8 +24,14 @@
  CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
  CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
  
@@ -27,10 +25,8 @@
 +.endif
  
  .include <bsd.prog.mk>
-Index: zfsutils/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-===================================================================
---- zfsutils.orig/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-+++ zfsutils/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
++++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 @@ -58,7 +58,9 @@
  #include <sys/types.h>
  #include <time.h>
@@ -41,7 +37,7 @@
  
  #include <libzfs.h>
  #include <libzfs_core.h>
-@@ -105,8 +107,10 @@ static int zfs_do_hold(int argc, char **
+@@ -105,8 +107,10 @@
  static int zfs_do_holds(int argc, char **argv);
  static int zfs_do_release(int argc, char **argv);
  static int zfs_do_diff(int argc, char **argv);
@@ -52,7 +48,7 @@
  static int zfs_do_bookmark(int argc, char **argv);
  
  /*
-@@ -134,8 +138,10 @@ typedef enum {
+@@ -134,8 +138,10 @@
  	HELP_GET,
  	HELP_INHERIT,
  	HELP_UPGRADE,
@@ -63,7 +59,7 @@
  	HELP_LIST,
  	HELP_MOUNT,
  	HELP_PROMOTE,
-@@ -211,8 +217,10 @@ static zfs_command_t command_table[] = {
+@@ -211,8 +217,10 @@
  	{ "release",	zfs_do_release,		HELP_RELEASE		},
  	{ "diff",	zfs_do_diff,		HELP_DIFF		},
  	{ NULL },
@@ -74,7 +70,7 @@
  };
  
  #define	NCOMMAND	(sizeof (command_table) / sizeof (command_table[0]))
-@@ -248,10 +256,12 @@ get_usage(zfs_help_t idx)
+@@ -248,10 +256,12 @@
  	case HELP_UPGRADE:
  		return (gettext("\tupgrade [-v]\n"
  		    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
@@ -87,7 +83,7 @@
  	case HELP_LIST:
  		return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] "
  		    "[-s property]...\n\t    [-S property]... [-t type[,...]] "
-@@ -6480,6 +6490,7 @@ zfs_do_unshare(int argc, char **argv)
+@@ -6480,6 +6490,7 @@
  	return (unshare_unmount(OP_SHARE, argc, argv));
  }
  
@@ -95,7 +91,7 @@
  /*
   * Attach/detach the given dataset to/from the given jail
   */
-@@ -6541,6 +6552,7 @@ zfs_do_unjail(int argc, char **argv)
+@@ -6541,6 +6552,7 @@
  
  	return (do_jail(argc, argv, 0));
  }

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2016-05-30 13:06:26 UTC (rev 6063)
+++ trunk/zfsutils/debian/rules	2016-05-30 13:27:52 UTC (rev 6064)
@@ -30,7 +30,7 @@
 
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
 tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)[+-].*/\1/g')
 version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
@@ -85,7 +85,7 @@
 	         cddl/usr.bin/ztest \
 	         cddl/usr.sbin/zdb \
 	         ; do \
-	    svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	    svn export --ignore-keywords -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i || exit ; \
 	done
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)