Version bump for security bugs 389427 and 395715. Removing unnneeded and vulnerable versions.

(Portage version: 2.2.0_alpha82/cvs/Linux x86_64)

3 files changed, 12 insertions, 68 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index bb1365c75713..9e82b94e8e06 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.459 2011/11/05 19:26:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.460 2011/12/23 21:39:50 a3li Exp $
+
+*phpmyadmin-3.4.9 (23 Dec 2011)
+
+  23 Dec 2011; Alex Legler <a3li@gentoo.org> -phpmyadmin-3.4.5.ebuild,
+  -phpmyadmin-3.4.7.ebuild, +phpmyadmin-3.4.9.ebuild:
+  Version bump for security bugs 389427 and 395715. Removing unnneeded and
+  vulnerable versions.
 
   05 Nov 2011; Raúl Porcel <armin76@gentoo.org> phpmyadmin-3.4.6.ebuild:
   alpha/sparc stable wrt #387413
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.4.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.4.5.ebuild
deleted file mode 100644
index dfda8770e606..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.4.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.4.5.ebuild,v 1.6 2011/09/27 18:20:00 xarthisius 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 CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog || die
-	rm -f LICENSE CREDITS INSTALL README* RELEASE-DATE-${MY_PV} TODO
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpmyadmin setup utility has been removed."
-	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.4.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.4.9.ebuild
index b71838472eb5..6be5c923d910 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.4.7.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.4.7.ebuild,v 1.1 2011/11/02 18:56:06 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.4.9.ebuild,v 1.1 2011/12/23 21:39:50 a3li Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ 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"
+IUSE="setup"
 
 RDEPEND="
 	dev-lang/php[crypt,ctype,filter,json,session,unicode]
@@ -46,7 +46,8 @@ src_install() {
 
 	if ! use setup; then
 		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpmyadmin setup utility has been removed."
+		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."