Added phpmyadmin-2.11.9.2 in response to sec issue #238592. Removed

phpmyadmin-2.11.8, -2.11.8.1 as they are vulnerable to #237781.
Package-Manager: portage-2.1.4.4

4 files changed, 17 insertions, 75 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 428b6855d758..c1dfd3c6e2bd 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.331 2008/09/23 18:57:42 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.332 2008/09/29 07:58:56 wrobel Exp $
+
+*phpmyadmin-2.11.9.2 (29 Sep 2008)
+
+  29 Sep 2008; wrobel@gentoo.org -phpmyadmin-2.11.8.ebuild,
+  -phpmyadmin-2.11.8.1.ebuild, +phpmyadmin-2.11.9.2.ebuild:
+  Added phpmyadmin-2.11.9.2 in response to sec issue #238592. Removed
+  phpmyadmin-2.11.8, -2.11.8.1 as they are vulnerable to #237781.
 
   23 Sep 2008; Tobias Heinlein <keytoaster@gentoo.org>
   phpmyadmin-2.11.9.1.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index cd64190088ec..e1f1152baa2e 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.8-all-languages-utf-8-only.tar.bz2 2240917 RMD160 a339f55ac2ae8b4b28100fd156dde190eba3be3e SHA1 0051bb833e1f5951d297b2de562b6ce55de505b2 SHA256 f554fd5d4f57283514aec401ce621d96687f39fef2ce53984d93dbaca35c6d70
-DIST phpMyAdmin-2.11.8.1-all-languages-utf-8-only.tar.bz2 2242072 RMD160 91de205ef104bdbcab23ad0d31baa3bc9815443a SHA1 7158f0e7fa6378ba67101f2ac5dcec75e78a3241 SHA256 e934f0bbbca6c7ad19d8bc12502201840aa434e1370e370b019b5484d2701466
 DIST phpMyAdmin-2.11.9.1-all-languages-utf-8-only.tar.bz2 2243316 RMD160 a655bd9062b0fdc565f00b92d5b4cb53cc3acca1 SHA1 81b829f2ccfd3ee697a2c169e3f78cd98ec45b81 SHA256 b1c58cb3bd0de8f10377d07512c2b810c83b031e08e0586b418d04523d8fffc3
-EBUILD phpmyadmin-2.11.8.1.ebuild 1743 RMD160 a9c5baf9d377274746bcbeb45340e7814ab696a1 SHA1 1c925945e0e0c9238a06f5bfcadd9fd1ca598426 SHA256 3b1dc195a0ecbd21b13916150ad675e3fd59e704b76926fbc78f13a1adcb823f
-EBUILD phpmyadmin-2.11.8.ebuild 1735 RMD160 726c0ca8f48610985a48b66b06ea3e1ea090a075 SHA1 779de7f9106d38a0ab0a065f4a62a139bada9ce3 SHA256 a4864d40305e350a049f25356a5ad7a903b8d503c4c6b0e6d19024dc5a36aef2
+DIST phpMyAdmin-2.11.9.2-all-languages-utf-8-only.tar.bz2 2243302 RMD160 d684d9bfe2f26d583104ddaefc92455d9053ef97 SHA1 967a346c2981cc883373c2ddc9a70cf05f57b1a6 SHA256 cc0415b691faa7d264f88c0f99fd0469e7cfd7ec0420d53c339d5f93abf6b09a
 EBUILD phpmyadmin-2.11.9.1.ebuild 1741 RMD160 7b25e9247b60172bed2259e04e1d2f9ada8ac6cd SHA1 a5fb01d0d77ad7d0be437bd901c0e5f3d7a17be7 SHA256 ca2abf28e1030f7b749adcc5f2aa82306ae565143300bd3d5f677a54a296519f
-MISC ChangeLog 44827 RMD160 d0a4f5174a0d6f2c78a0f3147564ff323d4070d3 SHA1 96faa2c356ba1beb9f6651cb658cd309e47edc7b SHA256 e60c2862f8ab56d97e9769269ac7d1b74c4fec0342d23e93812413969113eb97
+EBUILD phpmyadmin-2.11.9.2.ebuild 1744 RMD160 83c28d6bb4cb7665a954b7bc919988cf91b1ce73 SHA1 069b367ee3b09c666dfadf21f2076aa163683919 SHA256 3a063cfaa4a9f16cc3907067899fc1208d2b112ce7bc501aa7d7331196c38d5d
+MISC ChangeLog 45116 RMD160 ad28b1460e70b1ffec0848d354cb29da357f70b7 SHA1 3d8b17159ae2eb4b2d66bf5b3314ab2ab0ca3c7b SHA256 1c7ae6e17a02482590921468dcd48968b64bab9dc7694f105f96b66e76664deb
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkjZPC8ACgkQt3UOBHx+2m9NVACglucFmdVqcC20MW7+E4w18woK
-+98AoJnkp9IgpjoxrRYynuIVQ9m2hhDH
-=kkT/
+iD8DBQFI4IrKEEcxCpcDQ74RAnJrAJ9Cm66FKW8NUnr27Iymklfpm55uMgCfaL99
+IIfeiM+c4SCcX/r84ok/05Y=
+=PGIS
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.8.ebuild
deleted file mode 100644
index 2f5505302cf3..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.8.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.8.ebuild,v 1.7 2008/08/09 21:30:41 hoffie 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-2.11.8.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.ebuild
index 226244b0ee91..29e9763a1016 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.8.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.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-2.11.8.1.ebuild,v 1.2 2008/09/15 21:48:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.2.ebuild,v 1.1 2008/09/29 07:58:56 wrobel Exp $
 
 inherit eutils webapp depend.php
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 need_httpd_cgi