From be3d4a58e7afa0c81d9508762b1e31e63f71910f Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 10 Nov 2018 12:20:57 +0100 Subject: app-misc/jail: Fix openat patch Bug: https://bugs.gentoo.org/668898 Signed-off-by: Pacho Ramos Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- app-misc/jail/files/jail-2.0-openat-syscall.patch | 4 +- app-misc/jail/jail-2.0-r3.ebuild | 75 ----------------------- app-misc/jail/jail-2.0-r4.ebuild | 75 +++++++++++++++++++++++ 3 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 app-misc/jail/jail-2.0-r3.ebuild create mode 100644 app-misc/jail/jail-2.0-r4.ebuild (limited to 'app-misc') diff --git a/app-misc/jail/files/jail-2.0-openat-syscall.patch b/app-misc/jail/files/jail-2.0-openat-syscall.patch index f5f1e99f6ad2..37f2a59b14b9 100644 --- a/app-misc/jail/files/jail-2.0-openat-syscall.patch +++ b/app-misc/jail/files/jail-2.0-openat-syscall.patch @@ -15,9 +15,9 @@ index b0c6572..b1fdbc8 100755 - if ($line =~ /^open\(\"(.+)\".+\)\s*=\s*([-]?\d+)/) { - $file = $1; - $val = $2; -+ if ($line =~ /^open(at)?\(\"(.+)\".+\)\s*=\s*([-]?\d+)/) { ++ if ($line =~ /^open(at)?\([^\"]*\"(.+)\".+\)\s*=\s*([-]?\d+)/) { + $file = $2; + $val = $3; return($file,$val); } - return(); + return(); \ No newline at end of file diff --git a/app-misc/jail/jail-2.0-r3.ebuild b/app-misc/jail/jail-2.0-r3.ebuild deleted file mode 100644 index fc4cdee1bb55..000000000000 --- a/app-misc/jail/jail-2.0-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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="" - -RDEPEND=" - dev-lang/perl - dev-util/strace -" -DEPEND="" - -PATCHES=( - "${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 - "${FILESDIR}"/${PN}-2.0-symlinks.patch #659094 - "${FILESDIR}"/${PN}-2.0-fix-paths.patch #646116 - # https://github.com/spiculator/jail/issues/2 - "${FILESDIR}"/${PN}-2.0-openat-syscall.patch - # https://github.com/spiculator/jail/issues/3 - "${FILESDIR}"/${PN}-2.0-ldd-call.patch - "${FILESDIR}"/${PN}-2.0-duplicate-jail.patch #668898 -) - -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 - - 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} -} diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild new file mode 100644 index 000000000000..fc4cdee1bb55 --- /dev/null +++ b/app-misc/jail/jail-2.0-r4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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="" + +RDEPEND=" + dev-lang/perl + dev-util/strace +" +DEPEND="" + +PATCHES=( + "${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 + "${FILESDIR}"/${PN}-2.0-symlinks.patch #659094 + "${FILESDIR}"/${PN}-2.0-fix-paths.patch #646116 + # https://github.com/spiculator/jail/issues/2 + "${FILESDIR}"/${PN}-2.0-openat-syscall.patch + # https://github.com/spiculator/jail/issues/3 + "${FILESDIR}"/${PN}-2.0-ldd-call.patch + "${FILESDIR}"/${PN}-2.0-duplicate-jail.patch #668898 +) + +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 + + 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} +} -- cgit v1.2.3-18-g5258