Cleanup for security bug #514892 as requested by proxy maintainer

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xFC3B17DE05E136A0!)

2 files changed, 4 insertions, 78 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/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
-}