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

Robert Millan rmh at alioth.debian.org
Mon Oct 7 12:59:08 UTC 2013 

Author: rmh
Date: 2013-10-07 12:59:08 +0000 (Mon, 07 Oct 2013)
New Revision: 5003

Added:
   trunk/zfsutils/debian/patches/disable_libjail.diff
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/patches/09_xdr_control.diff
   trunk/zfsutils/debian/patches/makefile.diff
   trunk/zfsutils/debian/patches/series
   trunk/zfsutils/debian/rules
Log:
Disable dependency on libjail (by means of MK_JAIL knob, see disable_libjail.diff).  (Closes: #725643)

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2013-10-06 13:55:32 UTC (rev 5002)
+++ trunk/zfsutils/debian/changelog	2013-10-07 12:59:08 UTC (rev 5003)
@@ -1,3 +1,10 @@
+zfsutils (9.2-2) unstable; urgency=low
+
+  * Disable dependency on libjail (by means of MK_JAIL knob, see
+    disable_libjail.diff).  (Closes: #725643)
+
+ -- Robert Millan <rmh at debian.org>  Mon, 07 Oct 2013 14:49:03 +0200
+
 zfsutils (9.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2013-10-06 13:55:32 UTC (rev 5002)
+++ trunk/zfsutils/debian/control	2013-10-07 12:59:08 UTC (rev 5003)
@@ -10,7 +10,6 @@
  kfreebsd-kernel-headers (>= 9.1-2~),
  libgeom-dev,
  zlib1g-dev,
- libjail-dev,
  freebsd-glue (>= 0.1.8~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/zfsutils/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/zfsutils/

Modified: trunk/zfsutils/debian/patches/09_xdr_control.diff
===================================================================
--- trunk/zfsutils/debian/patches/09_xdr_control.diff	2013-10-06 13:55:32 UTC (rev 5002)
+++ trunk/zfsutils/debian/patches/09_xdr_control.diff	2013-10-07 12:59:08 UTC (rev 5003)
@@ -1,6 +1,6 @@
 --- a/sys/cddl/compat/opensolaris/rpc/xdr.h
 +++ b/sys/cddl/compat/opensolaris/rpc/xdr.h
-@@ -60,10 +80,16 @@
+@@ -60,10 +60,16 @@
  }
  
  #undef XDR_CONTROL

Added: trunk/zfsutils/debian/patches/disable_libjail.diff
===================================================================
--- trunk/zfsutils/debian/patches/disable_libjail.diff	                        (rev 0)
+++ trunk/zfsutils/debian/patches/disable_libjail.diff	2013-10-07 12:59:08 UTC (rev 5003)
@@ -0,0 +1,101 @@
+--- a/cddl/sbin/zfs/Makefile
++++ b/cddl/sbin/zfs/Makefile
+@@ -1,5 +1,7 @@
+ # $FreeBSD$
+ 
++.include <bsd.own.mk>
++
+ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
+ 
+ PROG=	zfs
+@@ -22,8 +24,14 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+ 
+-DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
++DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
+ 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
+-LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
++LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
++
++.if ${MK_JAIL} != "no"
++CFLAGS+= -DJAIL
++DPADD+= ${LIBJAIL}
++LDADD+= -ljail
++.endif
+ 
+ .include <bsd.prog.mk>
+--- 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>
+ #include <err.h>
++#ifdef JAIL
+ #include <jail.h>
++#endif
+ 
+ #include <libzfs.h>
+ #include <libzfs_core.h>
+@@ -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);
++#ifdef JAIL
+ static int zfs_do_jail(int argc, char **argv);
+ static int zfs_do_unjail(int argc, char **argv);
++#endif
+ 
+ /*
+  * Enable a reasonable set of defaults for libumem debugging on DEBUG builds.
+@@ -133,8 +137,10 @@
+ 	HELP_GET,
+ 	HELP_INHERIT,
+ 	HELP_UPGRADE,
++#ifdef JAIL
+ 	HELP_JAIL,
+ 	HELP_UNJAIL,
++#endif
+ 	HELP_LIST,
+ 	HELP_MOUNT,
+ 	HELP_PROMOTE,
+@@ -208,8 +214,10 @@
+ 	{ "release",	zfs_do_release,		HELP_RELEASE		},
+ 	{ "diff",	zfs_do_diff,		HELP_DIFF		},
+ 	{ NULL },
++#ifdef JAIL
+ 	{ "jail",	zfs_do_jail,		HELP_JAIL		},
+ 	{ "unjail",	zfs_do_unjail,		HELP_UNJAIL		},
++#endif
+ };
+ 
+ #define	NCOMMAND	(sizeof (command_table) / sizeof (command_table[0]))
+@@ -244,10 +252,12 @@
+ 	case HELP_UPGRADE:
+ 		return (gettext("\tupgrade [-v]\n"
+ 		    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
++#ifdef JAIL
+ 	case HELP_JAIL:
+ 		return (gettext("\tjail <jailid|jailname> <filesystem>\n"));
+ 	case HELP_UNJAIL:
+ 		return (gettext("\tunjail <jailid|jailname> <filesystem>\n"));
++#endif
+ 	case HELP_LIST:
+ 		return (gettext("\tlist [-rH][-d max] "
+ 		    "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
+@@ -6358,6 +6368,7 @@
+ 	return (unshare_unmount(OP_SHARE, argc, argv));
+ }
+ 
++#ifdef JAIL
+ /*
+  * Attach/detach the given dataset to/from the given jail
+  */
+@@ -6419,6 +6430,7 @@
+ 
+ 	return (do_jail(argc, argv, 0));
+ }
++#endif /* JAIL */
+ 
+ /*
+  * Called when invoked as /etc/fs/zfs/mount.  Do the mount if the mountpoint is

Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff	2013-10-06 13:55:32 UTC (rev 5002)
+++ trunk/zfsutils/debian/patches/makefile.diff	2013-10-07 12:59:08 UTC (rev 5003)
@@ -41,21 +41,21 @@
  NO_PROFILE=
 --- a/cddl/sbin/zfs/Makefile
 +++ b/cddl/sbin/zfs/Makefile
-@@ -24,6 +24,13 @@
+@@ -26,7 +26,13 @@
  
- DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
+ DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
  	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
--LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-+LDADD=	-lgeom -ljail -lnvpair -lumem -luutil -lzfs_core -lzfs
+-LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
++LDADD=	-lgeom -lnvpair -lumem -lbsd  -luutil -lzfs_core -lzfs
 +
-+LDADD+=	-lbsd
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
  
- .include <bsd.prog.mk>
+ .if ${MK_JAIL} != "no"
+ CFLAGS+= -DJAIL
 --- a/cddl/sbin/zpool/Makefile
 +++ b/cddl/sbin/zpool/Makefile
 @@ -28,6 +28,14 @@

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2013-10-06 13:55:32 UTC (rev 5002)
+++ trunk/zfsutils/debian/patches/series	2013-10-07 12:59:08 UTC (rev 5003)
@@ -3,11 +3,12 @@
 fix_implicit_warnx_declaration.diff
 
 # Mergeable material
+zfs_needs_libjail.diff
+disable_libjail.diff
 gratuitous_dependencies.diff
 #manpage_hyphens.diff
 include_next.diff
 assfail_protection.diff
-zfs_needs_libjail.diff
 
 # Other patches that might or might not be mergeable
 02_glibc_misc.diff

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2013-10-06 13:55:32 UTC (rev 5002)
+++ trunk/zfsutils/debian/rules	2013-10-07 12:59:08 UTC (rev 5003)
@@ -135,7 +135,7 @@
 		build-libzfs_core \
 		build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
-	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
+	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs -DWITHOUT_JAIL
 
 	$(PMAKE) -C $(CURDIR)/cddl/usr.sbin/zdb
 	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject

More information about the Glibc-bsd-commits mailing list