Drop old, fix infinity loop sourcing shell=sh (thanks Kamil Kuduk, bug 446312), prefix support (thanks Leho Kraav, bug 465226), fix security issue (bug 467262).

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 59 insertions, 15 deletions

diff --git a/app-shells/autojump/ChangeLog b/app-shells/autojump/ChangeLog
index 50106f552d82..07bd29f007a8 100644
--- a/app-shells/autojump/ChangeLog
+++ b/app-shells/autojump/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/autojump
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/ChangeLog,v 1.10 2013/05/04 10:07:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/ChangeLog,v 1.11 2013/05/04 10:43:19 xmw Exp $
+
+*autojump-21.3.0-r1 (04 May 2013)
+
+  04 May 2013; Michael Weber <xmw@gentoo.org> +autojump-21.3.0-r1.ebuild,
+  +files/autojump-21.3.0-supported-shells.patch, -autojump-21.3.0.ebuild:
+  Drop old, fix infinity loop sourcing shell=sh (thanks Kamil Kuduk, bug
+  446312), prefix support (thanks Leho Kraav, bug 465226), fix security issue
+  (bug 467262).
 
   04 May 2013; Michael Weber <xmw@gentoo.org> -autojump-20.9.ebuild,
   -autojump-21.1.0.ebuild, -autojump-21.1.2.ebuild, -autojump-21.2.1.ebuild:
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index 5e40f86e5427..5d3f3acc981c 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX autojump-21.3.0-supported-shells.patch 1055 SHA256 2a809db16b7403b414167a630e1343451b32530f120ba321cf4043fdbb9a6b35 SHA512 310e0737b8894d85ee74cbeb6b09830551d90621a047ab50be48610b9f496cbe961751d85b4ced8cc3156180309721a4a211abc1a59f1cb18713cef2191b22b7 WHIRLPOOL a2cd3a1c486879619fc0ca37dfbdb8faa0523af0c01b96a5ac6bdf9c7ee97acc224a7a4078fcae33814930ce532c9735ae977875ef8c7977ba29d768f451f831
 DIST autojump-21.3.0.tar.gz 51261 SHA256 217398c3135647f223356e055a1b84adb470385584d743baf7fe4d519fd78252 SHA512 b0b0292a08d01005f09581c58bff2bf9b4b860b53602c0777bab7ef5a5b301993fe2bfef154bedadc75407bcc41e8de4a6f01d5b70e2e1be6b4ae6a6162d5196 WHIRLPOOL a218cde9345077af5c365b3e8eaff994606a0c29f2c8f3c6772b043e68decdc915bd353efc20c61f6de974d59c617c8a9b292fc465823b818882ac68f438869c
-EBUILD autojump-21.3.0.ebuild 1542 SHA256 018715541a08044effbda10ba826eaf91dd0dccb61b61957180ecee952de3c09 SHA512 65a65d9f242372929fe105fecb48bb942e12e3dafefe716a5a1fd79ee721adba05121abb2c2d9cfe14a169b9abe91f0f760d8059f3e35eacef4a64352ea9b044 WHIRLPOOL c05c559766021f35f00073eb76c6a35d81bb5963472c307e4849fb28002b2704177fa4b7451620f5468ed6c840824e8725ae0b0970962305ab12dd1d70fcb6fc
-MISC ChangeLog 1669 SHA256 7f5a3f97ec5d7dc2ac0451f711811edf9b04daa0df500c94f5e24fcef4df3dc3 SHA512 76da635b662c9cc5b227287591c58f0614a10a05a984da9fee02d92c7dba074eaed1aa923b2cef0548e7e915442b8c7ff6fcc3c84ca64b6db4b6f825a442bff2 WHIRLPOOL cbe1768178d6c808aad10450b389185390de9e77d7d6f69e96db00e658291ee540a7e63d66203da5a15b451b44af3b2180b688ed80d6299692b6bee20b31ae59
+EBUILD autojump-21.3.0-r1.ebuild 1607 SHA256 dd440d3e3163b105d28f55eb79a07b721624f9a92c7494470c0001e6e9735923 SHA512 27e87970bc2dd61eca2a81c02d984dd5d30b9ef4efc9ee62097e2d59c2e3b1da0391434b6588263008ff2a572ea8ef6c28a11713631a2bec89abe321722359c0 WHIRLPOOL 93fa5bd4874e65965b6f3e6a641546091c0078dbe7006d6a3637ec5e56268d0d7e34aa529e37aa0b73cbf5a9c68b6673d5ec6a0eabe3cd051e5a5bab84c06ac3
+MISC ChangeLog 2020 SHA256 beb13fcc47e37126a1d4b77ddf15729a0536741f016650e5af2d25b4f0fc5524 SHA512 bce2edf39f4f7f4be9f3f0ca7cf47d8ff8e64e9fabde6aa5ede3f8c5c4bb5df60473765f7f78f445977a5ac93313e46fe8f46ffd5baa3a73b33129a67771b70d WHIRLPOOL 3365fdd617a3e48db553a77d6fa40cb9b0573209307603524efe0a78b553d10d6358d09ae41b613e0b190ee7d7f15b1157458bf8399b107cb2942b3fb844a38f
 MISC metadata.xml 316 SHA256 fb923acdedce47cb9d3d1e05f7216eb9a109f484331c668f08445f20ad1e2a29 SHA512 300d9416e057f8a34d612460f94ebf15567d58dcc8b2164433fd5246810f4d57f636c40452e768de48ee453d6ee866c00d9c81fd6e531be4fe9e364ed641e9d7 WHIRLPOOL 5fbe72012fa9693517dbbec772d8558cf15ba76c0f670337d9c3cf5d348afe01cfde6ad7ca96bccbd6271dcf93c4bb128ca85029d0ef2354a978dfc00ec7459b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGE3fIACgkQknrdDGLu8JCvYgD+MOfIFi9R0bicf4wdSYOG2U2p
-ggtPDPDwCuk8Lgo6LV0A/3C7EJsS3bXRrFjaCNr5tA1lPglAWQftg5NQAeTW+7of
-=FtOo
+iF4EAREIAAYFAlGE5pIACgkQknrdDGLu8JDPogD9FBM0GLAwxFvZqpUc7kj8uIJ5
+c8pvVT+JAt/xUyyw4SYA+gKGXW8A6vtRJwRefJrsfyUZfu/KTwvP+yeZ01Q6hmXe
+=Ena8
 -----END PGP SIGNATURE-----
diff --git a/app-shells/autojump/autojump-21.3.0.ebuild b/app-shells/autojump/autojump-21.3.0-r1.ebuild
index ae0173170697..eae2567bf342 100644
--- a/app-shells/autojump/autojump-21.3.0.ebuild
+++ b/app-shells/autojump/autojump-21.3.0-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.3.0.ebuild,v 1.1 2013/01/09 09:06:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.3.0-r1.ebuild,v 1.1 2013/05/04 10:43:19 xmw Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-inherit python vcs-snapshot
+inherit eutils python-r1 vcs-snapshot
 
 DESCRIPTION="change directory command that learns"
 HOMEPAGE="http://github.com/joelthelion/autojump"
@@ -19,13 +18,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion python test zsh-completion"
 
 RDEPEND="bash-completion? ( >=app-shells/bash-4 )
+	python? ( ${PYTHON_DEPS} )
 	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
-DEPEND="test? ( dev-lang/python )"
+DEPEND="test? ( ${PYTHON_DEPS} )"
 
 src_prepare() {
-	#https://github.com/joelthelion/autojump/issues/129
-	sed -e '/def test_db_load_migrate/,/autojump.CONFIG_DIR = ORIG_CONFIG_DIR/d' \
-		-i tests/runtests.py || die
+	epatch "${FILESDIR}"/${P}-supported-shells.patch
 }
 
 src_compile() {
@@ -61,4 +59,7 @@ src_install() {
 
 	doman docs/${PN}.1
 	dodoc README.md
+
+	elog "loading of insecure relative path \"custom_install\" has been"
+	elog "remove. See ${EPREFIX}/etc/profile.d/${PN}.sh for details."
 }
diff --git a/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch b/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch
new file mode 100644
index 000000000000..a16fc2d4dcf2
--- /dev/null
+++ b/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch
@@ -0,0 +1,34 @@
+--- autojump-21.3.0/bin/autojump.sh
++++ autojump-21.3.0/bin/autojump.sh
+@@ -1,17 +1,17 @@
+ # source autojump on BASH or ZSH depending on the shell
+ 
+ shell=`echo ${SHELL} | awk -F/ '{ print $NF }'`
+-
+-# check local install
+-if [ -s ~/.autojump/etc/profile.d/autojump.${shell} ]; then
+-	source ~/.autojump/etc/profile.d/autojump.${shell}
+-
+-# check global install
+-elif [ -s /etc/profile.d/autojump.${shell} ]; then
+-	source /etc/profile.d/autojump.${shell}
+-
+-# check custom install locations (modified by Homebrew or using --destdir option)
+-elif [ -s custom_install/autojump.${shell} ]; then
+-	source custom_install/autojump.${shell}
+-
+-fi
++case ${shell} in
++	bash|zsh)
++		# check local install
++		if [ -s ~/.autojump/etc/profile.d/autojump.${shell} ]; then
++			source ~/.autojump/etc/profile.d/autojump.${shell}
++		# check global install
++		elif [ -s "${EPREFIX}"/etc/profile.d/autojump.${shell} ]; then
++			source "${EPREFIX}"/etc/profile.d/autojump.${shell}
++		fi
++		;;
++	*)
++		echo "Your shell ${shell} (from SHELL=${SHELL}) is unkown."
++		;;
++esac