gentoo resync : 02.11.2017

3 files changed, 92 insertions, 0 deletions

diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 1770a1ca1bf3..fdde23887112 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -2,7 +2,9 @@ AUX jail-1.9-gentoo.patch 3186 SHA256 bf3c42da26870dca1295f1fc5ca1d49eb1073137d7
 AUX jail-1.9-ldflags.patch 328 SHA256 26034a6e25281483ac3add1deb42c49bcfcde00693f958aaf0eda542ba98bd37 SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b WHIRLPOOL 554b15eb9a7d57c53a656ae7c7c9adfeb069aa3c7f1d9e12e96a7c455d4ebf2ea11e80a139e66fc9b4e8ac19c2e847767d54337540f54626d1e0c4b47e2ba67b
 AUX jail-1.9-multiuser-rsa.patch 856 SHA256 e67e3f140f82ba3bdbeb0d650c918d97a7ddedee6c56a620c4273d8a6009b428 SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541 WHIRLPOOL 853bcf6d1b7822464513bc19dcdc87054a6ad73176e632df366e2cecf9ac47a474123b3dde386554e804f3e1dfa4d0234d27f04d63d564a7610738b5c9486993
 AUX jail-1.9-wrongshell.patch 330 SHA256 d9de983e7c31e09927a87ac56c028ffb4f2f9692825aba765a157a63908eb07f SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd WHIRLPOOL 0f67fab357c81d354d324fafd44c073fd587a61054203a5d6e7df10e6f28b28d731805dda3107ffea5ef80c6b0f65f02887b14604bc6b4f9055412fca629416a
+AUX jail-2.0-sysmacros.patch 418 SHA256 9f02afb182ce6a0e677797e457fd36223c5ace04f7c6888709058d1da5a4caab SHA512 26da017e6c1852938799ca5a1b768dde881a29b2160a57b69a741250717c408901b95c253c0e29c8b81e94bfa303cf42cf9edb9cfd7c43166035bf846ed89f1e WHIRLPOOL 05cb9df01844037935b0c47d51ba42b84f42f0a4e4fe02d7fe69d902e569506fb1284318a25d08e1353aa4ccbf0d876f1e70f89b977216a0d770982134ec876e
 DIST jail-2.0.tar.gz 31095 SHA256 0ecdcc5230c99a7382d168ea60e9253c6bf5eec60b50f04f2588185c1974b07e SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae WHIRLPOOL bd8619ae57d0e56d164397e8a0fb795ed2fe7215064aef5cfbfb293ea3325d5177b673459011781b0bbeddf2b0327987d5fb95a5dfe957b359908ca10db5147c
+EBUILD jail-2.0-r1.ebuild 1994 SHA256 26d8f0d142c942f2d26f50080bdd1950a2028bc872aa7fbfb854bb1ebc9aed35 SHA512 8657ab225a382eb86f6836182c6e2b4587a8d4cc4a62ebdaa172ea4eea5dae5aa94d31890c0d5ac27bc4efab4039977ff12eeec83d5d3639bcc7d91dedd26335 WHIRLPOOL 9e54f9350551388e9c982a3f2b1736237a4164d2de98a175194e3e804fb62fa56f8c6e8448aa8b93371cb53a6e4696e98e7e506df09714c8f74a0a2bbb4e8c2b
 EBUILD jail-2.0.ebuild 1940 SHA256 6c0737aab4723649e618c4a06615ebf5d5fdccf0bca765edc71abd68789af222 SHA512 a8df73039d7c93d4952c9c010f465131e91f15dd4cc2a806a3d90a9a4896d744d40ce50dbd36e651646846bff3e2d93c0537748d1ac8351dd0e93f9f9e683555 WHIRLPOOL 465cfe111351663579e1c9f0720913774bcaaa85cfc09589b00244ed15a1b52610351d75fa7f1e2d00efdfe1653898911cba99b465d57e5c45e279321c4b78d5
 MISC ChangeLog 2550 SHA256 329042eca797913c025b77f478dbb5000cad81f245862745b5ce6fe9601b3ac2 SHA512 855b9098f2a43999bc1f03954ef20443bd4eb8c6b2af92680a1a2ec0ffe817793c341d5ddb3ddea5b96a9b36bd4b6aa08dcf28d54708c7feb3f3ca63947b5014 WHIRLPOOL d5fe03ace67842f5681152ba53fc73b666771c7186944f692948b7ec06b85e04611e85ac46690c5790e4c98dc752648b133bc821c66715b0cca85a641eafedc1
 MISC ChangeLog-2015 4302 SHA256 7f3ca8f265eb601948090cdd59d301efe4b9412fbf6eacd61cf896371812be0c SHA512 fb7df40a8275d488556009ac1080b38be7068accd5d4cc6149a7127a03acfe4d2b2cb20a949249a11e85c78b4b734ecaf18b0c406081d9c234d58dd45a019519 WHIRLPOOL 360f35bfc112c4c118e5f88cc317a49ed25c201cf771f6c5aa887b2d167a9a3496745e9148d926eb46c9fa84a2a0b428588432ae4201173cb7c317f1b32d7982
diff --git a/app-misc/jail/files/jail-2.0-sysmacros.patch b/app-misc/jail/files/jail-2.0-sysmacros.patch
new file mode 100644
index 000000000000..4843c3d97194
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-sysmacros.patch
@@ -0,0 +1,20 @@
+--- src/generic_helpers.c
++++ src/generic_helpers.c
+@@ -27,6 +27,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- src/terminal_helpers.c
++++ src/terminal_helpers.c
+@@ -25,6 +25,7 @@
+ 
+ #include <stdlib.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
new file mode 100644
index 000000000000..62eb691b4a39
--- /dev/null
+++ b/app-misc/jail/jail-2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
+HOMEPAGE="https://github.com/spiculator/jail"
+SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="dev-lang/perl
+	dev-util/strace"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.9-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.9-wrongshell.patch \
+		"${FILESDIR}"/${PN}-1.9-multiuser-rsa.patch \
+		"${FILESDIR}"/${PN}-1.9-ldflags.patch \
+		"${FILESDIR}"/${PN}-2.0-sysmacros.patch
+}
+
+src_compile() {
+	# configuration files should be installed in /etc not /usr/etc
+	sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
+
+	# the destination directory should be /usr not /usr/local
+	sed -i -e "s:usr/local:${D}/usr:g" \
+		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
+
+	# Below didn't work. Don't know why
+	#append-ldflags -Wl,-z,now
+	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake -C src install
+
+	# remove //var/tmp/portage/${P}/image//usr from files
+	FILES=( "${D}/usr/bin/mkjailenv"
+		"${D}/usr/bin/addjailsw"
+		"${D}/usr/bin/addjailuser"
+		"${D}/etc/jail.conf"
+		"${D}/usr/lib/libjail.pm"
+		"${D}/usr/lib/arch/generic/definitions"
+		"${D}/usr/lib/arch/generic/functions"
+		"${D}/usr/lib/arch/linux/definitions"
+		"${D}/usr/lib/arch/linux/functions"
+		"${D}/usr/lib/arch/freebsd/definitions"
+		"${D}/usr/lib/arch/freebsd/functions"
+		"${D}/usr/lib/arch/irix/definitions"
+		"${D}/usr/lib/arch/irix/functions"
+		"${D}/usr/lib/arch/solaris/definitions"
+		"${D}/usr/lib/arch/solaris/functions" )
+
+	for f in "${FILES[@]}"; do
+		sed -i "s:/${D}/usr:/usr:g" ${f} || die
+	done
+
+	sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
+
+	dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
+}