Cleanup for security bug #514892 as requested by proxy maintainer

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xFC3B17DE05E136A0!

3 files changed, 18 insertions, 95 deletions

diff --git a/app-misc/jail/ChangeLog b/app-misc/jail/ChangeLog
index 7ed73a123fcb..f7c0a1dc55c6 100644
--- a/app-misc/jail/ChangeLog
+++ b/app-misc/jail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/jail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.35 2014/08/08 21:35:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.36 2014/08/25 09:14:52 k_f Exp $
+
+  25 Aug 2014; Kristian Fiskerstrand <k_f@gentoo.org> -jail-1.9-r3.ebuild:
+  Cleanup for security bug #514892 as requested by proxy maintainer
 
   08 Aug 2014; Agostino Sarubbo <ago@gentoo.org> jail-2.0.ebuild:
   Stable for ppc, wrt bug #514892
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 7ab8a5d116c1..10426fa00985 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -6,25 +6,22 @@ AUX jail-1.9-ldflags.patch 328 SHA256 26034a6e25281483ac3add1deb42c49bcfcde00693
 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
 DIST jail-2.0.tar.gz 31095 SHA256 0ecdcc5230c99a7382d168ea60e9253c6bf5eec60b50f04f2588185c1974b07e SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae WHIRLPOOL bd8619ae57d0e56d164397e8a0fb795ed2fe7215064aef5cfbfb293ea3325d5177b673459011781b0bbeddf2b0327987d5fb95a5dfe957b359908ca10db5147c
-DIST jail_1.9.tar.gz 32994 SHA256 1d997739b2dfe84ff975673b1357d3814cd3c2ee0cf3d61031f6f95a3e2080e3 SHA512 f2cec8f4ef38c044e320919a1c172ec18526925e4dcda2785d99d05d9ad939c66c320e4e428e5efd63e4d87bbfb7f89a1c9bc15e13f15a8a4331aa6935f60e30 WHIRLPOOL 9186cba5c74a28a8cc7026a28525ad68ef2181851ffe7f264cbc634134653526c9d06d99d5c6da85152421e05ee2ab8f4f4306dea33c4fbcfabb4bd806e9e755
-EBUILD jail-1.9-r3.ebuild 2256 SHA256 1e654bd5a2b7e7d18ea78f85aa8dd20459e9f9ed606e0d47f366674225ad9993 SHA512 f5f092630ea59c8fd3cae4ff8d4c2bf2d83e8a3d1c7d5a8d3a5e3dcff65ba219f2f16b4da39bc3bd638ed15c0a60620b7544cbd799798d2b34ca0b3414e93ff5 WHIRLPOOL 58ed99227cf2eba66911c02f384f7428ce5cff7e85acc30801184b48b485333349466072640dc504b23a278aca7a2d3913a5bcd9d840bab5ba5e2f262467d455
 EBUILD jail-2.0.ebuild 2053 SHA256 9854aaed48e0c3f338e5960825bf02dc3f6fd26fa3ff523f0bec5947919a83bf SHA512 37105f5e01ecdf2088df58e71bca515f393674572f76db87340a9593f8782c3e70e31451076b6f11e8072f89389267370dfcccb661de123b74561d90a3ead02d WHIRLPOOL 78a67d366f6209b3859b6de23af87bf83cad9a413b60e50ca2fef93814aea006995c0065195b678ac7afd58639454d45a6959f30394c225a34ad4de051c9af51
-MISC ChangeLog 4158 SHA256 e5f3ed1981bbdcdb94c5259820a5730a3e8978cc71843f3196a8fd5b32365180 SHA512 4c30223fcfff3bcc8b25ba55a4e4eab49cf0a2ad42649cd4d954664d0356c3a480da05109b93d5da04fc5d72c1df221994b67aa32bf26b4c8eb90771d817f481 WHIRLPOOL 0db280e5661a6e855fc14e41b5d5f60b9b283ef6fafc2307e85f6cd6892e0b305dfa8d8c93b43cb10916b5432bf5ff92554cc5d989b2a81b12911e0973e39436
+MISC ChangeLog 4302 SHA256 7f3ca8f265eb601948090cdd59d301efe4b9412fbf6eacd61cf896371812be0c SHA512 fb7df40a8275d488556009ac1080b38be7068accd5d4cc6149a7127a03acfe4d2b2cb20a949249a11e85c78b4b734ecaf18b0c406081d9c234d58dd45a019519 WHIRLPOOL 360f35bfc112c4c118e5f88cc317a49ed25c201cf771f6c5aa887b2d167a9a3496745e9148d926eb46c9fa84a2a0b428588432ae4201173cb7c317f1b32d7982
 MISC metadata.xml 902 SHA256 5be5df1bd7aeff9f9c02189392a80beb7150b70db69b8bbe502b2683b327ef43 SHA512 1f9db5588f9069eac0f682be75f18e63cea5998b5a802a6658f20e41768f9cd99d7c2e436ef2c77b4fda12c4081fc09591f4d478a43c092e9a0fda11f3f0bd49 WHIRLPOOL cbc2653015e60a5ae076164658e127d4b6a544239584a7ecb9a926e614e2ee7503b85804c4db7370e5154d82b093e00271deba15acdc74727c0d9992f227d4b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT5UKYAAoJELp701BxlEWfir4QAIw7fzPBXqyKu/oC/A/XMeha
-tcFxGTfkCefgKWMaOheRY/TM+IP9wCYoh8exM+wNGxQnuNwyX47X3zDy2xfH5lLg
-P9akVvDjSs41X2N3syFEACyhAlaslVDBKkYuCgcGoQwyU6Zv8gj8dQodf9Ah+8y1
-gqsTnTSu2FpiUkUhLhrCZKw86y47IljtEzaWgT7IgbpKhfN2TJ0LwF9bEB1I12tu
-gYEyjC320/oEXzynuPm6q58JmulXtQ9Cc+DmPozeokk+F2/bTb2FKJTsihNUuJtq
-DJP+VmCahHXULDHAqsCEOnZEgK9OQyP/H9OxCfZVdd04vcTsW+xWdmP3pepWYQ8c
-0+YtAKozC7bCtOY5JN5uLAQ0e4Ek5hryqlPoPU53N5CFEb33MwsIhqpviAORDaCr
-pPy2s+qRmszLk5XmXHCTqe82D904/sHrmZz/JByZrDu0mO+b5lFT0sewLEs3Wqg4
-ttGvK4RezAAR7QiQmZ45uw0Q5FuiwnCICzh0Wv18mf3miQqa8XLXynhQBnTHJZNH
-CnOHPCkowbN0SKMmvTwnRMQK8g8TWRhIP0whg2h/P678Acihf88iJi9FvhTtwuxi
-UPVPVQ07PKnnmhd0KSOzJx4tWgrEpHNWxdJPmO6fchWK3E7Xqcv5Qr3SmDy43huu
-CdCkm0VXWt0L8zn5NJBe
-=xKhL
+iQIcBAEBCAAGBQJT+v4VAAoJEPw7F94F4TagKWQQALQjsfmP28IKV2BfgeUQHxHc
+gXUvSVuEVcBF4ZL09yVnZNAq8QW1pWlUGBT0PvTA49QzO8ZVoHGRyUbAFKpOW0u1
+xyWfz4RqkyUmtLBmwMqvrmxbJAoqq0J2LfaE/yTOC4DvwvDElh/ZH1r1NXgPAItO
+JKYDxi65SZgkpMMY4lOxYc8Lq65j2f9iY01rnoO+piLYuYYrz7gujjrNgMQXXGUf
+EyMVqn9NPq7ZT+FLeoVXH3pySW4u9NNlOkwiZPydCfDejPZ28MRrVuTCvj6IY7+6
+SZ/8lawkm1FgyjvgTKoeLUUpJrqj8EKBb0ZMNwbXja0MOoi0UGjxnDrCPTMjNgBg
+6288H9PHVPpNz6AzPIXEqrpG7nJXBWvCdeUteMOTq9iBIX9ICwzbn6GL9O9jI5ld
+dDX8+pt/OkKWXVcgaPkxWSyEbi3AYK/ZXw/7GZSlnAR9vNQozrSBNFLrHlhf5tT6
+J0E0bVa8oTCNuFx9ZWv8CZ96AbXHoCuTvrzu3uLylg5GwkwCtN07lt8EXqIOEZeG
+0P7H8KRUKp2YHP5lahitULErzQP1rA6oauHYeVMCq/ymeNBpv//V+4UVkn3R1wqh
+7U0gimlFZLZtNY8Wi2TtefZYFg4XpxS+6nW+IV23c4gcLg0H1OcXOpNmihE0NRKI
+zzk2DcYy4KujpS7ZY62u
+=0z6u
 -----END PGP SIGNATURE-----
diff --git a/app-misc/jail/jail-1.9-r3.ebuild b/app-misc/jail/jail-1.9-r3.ebuild
deleted file mode 100644
index b80078ee1bdf..000000000000
--- a/app-misc/jail/jail-1.9-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild,v 1.5 2012/07/29 16:54:12 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-S="${WORKDIR}/${PN}_1-9_stable"
-DESCRIPTION="a tool that builds a chroot and configures all the required files, directories and libraries"
-HOMEPAGE="http://www.jmcresearch.com/projects/jail/"
-SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.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}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-wrongshell.patch \
-		"${FILESDIR}"/${P}-multiuser-rsa.patch \
-		"${FILESDIR}"/${P}-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
-	cd "${S}"/src
-	sed -i -e "s:usr/local:${D}/usr:g" \
-		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile || die
-
-	# Below didn't work. Don't know why
-	#append-ldflags -Wl,-z,now
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"/src
-	einstall || die
-
-	# remove //var/tmp/portage/jail-1.9/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
-		# documentation says funtion 'dosed' is supposed to do this, but didn't know how to make it work :'(
-		# dosed ${file} || die "error in dosed"
-		sed -i "s:/${D}/usr:/usr:g" ${f} || die
-	done
-
-	cd "${D}"/usr/lib
-	sed -i "s:/usr/etc:/etc:" libjail.pm || die
-
-	cd "${S}"/doc
-	dodoc CHANGELOG INSTALL README SECURITY VERSION || die
-}