[Glibc-bsd-commits] r5858 - in trunk/freebsd-utils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-12-08 19:30:10 +0000 (Tue, 08 Dec 2015)
New Revision: 5858

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/patches/makefiles.diff
   trunk/freebsd-utils/debian/rules
Log:
Add jls(8) and jexec(8) tools for jails administration (Closes: #806562)
Thanks, Hideki Yamane.


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2015-12-08 19:28:31 UTC (rev 5857)
+++ trunk/freebsd-utils/debian/changelog	2015-12-08 19:30:10 UTC (rev 5858)
@@ -1,7 +1,12 @@
 freebsd-utils (10.1~svn273304+ds1-1) UNRELEASED; urgency=medium
 
+  [ Steven Chamberlain ]
   * Support +ds source_version suffix in svn_revision
 
+  [ Hideki Yamane ]
+  * Add jls(8) and jexec(8) tools for jails administration
+    (Closes: #806562)
+
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 08 Dec 2015 18:52:10 +0000
 
 freebsd-utils (10.1~svn273304-2) experimental; urgency=medium

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2015-12-08 19:28:31 UTC (rev 5857)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2015-12-08 19:30:10 UTC (rev 5858)
@@ -27,3 +27,5 @@
 
 usr/sbin/acpiconf			/usr/sbin
 usr/sbin/jail				/usr/sbin
+usr/sbin/jls				/usr/sbin
+usr/sbin/jexec				/usr/sbin

Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff	2015-12-08 19:28:31 UTC (rev 5857)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff	2015-12-08 19:30:10 UTC (rev 5858)
@@ -414,7 +414,7 @@
 +.include <bsd.subdir.mk>
 --- /dev/null
 +++ b/src/usr.sbin/Makefile
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,24 @@
 +SUBDIR = \
 +	kbdcontrol \
 +
@@ -424,6 +424,8 @@
 +	arp \
 +	authpf \
 +	jail \
++	jexec \
++	jls \
 +	mountd \
 +	nfsd \
 +	powerd \
@@ -454,3 +456,26 @@
 +.endif
 +
 +.include <bsd.subdir.mk>
+--- a/src/usr.sbin/jexec/Makefile
++++ b/src/usr.sbin/jexec/Makefile
+@@ -3,6 +3,8 @@
+ PROG=	jexec
+ MAN=	jexec.8
+ DPADD=	${LIBJAIL} ${LIBUTIL}
+-LDADD=	-ljail -lutil
++LDADD=	-ljail -lutil-freebsd
++
++LDADD+=	-lfreebsd-glue
+ 
+ .include <bsd.prog.mk>
+--- a/src/usr.sbin/jls/Makefile
++++ b/src/usr.sbin/jls/Makefile
+@@ -7,6 +7,8 @@
+ DPADD=	${LIBJAIL}
+ LDADD=	-ljail
+ 
++LDADD+=	-lfreebsd-glue
++
+ .if ${MK_INET6_SUPPORT} != "no"
+ CFLAGS+= -DINET6
+ .endif

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2015-12-08 19:28:31 UTC (rev 5857)
+++ trunk/freebsd-utils/debian/rules	2015-12-08 19:30:10 UTC (rev 5858)
@@ -113,6 +113,7 @@
 		sys/i386/linux/syscalls.master \
 		\
 		 usr.sbin/jail bin/chflags \
+		 usr.sbin/jexec usr.sbin/jls \
 		 sbin/devd etc/devd.conf etc/devd sys/dev/usb/usbdevs \
 		 usr.sbin/acpi/acpiconf \
 		usr.sbin/acpi/Makefile \