summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-20 17:07:13 +0000
committergjb <gjb@FreeBSD.org>2016-01-20 17:07:13 +0000
commite4028b90cb3985f227566e723443d27276280867 (patch)
tree499e9c4a5140dfe1e940c2194138a1e349d80a90
parent37e4197e4f1c5dfdc9f6f47c3e2eaa08db678932 (diff)
downloadFreeBSD-src-e4028b90cb3985f227566e723443d27276280867.zip
FreeBSD-src-e4028b90cb3985f227566e723443d27276280867.tar.gz
Add a package for jail(8) and related utilities.
Sponsored by: The FreeBSD Foundation
-rw-r--r--etc/rc.d/Makefile7
-rw-r--r--lib/libjail/Makefile2
-rw-r--r--release/packages/jail-debug-lib32.ucl13
-rw-r--r--release/packages/jail-debug.ucl13
-rw-r--r--release/packages/jail-development.ucl13
-rw-r--r--release/packages/jail-lib32-development.ucl13
-rw-r--r--release/packages/jail-lib32-profile.ucl13
-rw-r--r--release/packages/jail-lib32.ucl13
-rw-r--r--release/packages/jail-profile.ucl13
-rw-r--r--release/packages/jail.ucl13
-rw-r--r--usr.sbin/jail/Makefile2
-rw-r--r--usr.sbin/jexec/Makefile2
-rw-r--r--usr.sbin/jls/Makefile2
13 files changed, 118 insertions, 1 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 10fe26b..2163118 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -204,7 +204,8 @@ FILES+= iscsid
.endif
.if ${MK_JAIL} != "no"
-FILES+= jail
+FILESGROUPS+= JAIL
+JAIL+= jail
.endif
.if ${MK_LEGACY_CONSOLE} != "no"
@@ -307,4 +308,8 @@ BSNMPDIR= /etc/rc.d
BSNMPMODE= ${BINMODE}
BSNMPPACKAGE= bsnmp
+JAILDIR= /etc/rc.d
+JAILMODE= ${BINMODE}
+JAILPACKAGE= jail
+
.include <bsd.prog.mk>
diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile
index 442274a..7932e9f 100644
--- a/lib/libjail/Makefile
+++ b/lib/libjail/Makefile
@@ -6,6 +6,8 @@ SHLIB_MAJOR= 1
SRCS= jail.c jail_getid.c
INCS= jail.h
+PACKAGE=jail
+
MAN= jail.3
MLINKS+=jail.3 jail_getid.3
diff --git a/release/packages/jail-debug-lib32.ucl b/release/packages/jail-debug-lib32.ucl
new file mode 100644
index 0000000..e7186d1
--- /dev/null
+++ b/release/packages/jail-debug-lib32.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-debug.ucl b/release/packages/jail-debug.ucl
new file mode 100644
index 0000000..4678e90
--- /dev/null
+++ b/release/packages/jail-debug.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail utilities (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-development.ucl b/release/packages/jail-development.ucl
new file mode 100644
index 0000000..4b24294
--- /dev/null
+++ b/release/packages/jail-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail utilities development"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-lib32-development.ucl b/release/packages/jail-lib32-development.ucl
new file mode 100644
index 0000000..66805be
--- /dev/null
+++ b/release/packages/jail-lib32-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit development"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-lib32-profile.ucl b/release/packages/jail-lib32-profile.ucl
new file mode 100644
index 0000000..3c4b592
--- /dev/null
+++ b/release/packages/jail-lib32-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries (profiling)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-lib32.ucl b/release/packages/jail-lib32.ucl
new file mode 100644
index 0000000..0cee475
--- /dev/null
+++ b/release/packages/jail-lib32.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-profile.ucl b/release/packages/jail-profile.ucl
new file mode 100644
index 0000000..a919f58
--- /dev/null
+++ b/release/packages/jail-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail libraries (profiling)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl
new file mode 100644
index 0000000..a307a31
--- /dev/null
+++ b/release/packages/jail.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail utilities"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 9dfdee5..1fb905b 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -8,6 +8,8 @@ SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
LIBADD= jail kvm util l
+PACKAGE=jail
+
NO_WMISSING_VARIABLE_DECLARATIONS=
YFLAGS+=-v
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index 700da97..3ecf567 100644
--- a/usr.sbin/jexec/Makefile
+++ b/usr.sbin/jexec/Makefile
@@ -4,4 +4,6 @@ PROG= jexec
MAN= jexec.8
LIBADD= jail util
+PACKAGE=jail
+
.include <bsd.prog.mk>
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index 4c1de74..34a5023 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -6,6 +6,8 @@ PROG= jls
MAN= jls.8
LIBADD= jail xo
+PACKAGE=jail
+
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
.endif
OpenPOWER on IntegriCloud