Bumped to 2.11.8 in response to sec issue #232007. Removed some vulnerable

versions.
(Portage version: 2.1.4.4)

6 files changed, 11 insertions, 252 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 64eac46201c0..1a337b4ae0fd 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.315 2008/07/05 10:30:33 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.316 2008/07/31 20:52:33 wrobel Exp $
+
+*phpmyadmin-2.11.8 (31 Jul 2008)
+
+  31 Jul 2008; wrobel@gentoo.org -phpmyadmin-2.11.5.ebuild,
+  -phpmyadmin-2.11.5-r1.ebuild, -phpmyadmin-2.11.5.1.ebuild,
+  -phpmyadmin-2.11.5.2.ebuild, -phpmyadmin-2.11.6.ebuild,
+  +phpmyadmin-2.11.8.ebuild:
+  Bumped to 2.11.8 in response to sec issue #232007. Removed some vulnerable
+  versions.
 
   05 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   phpmyadmin-2.11.7.ebuild:
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.5-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.5-r1.ebuild
deleted file mode 100644
index f9c999ecd9f6..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.5-r1.ebuild
+++ /dev/null
@@ -1,64 +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.5-r1.ebuild,v 1.1 2008/03/06 15:40:21 hollow 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 "mysql if using dev-lang/php-4"
-		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.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.5.1.ebuild
deleted file mode 100644
index edf97d20a106..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.5.1.ebuild
+++ /dev/null
@@ -1,64 +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.5.1.ebuild,v 1.6 2008/04/07 20:19:56 armin76 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 "mysql if using dev-lang/php-4"
-		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.5.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.5.2.ebuild
deleted file mode 100644
index bcfb7ddb615d..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.5.2.ebuild
+++ /dev/null
@@ -1,64 +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.5.2.ebuild,v 1.6 2008/04/28 17:03:16 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 "mysql if using dev-lang/php-4"
-		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.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.5.ebuild
deleted file mode 100644
index a2928fd18e69..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.5.ebuild
+++ /dev/null
@@ -1,58 +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.5.ebuild,v 1.7 2008/03/04 20:54:56 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 "mysql if using dev-lang/php-4"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-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.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.8.ebuild
index bc2c53917626..f2b789435b95 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.8.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.6.ebuild,v 1.1 2008/05/02 20:02:43 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.8.ebuild,v 1.1 2008/07/31 20:52:33 wrobel Exp $
 
 inherit eutils webapp depend.php