[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 316e6f4051c3488e21e5c78eea401ac95a3d1ce3 Author: Petr Vaněk atlas cz> AuthorDate: Mon Jan 30 12:12:06 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 8 17:11:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316e6f40 app-misc/jail: unify metadata indentation Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> app-misc/jail/metadata.xml | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml index 9f031edb4254..a8672061961d 100644 --- a/app-misc/jail/metadata.xml +++ b/app-misc/jail/metadata.xml @@ -1,15 +1,16 @@ https://www.gentoo.org/dtd/metadata.dtd;> - + spiculator/jail https://github.com/spiculator/jail/issues -Jail Chroot Project is an attempt of write a tool that builds a chrooted environment. -The main goal of Jail is to be as simple as possible, and highly portable. The most -difficult step when building a chrooted environment is to set up the right libraries and -files. Here, Jail comes to the rescue with a tool to automagically configures and builds -all the required files, directories and libraries. + Jail Chroot Project is an attempt of write a tool that builds a chrooted environment. + The main goal of Jail is to be as simple as possible, and highly portable. The most + difficult step when building a chrooted environment is to set up the right libraries and + files. Here, Jail comes to the rescue with a tool to automagically configures and builds + all the required files, directories and libraries. +
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 6f05f7efb771064cc11e76b79b4d3114463617d6 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat May 8 16:56:45 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Jun 7 08:33:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f05f7ef app-misc/jail: remove unused eclass Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Joonas Niilola gentoo.org> app-misc/jail/jail-2.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild index b3921ab2dae..884a5fc7c48 100644 --- a/app-misc/jail/jail-2.0-r4.ebuild +++ b/app-misc/jail/jail-2.0-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries" HOMEPAGE="https://github.com/spiculator/jail;
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 26701d265987756275119d98eb0718259b6699ae Author: Sam James gentoo org> AuthorDate: Sat Apr 3 23:04:25 2021 + Commit: Sam James gentoo org> CommitDate: Sat Apr 3 23:07:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26701d26 app-misc/jail: eutils--, fix ${D} in src_compile Signed-off-by: Sam James gentoo.org> app-misc/jail/jail-2.0-r4.ebuild | 55 +--- app-misc/jail/metadata.xml | 8 +++--- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild index 4e8ef915d7e..b3921ab2dae 100644 --- a/app-misc/jail/jail-2.0-r4.ebuild +++ b/app-misc/jail/jail-2.0-r4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic toolchain-funcs + +inherit flag-o-matic toolchain-funcs DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries" HOMEPAGE="https://github.com/spiculator/jail; @@ -11,13 +12,11 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g 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 @@ -35,41 +34,45 @@ PATCHES=( ) src_compile() { + emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { # 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 + 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" ) + FILES=( + "${ED}/usr/bin/mkjailenv" + "${ED}/usr/bin/addjailsw" + "${ED}/usr/bin/addjailuser" + "${ED}/etc/jail.conf" + "${ED}/usr/lib/libjail.pm" + "${ED}/usr/lib/arch/generic/definitions" + "${ED}/usr/lib/arch/generic/functions" + "${ED}/usr/lib/arch/linux/definitions" + "${ED}/usr/lib/arch/linux/functions" + "${ED}/usr/lib/arch/freebsd/definitions" + "${ED}/usr/lib/arch/freebsd/functions" + "${ED}/usr/lib/arch/irix/definitions" + "${ED}/usr/lib/arch/irix/functions" + "${ED}/usr/lib/arch/solaris/definitions" + "${ED}/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 + sed -i "s:/usr/etc:/etc:" "${ED}"/usr/lib/libjail.pm || die dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION} } diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml index 425dd3d2d46..26ee509dcdc 100644 --- a/app-misc/jail/metadata.xml +++ b/app-misc/jail/metadata.xml @@ -7,9 +7,9 @@ https://github.com/spiculator/jail/issues -Jail Chroot Project is an attempt of write a tool that builds a chrooted environment. -The main goal of Jail is to be as simple as possible, and highly portable. The most -difficult step when building a chrooted environment is to set up the right libraries and -files. Here, Jail comes to the rescue with a tool to automagically configures and builds +Jail Chroot Project is an attempt of write a tool that builds a chrooted environment. +The main goal of Jail is to be as simple as possible, and highly portable. The most +difficult step when building a chrooted environment is to set up the right libraries and +files. Here, Jail comes to the rescue
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 32944f679f6caabb71aa41400a45d640bb68a10a Author: Mikle Kolyada gentoo org> AuthorDate: Thu Feb 7 11:33:31 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Feb 7 11:33:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32944f67 app-misc/jail: Drop old Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/jail/jail-2.0-r1.ebuild | 70 1 file changed, 70 deletions(-) diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild deleted file mode 100644 index 60664a83e8e..000 --- a/app-misc/jail/jail-2.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 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} -}
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 5acbfb5dca67a26659e0170aa4749494eeda3fdf Author: Mikle Kolyada gentoo org> AuthorDate: Thu Feb 7 11:31:08 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Feb 7 11:31:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5acbfb5d app-misc/jail: amd64 stable wrt bug #676414 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/jail/jail-2.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild index dd9cc32080b..37ab62bd42c 100644 --- a/app-misc/jail/jail-2.0-r4.ebuild +++ b/app-misc/jail/jail-2.0-r4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: a99c0f67c3dde0fccca23b555cf77c130b3511d8 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jan 27 12:30:33 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jan 27 14:09:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99c0f67 app-misc/jail: stable 2.0-r4 for ppc, bug #676414 Package-Manager: Portage-2.3.58, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> app-misc/jail/jail-2.0-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild index fc4cdee1bb5..d023f2811ad 100644 --- a/app-misc/jail/jail-2.0-r4.ebuild +++ b/app-misc/jail/jail-2.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ppc ~ppc64 ~x86" IUSE="" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/files/, app-misc/jail/
commit: be3d4a58e7afa0c81d9508762b1e31e63f71910f Author: Pacho Ramos gentoo org> AuthorDate: Sat Nov 10 11:20:57 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Nov 10 12:58:15 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3d4a58 app-misc/jail: Fix openat patch Bug: https://bugs.gentoo.org/668898 Signed-off-by: Pacho Ramos gentoo.org> 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 => jail-2.0-r4.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) 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 f5f1e99f6ad..37f2a59b14b 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-r4.ebuild similarity index 100% rename from app-misc/jail/jail-2.0-r3.ebuild rename to app-misc/jail/jail-2.0-r4.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/files/, app-misc/jail/
commit: b2d45cce35de863eb4ce529cfc5b161349aa3f4d Author: Pacho Ramos gentoo org> AuthorDate: Sun Nov 4 12:08:09 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Nov 4 12:33:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d45cce app-misc/jail: Lots of bugfixes - Handle dirs with dots (#646116) - support openat() syscall too (#668898) - do not pass program parameters to ldd call (#668898) - do not duplicate jail in shells file (#668898) Thanks-to: Alexander Zubkov Closes: https://bugs.gentoo.org/646116 Closes: https://bugs.gentoo.org/668898 Signed-off-by: Pacho Ramos gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/jail/files/jail-2.0-duplicate-jail.patch | 19 ++ app-misc/jail/files/jail-2.0-fix-paths.patch | 21 +++ app-misc/jail/files/jail-2.0-ldd-call.patch | 19 ++ app-misc/jail/files/jail-2.0-openat-syscall.patch | 23 +++ app-misc/jail/jail-2.0-r3.ebuild | 75 +++ 5 files changed, 157 insertions(+) diff --git a/app-misc/jail/files/jail-2.0-duplicate-jail.patch b/app-misc/jail/files/jail-2.0-duplicate-jail.patch new file mode 100644 index 000..1522f3aa99e --- /dev/null +++ b/app-misc/jail/files/jail-2.0-duplicate-jail.patch @@ -0,0 +1,19 @@ +commit 984f62591b264aa8ed5c17f4033ec96dbba4bf5f +Author: Alexander Zubkov +Date: Wed Oct 17 22:47:50 2018 +0200 + +do not duplicate jail in shells file + +diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions +index b1fdbc8..89cd607 100755 +--- a/lib/arch/generic/functions b/lib/arch/generic/functions +@@ -823,7 +823,7 @@ sub add_jail_to_shells { + close(F); + + for $k (@elem) { +-if ($k =~ /^$INSTALL_DIR\/jail/) { ++if ($k =~ /^$INSTALL_DIR\/bin\/jail/) { + $found = 1; + last; + } diff --git a/app-misc/jail/files/jail-2.0-fix-paths.patch b/app-misc/jail/files/jail-2.0-fix-paths.patch new file mode 100644 index 000..e522828e286 --- /dev/null +++ b/app-misc/jail/files/jail-2.0-fix-paths.patch @@ -0,0 +1,21 @@ +commit 762cca3fd4aa754b266f928ec3fa2ad2261a831e +Author: Alexander Zubkov +Date: Mon Oct 22 20:31:04 2018 +0200 + +honor standalone '.' in path, split jail dir on "/./" pattern + +diff --git a/src/jail.c b/src/jail.c +index 74f3eb1..3d649c4 100644 +--- a/src/jail.c b/src/jail.c +@@ -121,8 +121,9 @@ void make_jail_dir( char* dir ) + { + for( ; *dir != '\0'; ++dir ) + { +-if( *dir == '.' ) ++if( dir[0] == '/' && dir[1] == '.' && dir[2] == '/' ) + { ++++dir; + *dir = '\0'; + break; + } diff --git a/app-misc/jail/files/jail-2.0-ldd-call.patch b/app-misc/jail/files/jail-2.0-ldd-call.patch new file mode 100644 index 000..22b2152066e --- /dev/null +++ b/app-misc/jail/files/jail-2.0-ldd-call.patch @@ -0,0 +1,19 @@ +commit 87867b2a117eef19500600a1f88b9caf260cfe3b +Author: Alexander Zubkov +Date: Wed Oct 17 22:38:13 2018 +0200 + +do not pass program parameters to ldd call + +diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions +index 66653c3..b0c6572 100755 +--- a/lib/arch/generic/functions b/lib/arch/generic/functions +@@ -704,7 +704,7 @@ sub generate_dep { + return(); + } + +-$query = "($ldd_cmd $p_name $p_args &1)"; ++$query = "($ldd_cmd $p_name &1)"; + local @res_a = `$query`; + + local @items = (); diff --git a/app-misc/jail/files/jail-2.0-openat-syscall.patch b/app-misc/jail/files/jail-2.0-openat-syscall.patch new file mode 100644 index 000..f5f1e99f6ad --- /dev/null +++ b/app-misc/jail/files/jail-2.0-openat-syscall.patch @@ -0,0 +1,23 @@ +commit 0894cc54b5b385201cdcf7ce227c6ea03d765ef9 +Author: Alexander Zubkov +Date: Wed Oct 17 22:45:24 2018 +0200 + +support openat() syscall too + +diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions +index b0c6572..b1fdbc8 100755 +--- a/lib/arch/generic/functions b/lib/arch/generic/functions +@@ -647,9 +647,9 @@ sub extract_open_from_ldd { + + local $file; + local $val; +- if ($line =~ /^open\(\"(.+)\".+\)\s*=\s*([-]?\d+)/) { +-$file = $1; +-$val = $2; ++ if ($line =~ /^open(at)?\(\"(.+)\".+\)\s*=\s*([-]?\d+)/) { ++$file = $2; ++$val = $3; + return($file,$val); + } + return(); diff --git a/app-misc/jail/jail-2.0-r3.ebuild b/app-misc/jail/jail-2.0-r3.ebuild new file mode 100644 index 000..fc4cdee1bb5 --- /dev/null +++ b/app-misc/jail/jail-2.0-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 4b798a2e805a6680abb3cb2244b17320146523f6 Author: Pacho Ramos gentoo org> AuthorDate: Sun Nov 4 12:08:26 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Nov 4 12:33:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b798a2e app-misc/jail: Drop old Signed-off-by: Pacho Ramos gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/jail/jail-2.0-r2.ebuild | 69 1 file changed, 69 deletions(-) diff --git a/app-misc/jail/jail-2.0-r2.ebuild b/app-misc/jail/jail-2.0-r2.ebuild deleted file mode 100644 index 8243ee0dfd3..000 --- a/app-misc/jail/jail-2.0-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 -) - -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} -}
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: dec0b64214681402304b46b4505bb6df920d118f Author: Pacho Ramos gentoo org> AuthorDate: Sun Jul 1 08:12:31 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jul 1 08:24:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec0b642 app-misc/jail: Drop old Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-misc/jail/jail-2.0.ebuild | 69 --- 1 file changed, 69 deletions(-) diff --git a/app-misc/jail/jail-2.0.ebuild b/app-misc/jail/jail-2.0.ebuild deleted file mode 100644 index 40247a1caf4..000 --- a/app-misc/jail/jail-2.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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 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 -} - -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} -}
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/, app-misc/jail/files/
commit: e58f80613441945507e8af4a63b12cb60ae90111 Author: Pacho Ramos gentoo org> AuthorDate: Sun Jul 1 08:11:57 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jul 1 08:24:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58f8061 app-misc/jail: Fix resolving of links (#659094 by Deniss Gaplevsky) Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-misc/jail/files/jail-2.0-symlinks.patch | 11 + app-misc/jail/files/jail-2.0-sysmacros.patch | 8 ++-- app-misc/jail/jail-2.0-r2.ebuild | 69 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/app-misc/jail/files/jail-2.0-symlinks.patch b/app-misc/jail/files/jail-2.0-symlinks.patch new file mode 100644 index 000..04b405efe30 --- /dev/null +++ b/app-misc/jail/files/jail-2.0-symlinks.patch @@ -0,0 +1,11 @@ +--- a/lib/arch/generic/functions~ 2014-07-03 11:37:33.0 +0200 b/lib/arch/generic/functions 2018-07-01 10:02:57.101547309 +0200 +@@ -687,7 +687,7 @@ + return(); + } + +- local $query = "$file_cmd $p_name"; ++ local $query = "$file_cmd -L $p_name"; + local $res = `$query`; + local $line; + diff --git a/app-misc/jail/files/jail-2.0-sysmacros.patch b/app-misc/jail/files/jail-2.0-sysmacros.patch index 4843c3d9719..ffe6a965934 100644 --- a/app-misc/jail/files/jail-2.0-sysmacros.patch +++ b/app-misc/jail/files/jail-2.0-sysmacros.patch @@ -1,5 +1,5 @@ src/generic_helpers.c -+++ src/generic_helpers.c +--- a/src/generic_helpers.c b/src/generic_helpers.c @@ -27,6 +27,7 @@ #include @@ -8,8 +8,8 @@ #include #include #include src/terminal_helpers.c -+++ src/terminal_helpers.c +--- a/src/terminal_helpers.c b/src/terminal_helpers.c @@ -25,6 +25,7 @@ #include diff --git a/app-misc/jail/jail-2.0-r2.ebuild b/app-misc/jail/jail-2.0-r2.ebuild new file mode 100644 index 000..8243ee0dfd3 --- /dev/null +++ b/app-misc/jail/jail-2.0-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 +) + +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} +}
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: a74cb39c995ee3f0ac575e0bc6560ec8ce7db65a Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Feb 1 20:28:04 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Feb 1 20:36:50 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74cb39c app-misc/jail: x86 stable (bug #641210) Package-Manager: Portage-2.3.21, Repoman-2.3.6 app-misc/jail/jail-2.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild index c2955ebc11e..60664a83e8e 100644 --- a/app-misc/jail/jail-2.0-r1.ebuild +++ b/app-misc/jail/jail-2.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" DEPEND=">=sys-apps/sed-4"
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 63da4c0e7cd244ec8b13ebbc34736cbd24c8c062 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Jan 4 20:18:40 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Jan 4 20:22:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63da4c0e app-misc/jail: amd64 stable wrt bug #641210 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-misc/jail/jail-2.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild index 093074a85df..c2955ebc11e 100644 --- a/app-misc/jail/jail-2.0-r1.ebuild +++ b/app-misc/jail/jail-2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 ~x86" IUSE="" DEPEND=">=sys-apps/sed-4"
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: b884593007f22ec309a8ff536b20de804d2e1e85 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Dec 25 10:58:56 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Dec 25 11:01:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8845930 app-misc/jail: stable 2.0-r1 for ppc, bug #641210 Package-Manager: Portage-2.3.19, Repoman-2.3.6 RepoMan-Options: --include-arches="ppc" app-misc/jail/jail-2.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild index 62eb691b4a3..093074a85df 100644 --- a/app-misc/jail/jail-2.0-r1.ebuild +++ b/app-misc/jail/jail-2.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ppc ~ppc64 ~x86" IUSE="" DEPEND=">=sys-apps/sed-4"
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/files/, app-misc/jail/
commit: 13637b0563223920ef6b892a48c06848bf4b6897 Author: Fabian Groffen gentoo org> AuthorDate: Wed Nov 1 07:42:51 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Nov 1 07:43:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13637b05 app-misc/jail: add patch for newer glibc, bug #580326 Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-misc/jail/files/jail-2.0-sysmacros.patch | 20 app-misc/jail/jail-2.0-r1.ebuild | 70 2 files changed, 90 insertions(+) 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 000..4843c3d9719 --- /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 + #include ++#include + #include + #include + #include +--- src/terminal_helpers.c src/terminal_helpers.c +@@ -25,6 +25,7 @@ + + #include + #include ++#include + #include + #include + #include 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 000..62eb691b4a3 --- /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} +}
[gentoo-commits] repo/gentoo:master commit in: app-misc/jail/
commit: 83906ebf207528f577220a1016b4ad86b467c664 Author: Jonas Stein gentoo org> AuthorDate: Sun Oct 29 22:03:00 2017 + Commit: Jonas Stein gentoo org> CommitDate: Sun Oct 29 22:53:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83906ebf app-misc/jail: Removed proxied maintainer Removed proxied maintainer due to inactivity. Closes: https://bugs.gentoo.org/632782 Package-Manager: Portage-2.3.13, Repoman-2.3.4 app-misc/jail/metadata.xml | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml index bcb966eb16a..425dd3d2d46 100644 --- a/app-misc/jail/metadata.xml +++ b/app-misc/jail/metadata.xml @@ -1,15 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - spicula...@gmail.com - Sergey Redin - Maintainer, Assign bugs - - - proxy-ma...@gentoo.org - Proxy Maintainers - + spiculator/jail https://github.com/spiculator/jail/issues