diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-07 11:42:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-07 11:42:03 +0100 |
commit | f70601e0934acd62f6c5d06c5ede4cc607179514 (patch) | |
tree | 0b337390375de04b950fc4b45edc0f895a4701a4 /app-misc/jail | |
parent | b2be182d49eea46686b5cf2680d457df61e89dc4 (diff) |
gentoo resync : 07.07.2018
Diffstat (limited to 'app-misc/jail')
-rw-r--r-- | app-misc/jail/Manifest | 5 | ||||
-rw-r--r-- | app-misc/jail/files/jail-2.0-symlinks.patch | 11 | ||||
-rw-r--r-- | app-misc/jail/files/jail-2.0-sysmacros.patch | 8 | ||||
-rw-r--r-- | app-misc/jail/jail-2.0-r2.ebuild (renamed from app-misc/jail/jail-2.0.ebuild) | 32 |
4 files changed, 34 insertions, 22 deletions
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest index 22f14d444fff..abc0746bf2b3 100644 --- a/app-misc/jail/Manifest +++ b/app-misc/jail/Manifest @@ -2,8 +2,9 @@ AUX jail-1.9-gentoo.patch 3186 BLAKE2B 289f102f6041e4352b0ae1bb1548ae2c4b6c2a2d8 AUX jail-1.9-ldflags.patch 328 BLAKE2B f6965d1b43af4b16ec8db30add8b1c448557ad00d6ba0c0793b3b00898fa0decbe42c77822c6361183314c5cd2197e52366e6cb3d5e2197448b7d21a853a380b SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a22ec7bfe9b7a1d385d3286615f95571d95887826f72bc09202c77fef03f0158f385db15bc60a67cd29c635637d37a SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541 AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd -AUX jail-2.0-sysmacros.patch 418 BLAKE2B d3c5b77e8b474b9822225e913e181dc754a2b54a273fb82da6589ae54221a703f216e583207a75e3ebe5aaf0a9121d1833fd60bf1639e2d14736ad1ac40df6f0 SHA512 26da017e6c1852938799ca5a1b768dde881a29b2160a57b69a741250717c408901b95c253c0e29c8b81e94bfa303cf42cf9edb9cfd7c43166035bf846ed89f1e +AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f +AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f -EBUILD jail-2.0.ebuild 1940 BLAKE2B 6a8220fc07cd18556f0145bdb4af069ba4749dcb886e4b0439d9d05bba8c13a439338e6cd3b89b93ff6804300af2d59267af73c03cbf103631ecf44bfd12a42b SHA512 a8df73039d7c93d4952c9c010f465131e91f15dd4cc2a806a3d90a9a4896d744d40ce50dbd36e651646846bff3e2d93c0537748d1ac8351dd0e93f9f9e683555 +EBUILD jail-2.0-r2.ebuild 1932 BLAKE2B 67e57ab57efe111166d9b01f7029e26f4ca6d5961c2e120721da18731c0235131c268210e9e397a750bd2a9c05853699a7722ac7b68f9a7a062b27c6947bb114 SHA512 6efe7c5ce0f9ef53fdc86dbd2fe81758cf28015c1d69c9a1c3bddb139f975de17f8392c9873ca01a67959f1598d70c3588287f43ad7b6fa959b356d8ad7b4692 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9 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 000000000000..04b405efe300 --- /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.000000000 +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 4843c3d97194..ffe6a965934b 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 <stdlib.h> @@ -8,8 +8,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> ---- src/terminal_helpers.c -+++ src/terminal_helpers.c +--- a/src/terminal_helpers.c ++++ b/src/terminal_helpers.c @@ -25,6 +25,7 @@ #include <stdlib.h> diff --git a/app-misc/jail/jail-2.0.ebuild b/app-misc/jail/jail-2.0-r2.ebuild index 40247a1caf48..8243ee0dfd3c 100644 --- a/app-misc/jail/jail-2.0.ebuild +++ b/app-misc/jail/jail-2.0-r2.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - +EAPI=7 inherit eutils flag-o-matic DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries" @@ -11,20 +10,23 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" -DEPEND=">=sys-apps/sed-4" -RDEPEND="dev-lang/perl - dev-util/strace" +RDEPEND=" + dev-lang/perl + dev-util/strace +" +DEPEND="" -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 -} +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 @@ -34,8 +36,6 @@ src_compile() { 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}" } |