Removed vulnerable dev-db/phpmyadmin-{2.11.9.2,3.0.1}, added

dev-db/phpmyadmin-3.0.1.1 (sec issues #244914, #246831).
Package-Manager: portage-2.1.4.5

4 files changed, 16 insertions, 73 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 3ddf8b886139..96733477f0d0 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.347 2008/11/15 08:34:20 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.348 2008/11/17 04:46:02 wrobel Exp $
+
+*phpmyadmin-3.0.1.1 (17 Nov 2008)
+
+  17 Nov 2008; Gunnar Wrobel <wrobel@gentoo.org>
+  -phpmyadmin-2.11.9.2.ebuild, -phpmyadmin-3.0.1.ebuild,
+  +phpmyadmin-3.0.1.1.ebuild:
+  Removed vulnerable dev-db/phpmyadmin-{2.11.9.2,3.0.1}, added
+  dev-db/phpmyadmin-3.0.1.1 (sec issues #244914, #246831).
 
 *phpmyadmin-3.0.1 (15 Nov 2008)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index a12a3ada3b9a..9e190cb6ff14 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX phpmyadmin-2.11.5-custom-cert.patch 1000 RMD160 e8ae7f29c5958e8626c91bf626008ec79c77ae8c SHA1 90f8e5d61a0620a6855a47097124e0b9adca5e0f SHA256 68eda0cf9dc0bdd90f59f334842483906e8330400e314c40ddbad2f7f97981c6
 AUX postinstall-en-2.8.0.txt 1117 RMD160 09838ab10f2f2cc44ca6154d182ddb573905f12c SHA1 c0c08a1ca71c54a1c900221a5bfd1fd12ecbb04a SHA256 b353e94a59c71131bc617f2e2c2b8d659c67d9277c86d20545da6b26bb08d12d
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
-DIST phpMyAdmin-2.11.9.2-all-languages-utf-8-only.tar.bz2 2243302 RMD160 d684d9bfe2f26d583104ddaefc92455d9053ef97 SHA1 967a346c2981cc883373c2ddc9a70cf05f57b1a6 SHA256 cc0415b691faa7d264f88c0f99fd0469e7cfd7ec0420d53c339d5f93abf6b09a
 DIST phpMyAdmin-2.11.9.3-all-languages-utf-8-only.tar.bz2 2243495 RMD160 5e030f3ae0ef112f3cf9da7f4d3c51a8a8199f2f SHA1 181a7a942b345e51a41567b22388e9690b3907ef SHA256 bb272272c242caa8dc8fe806d25cf3d616b76d62368dec02c002c9572566bdde
-DIST phpMyAdmin-3.0.1-all-languages.tar.bz2 2413564 RMD160 576207eea34c92b90c077e6d685a1ce645930300 SHA1 9d2848226fa2a2d20355561421b8569eca4b23de SHA256 bb9bc74c7a2201466cbc42e33ca24b2ec818e941333cd966e6320acbc268b78e
-EBUILD phpmyadmin-2.11.9.2.ebuild 1741 RMD160 29f18cc4d88589ba2d7f1d68412a0f5a496b5e60 SHA1 bbbe8263d3d6654dac9525d982d33c0734c23d21 SHA256 3385d4ad8aa0a1cc33e51eda9c31389c47c8075a1db87e58ed5a2d8dadbaf30f
+DIST phpMyAdmin-3.0.1.1-all-languages.tar.bz2 2415698 RMD160 65dbcbe02f09fa3a0c73f42489ac71f100091d82 SHA1 5dce6977e2fe77fcb32fdd457823377e85ec0732 SHA256 cbb7736a687913e84eb17b2cd199c64fd47d14fff80855391852d66772d8bf80
 EBUILD phpmyadmin-2.11.9.3.ebuild 1744 RMD160 b88d54615eff7c3c605216045d639bec36d96ef4 SHA1 cfe36cc04b0db3a94ec1965df9ed4eb704571630 SHA256 be9bf450dc0982807290f1c989f4fe1485d3b20b8dbcb953975c40dfdfee7a2b
-EBUILD phpmyadmin-3.0.1.ebuild 1635 RMD160 40d3c50ef2086f26f7f0ccb408036fafedb54a57 SHA1 8dd09dbcf7d314f895de86c1e79855e670badc2c SHA256 8cc8b4142636c96c13f37fc9c28b0bcefdbc61d48ebdf5faf9af297434d4b7df
-MISC ChangeLog 46983 RMD160 c0fe1210c9d580d9bd905cfd837c73ad217d1203 SHA1 3c9e1bd4b9a406396cb0cbc53b78929ac5d5a987 SHA256 daeed00961ca05ecd3051bedeb8d2e59e773b31e8ceccb3c0e597b7580861708
+EBUILD phpmyadmin-3.0.1.1.ebuild 1637 RMD160 468f83ee8fddbcebf0ae514de4b942ef306d04a5 SHA1 cf669a7b07981f6fc5c7aa047bff90217bea9e37 SHA256 d7581e3c88f864e69d4b8097236a469b29d761d6092842f449fdf5be47329137
+MISC ChangeLog 47277 RMD160 37fed496d827f5d39c233ec650b30bba145ded5e SHA1 e91d5230f3899653593130c1d8b8dcbc983c65f0 SHA256 8eab6a8f877c024e8ddd19d8940aa9f7e79018168fbd7c42e436420ab5260618
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkeicEACgkQEEcxCpcDQ75thwCdFwWZ0Bo2PUUH0vBmYSX1BaHH
-Yp0An3i5SXRFPvqFPNBq1pGGU23LhRws
-=FOlu
+iEYEARECAAYFAkkg9yIACgkQEEcxCpcDQ766jACfcL1IEERCt2SbEQsWG2uonzyw
+ODoAnjyEcRyS0z8MaQzInxFInAcBV6lM
+=ptj/
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.ebuild
deleted file mode 100644
index f48a4be9b714..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.ebuild,v 1.6 2008/10/01 17:53:17 dertobi123 Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-
-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 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session unicode \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "ctype pcre session unicode"
-		eerror
-		eerror "as well as any of the following USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.11.5-custom-cert.patch
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
-	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
-	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-2.8.0.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.0.1.1.ebuild
index 2aaee214684e..7534e21ba9c7 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.0.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.0.1.ebuild,v 1.1 2008/11/15 08:34:20 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.0.1.1.ebuild,v 1.1 2008/11/17 04:46:02 wrobel Exp $
 
 inherit eutils webapp depend.php