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

Package-Manager: portage-2.2.0_alpha82/cvs/Linux x86_64

4 files changed, 20 insertions, 78 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/Manifest b/dev-db/phpmyadmin/Manifest
index 31996dfb5de0..b1e99bf52a9f 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX postinstall-en-3.1.txt 1159 RMD160 5a7f64946c4ded92de62b1381940fb36b400d38a SHA1 7b2060c29c85a7a8c3180a2ba19d11d971830414 SHA256 cd7b5fdb108f10112e45bd50113c1425ef71908e958d752e0e990cd98f6e436f
-DIST phpMyAdmin-3.4.5-all-languages.tar.bz2 4592593 RMD160 e3edec81945b886217a8c16a50c4364ebdbe39dc SHA1 abf66d2eb3cac8ac98622663fc11100b0fd479d3 SHA256 27917cf2d833c0c8700704c62b28a210f30682dd112e6a0b6fd2db3e6d061051
 DIST phpMyAdmin-3.4.6-all-languages.tar.bz2 4602509 RMD160 6155eda46145dc7bfdc39be490abc5bf1de56fbc SHA1 28659a49b30fd010396a952b57046beb2d65e5a2 SHA256 c5eb78779d6f4f29c0c4ee91d658f15965f2681683e8c704b76779047ba753b9
-DIST phpMyAdmin-3.4.7-all-languages.tar.bz2 4604198 RMD160 c095a357409b8c9b7dfaf2307dedd94cfb5d66dd SHA1 7fc8b9a8ae2a3fcaf7f46862b716f673d3ce2d21 SHA256 83439c01d10c93efadfc75ded9227b27ffe9f91bb017c54b91f33d87aeac0102
-EBUILD phpmyadmin-3.4.5.ebuild 1622 RMD160 ed3bc4a8bbbd565246b04ed868cb5193172168eb SHA1 4292a9d6c9eeb7262bfe93a362466592a472e9d7 SHA256 ccc670fbad1f3118e5387d71def6cd4d43b04c5e8716f1f6030189f0304dce53
+DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 RMD160 2bec1bd147af6ff00cdb999a35800b95f986a518 SHA1 4ac4f15fb305ef243b88b17e405e9d451bd56de9 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86
 EBUILD phpmyadmin-3.4.6.ebuild 1619 RMD160 879131a2754eea6496f2c9130d7aecfc5f6f44ff SHA1 6d56f4d31608235564a8119bb5e14b27b976324e SHA256 03ffbb871b4acb79725416c05c08a205a8f59c5667f754d32fcba97c44e1ea06
-EBUILD phpmyadmin-3.4.7.ebuild 1623 RMD160 0f1155c5b9210b7ba2aa2e83737f70eb7bde78f0 SHA1 25db5a430c0d7d3b845dea117dd943091d0989e3 SHA256 b85fee669a42e0e3dede7230a75b4c537cb76ea866ef1383de50db41b40c4c1f
-MISC ChangeLog 62211 RMD160 ffe6600d64d6ee1fbb82a10aad5d18e1996c9ef9 SHA1 502a2a5cff54346141be8c8b37184a2b96231de7 SHA256 ce8afe09d488a443214a37555a7c959fc8fb0591fdbad76402a1b2100f3d2781
+EBUILD phpmyadmin-3.4.9.ebuild 1706 RMD160 88979d8dd880cad1d59a19b3a4e5377ca1175dbd SHA1 7103af5b33b72697551c98cc2c066d58fb145c4c SHA256 fa1494281d264f623137fa05dca85a39fe1cb550ee5e8f20de45bd3e27a83ebd
+MISC ChangeLog 62465 RMD160 605a3092272b4ccfcb0389a149e4f90579d392ab SHA1 170bbdf5f2e374f3ca2d71bb4e7316e16a2d2f9c SHA256 aabeeba0d35135ed26ed55e2ef881ba92d507647862df7a8e2de216c49cb9624
 MISC metadata.xml 497 RMD160 eaba4b5566af47342cdcd58d660191afe16fd30a SHA1 ded49266c2f95c2b3367e6c56379fffc04410a70 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk61jgUACgkQuQc30/atMkB1tQCgrTP5C+Be05XOKtQvsHheqYDh
-jBEAnRTkXKGMHNiLZaRjFiYsB7FKyaJb
-=tvIG
+iF4EAREIAAYFAk709S4ACgkQ3Ca6Xy8+rvTzZgD+Nv9Jaz8EbzzLlCI1oVFus+3v
+Z/CHmLLvOx5SCWcsDz4A/jrD2r19RnpWvNx4mWu6PHxlhtPnhZlQ33rJW9PBbaJR
+=IiA2
 -----END PGP SIGNATURE-----
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."