Version bump to 3.5.2.2 for bugs 404991, 410965, and PMASA-2012-3/-4. Use .xz distfile and bump EAPI for that. Removing unneeded vulnerable versions.

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

4 files changed, 38 insertions, 78 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 58b8dabd2d63..98b39955b947 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.467 2012/05/07 14:36:20 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.468 2012/08/22 15:15:53 a3li Exp $
+
+*phpmyadmin-3.5.2.2 (22 Aug 2012)
+
+  22 Aug 2012; Alex Legler <a3li@gentoo.org> -phpmyadmin-3.5.0.ebuild,
+  -phpmyadmin-3.5.1.ebuild, +phpmyadmin-3.5.2.2.ebuild:
+  Version bump to 3.5.2.2 for bugs 404991, 410965, and PMASA-2012-3/-4. Use .xz
+  distfile and bump EAPI for that. Removing unneeded vulnerable versions.
 
 *phpmyadmin-3.5.1 (07 May 2012)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index ff1c461d01ed..037b3e2d7c94 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,9 +1,27 @@
-AUX postinstall-en-3.1.txt 1159 SHA256 cd7b5fdb108f10112e45bd50113c1425ef71908e958d752e0e990cd98f6e436f SHA512 4b9ae0a99f5e57f8c6f42e17d339ac1aac98fe8d5eea8682a223b2b17bf0e66dfacc1addd0dbca4390d6d10e9503872c821a029b1a18ee52dfc2b61b3d4d6f20 WHIRLPOOL 3902bdfc3fb5f95b940e5647fd7b4ae693306185f9a373748cf46353be73ef884d7a23f6552fb69af0d42d454c4f4da6cfd47912ebd338c080e2e317f1a45ccd
-DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86 SHA512 c006da6606de685403cc253b72dac5c251e0f2613e2ebe68bfaed46a4e408415f00f4f243108e36ffdc5be3f0474a7445dbc1af8f11a37057bd137601d8fe55c WHIRLPOOL f60b893be099b4da799bb3c3eee586e6c7158f7df757eb7f0397b44a762524e12b72f4b76fb92235cc766a60ac01de91a4d066ea6d0a3eb67abb45150d246475
-DIST phpMyAdmin-3.5.0-all-languages.tar.bz2 4711973 SHA256 30ec9ca34926912a459e121539a56609e984de4df610674578c1bcfa51eb9ee5 SHA512 110c687c5e4cb813c0a5a5a9b9130bcdd0f055da118c56cbd1c311d4348670d6b020ca5968ee2da4779616864ed95efccafd83aa38681445254303da5ce97781 WHIRLPOOL 8ac1fd1b4caa971188472bfbc0525697e73274d14ebcf795a43b7e959f658f18d34e660a8a33915994d4a9dcac7f1e06407b99ca7abf5a45d834d4fa631aa387
-DIST phpMyAdmin-3.5.1-all-languages.tar.bz2 4724343 SHA256 c4938855ad43c41a2c94b2f74c75a24819e01f55d800a347c8373557988b2da3 SHA512 21c219f2cab38f98b8b1994d71ba5d563d7a84d7a469807c6283844e73005baa937764ce1418e1c198a76d2c0e9acae11f7b74e7b8be8bc38a1d6c834affd4b5 WHIRLPOOL 312af8dff8115d94072cdec58fa41a23eb0bafdf29ef2bf8c79d1673b6c6ededec5c62125bee0a81209b1c176a7a3e76d6a6c32bbc8ee21d848b94201fa3e3ad
-EBUILD phpmyadmin-3.4.9.ebuild 1702 SHA256 1d5a7e455f359ecb92255662e43a2e4421cbb8cb5d10427f10e66e62c4bc5a8a SHA512 f371ac4ecc015dd5e29e6c9f6a67f7cd3766fcadbecd67b4b274bde30629b5174ddb4df10f273cb8624180fe24e208058c305f3adc8d01cd5d810bb0c485c027 WHIRLPOOL 26eedca53d281ac866dce8cceae7d246d9e82955f9bee097c4e203913a9e736ea830ae0aeb5835bdb44573e48d177154b197cd995974de94f53d1c3482ec8a10
-EBUILD phpmyadmin-3.5.0.ebuild 1667 SHA256 913d03490a64c6f1ae0a39912054249fe866ec4b81de7f8059427ea9c804849b SHA512 2359e3f95ce5f201e393904560af07561794c8bf9671e68edaa1fa372e2db6c5ca0a3e1425729987c7469347ec7f094ffbe0c89d203d0b29324f28ebc93aa7ae WHIRLPOOL 8505eb975155f78fc75962b1bdfcfaa358490e0a51ceff2c952c23d7b74f8421e183dbd3f619079047c4e2cc6a7b699945b6a869881d89644d59ac91b42110e8
-EBUILD phpmyadmin-3.5.1.ebuild 1664 SHA256 698cbffe58b8d3dbb85e4c547ac1e2f8914893aaeed62e798739e88ec39ec1a7 SHA512 5a0105e75b06a43021df4f85ff45a94889b840283e5b1d1babb40030e133efd881b2b19b88b31bb4ed6d724d25ff3ceee6cca0db7f2aa28143e5d86c948939ae WHIRLPOOL 450ea6c5306353fa9c195c0d5c5d2740cf8a66de2e23317463c51d99d82a655556f58fb53947d1e583d566c4fcfdf5c21148f2d0ed44f867f6502d21092f1502
-MISC ChangeLog 63301 SHA256 3389dddb069c58a1c40ee611f3a1e25a552a9856f7078960247ded14390cbdbc SHA512 f522b1110749a238b35bfe9f4e4387db3749e9f253d18def6e9ba09c364d32c2fcedfce9df6b1d05a91883ebb994ddfdb9a14b9e1365e6d4447827a19efd26f2 WHIRLPOOL 4d8034b56c79911c7abaf938440270f7549687058c4dbf64639873a9c56159fdb5540cab3b8b782c32fa3f5cc44a229a2c4fb13f4a938953012c6fb43115af0a
-MISC metadata.xml 497 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a SHA512 2a03834ac7f170aebaaf2fa0e4335b7062fa6e4d4c0fbd728bd9b63c5e948c65a3534b503b0648648fc5b1ff92dcfee505b984ad36f2ce20b9c3d3b249beb117 WHIRLPOOL c32e6a014145a5320b34f8fba3bd1884b62abc0b7f2b4dda18ce5adc71cfa2d42290cd65da4cbef5e1fdbd92716e88fe86832a159c2b1d32140e13050d50e862
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX postinstall-en-3.1.txt 1159 RMD160 5a7f64946c4ded92de62b1381940fb36b400d38a SHA1 7b2060c29c85a7a8c3180a2ba19d11d971830414 SHA256 cd7b5fdb108f10112e45bd50113c1425ef71908e958d752e0e990cd98f6e436f
+DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 RMD160 2bec1bd147af6ff00cdb999a35800b95f986a518 SHA1 4ac4f15fb305ef243b88b17e405e9d451bd56de9 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86
+DIST phpMyAdmin-3.5.2.2-all-languages.tar.xz 3654332 RMD160 26e247336fa2876c939afa0fa842cc67ee7c38f3 SHA1 0772385c8133e7b0becaa6c81df7f76bdb9d3bf2 SHA256 d02de081c522d3026f4a8418538f7ff05adf280afa404851a5f7f4ef895b4a7d
+EBUILD phpmyadmin-3.4.9.ebuild 1702 RMD160 1b7d0357cf1a2fdded3efda6d50aae9cfdd91e12 SHA1 2cd959ef3cc2b256f8b18ceb6701bfa3bdb68797 SHA256 1d5a7e455f359ecb92255662e43a2e4421cbb8cb5d10427f10e66e62c4bc5a8a
+EBUILD phpmyadmin-3.5.2.2.ebuild 1665 RMD160 d06eb9e0a4a9ebee9a18141f9964d845d9d4fa62 SHA1 766248933e110604085b7436dd0098ff673b348b SHA256 e3558a67ccf742a4cd19a3ab4453d2452f737e3aa0b12eb7d814dd4ef54c613f
+MISC ChangeLog 63618 RMD160 5e4c220dc4c0ed0a8f9b5706f137f2384bd62e37 SHA1 005cfe94d06547d8c9da89638e85bfa9d090223d SHA256 742697ca5163c48f7022c6ed4f0d10ce06d67d56c93c37202553caa85586d55e
+MISC metadata.xml 497 RMD160 eaba4b5566af47342cdcd58d660191afe16fd30a SHA1 ded49266c2f95c2b3367e6c56379fffc04410a70 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQNPeyAAoJEIce3keOdAI4+NYP/jxfx5NE/gGa8h6L9D1ZG2SU
+aLuti6AHXHdGGK3/IQdaOihN80YMerAFmpTgBc7IbDhG3NsLuBaj5uUsled+gO3+
+bEYSxLMezFkfCDteYSPaKfKksfSrU/5PQyMW1qxEN2DQnN5M3iDxQ1MTK8ImdFcw
+OkzLe2n5VAOHfsWHGq7xUyheZJ/o3QT4CKZUnOQz1/Q4nD5nASECuUwOuASXudPu
+RdEq/ozK0afX4p7cf6acGEv8NJlp4JaCsHiE/qlQz/9np+bGunTpa3l0pMENN1Kq
+stQbZicAH0fH6YiNyriXlrUTfiNso7pJ8Sp0Lt6XOEhLVsDSlvjIYXDKCZ5sP3CW
+J4rLaSFUMUXpZlZtmQ+1Bf/YW+fLUTbhPRVEHCwGmTXoaHpTtGS+euSOnXoKq6Qd
+mKNUqFFPMpM8e79vWr2tcbrnIZd/nydI7PiijYk4xa7pI33mMGou1D3zBMTTD1Gs
+hjfj84z0qspYjsYHhDfSrV+lREz22D4LqpfLTegM0k6uEmy6ZAYezgxpG+dPlgOG
+aAxye6WIrKQRaEm1X7t6OwPCbuoPH++ihkENyJ1limPoyylUCTdjIpf6za3ldJbA
+R1k5FEq+LzSGAXBdSY4w+IRD/TgfuYlj9NgeRPl7EF9QD+Bp2iatGv50LoytxXqU
+SvCgUuU8Gfrv+F1t+oyo
+=PoMW
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild
deleted file mode 100644
index e928f3fc3f43..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild,v 1.1 2012/04/09 23:50:00 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		<dev-lang/php-5.3[spl,pcre]
-		>=dev-lang/php-5.3
-	)
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc Documentation.txt README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild
index 1a8e1ee3dfa6..25d64e920199 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild,v 1.1 2012/05/07 14:36:20 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild,v 1.1 2012/08/22 15:15:53 a3li Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils webapp depend.php
 
@@ -11,7 +11,7 @@ MY_P="phpMyAdmin-${MY_PV}-all-languages"
 
 DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"