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.
(Portage version: 2.1.4.4)

3 files changed, 10 insertions, 66 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/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