Version bump for security bug 302745.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 17 insertions, 196 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index d048caa46988..87f6f04118b9 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.388 2010/07/18 20:24:58 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.389 2010/08/21 00:18:15 a3li Exp $
+
+*phpmyadmin-3.3.5.1 (21 Aug 2010)
+
+  21 Aug 2010; Alex Legler <a3li@gentoo.org> -phpmyadmin-2.11.9.5.ebuild,
+  -phpmyadmin-2.11.9.6.ebuild, -phpmyadmin-3.2.2.1.ebuild,
+  -phpmyadmin-3.3.2.ebuild, +phpmyadmin-3.3.5.1.ebuild:
+  Version bump for security bug 302745.
 
   18 Jul 2010; Joseph Jezak <josejx@gentoo.org> phpmyadmin-2.11.10.ebuild:
   Marked ppc/ppc64 stable for bug #303761.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 6cc56f7722ed..20285b1b2e16 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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 postinstall-en-3.1.txt 1106 RMD160 75302bc9009db38cd7564feb5f48a776ab6457e8 SHA1 fab327c0a7212c85e283632a83d3899aa4388f2c SHA256 80296f8df3e1c7740f205bd876c841dd5712a262c4d903034f5db6fb8f26448a
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
 DIST phpMyAdmin-2.11.10-all-languages-utf-8-only.tar.bz2 2224872 RMD160 1f52f8f5e940a4eb38cf85176b3af04ece7f3235 SHA1 d292ee95ce552648250fef46e6d9a6ffa4d176ae SHA256 3c9c34fbf6728bbbc189284713e896ab2f7b3e87d648fd80cca5c1b97a6881e6
-DIST phpMyAdmin-2.11.9.5-all-languages-utf-8-only.tar.bz2 2243708 RMD160 10e64ed0dde29272aee98997d99b486e8619fed2 SHA1 fbe83d0969b998f04809b41f4e33d717f93b3967 SHA256 9779e82d003da0e5e3a3875d0bf1a31ffb2f57bbd99230ae4ab91ad080b3daa3
-DIST phpMyAdmin-2.11.9.6-all-languages-utf-8-only.tar.bz2 2223389 RMD160 09b28c9d35f3303d5764edd1045a8cf4bac2dca0 SHA1 c5f8967054bd6155f9282bff2cf7f2a558c17267 SHA256 d044bd0184b96d215eae2c34f0d51337a96889e72fbb0f54d58c66184091694e
-DIST phpMyAdmin-3.2.2.1-all-languages.tar.bz2 2741815 RMD160 5771f205d5ab8683cc81a961f8d587defe546f55 SHA1 71bdc795147b54c219f87fa63e7430779cef786b SHA256 35137e126e0d21089ae50e926a0bad363acb2ce1271fea34a94f143e4cb677dd
-DIST phpMyAdmin-3.3.2-all-languages.tar.bz2 3610176 RMD160 8a66e9f67e7cf911247da8abdea3aaad24763e13 SHA1 0aad4295b5bea65ae4183b430cce7f52d2481860 SHA256 a0edcda9640c8d3388abe69c2813cba199b782d73fed239f4dc8b15fbf8f214e
+DIST phpMyAdmin-3.3.5.1-all-languages.tar.bz2 3668516 RMD160 c0306469cab98205c0cd799238acd76db562aa82 SHA1 5f476c35168fe12bb8d043413fb5519bd842a13a SHA256 5dafaad4489fdeb8f0339b39cf8b4500cea813e54c5eda05cd4ab4b572fed9f8
 EBUILD phpmyadmin-2.11.10.ebuild 1748 RMD160 28be2ccb86c37c6d88df5bf7f7b65210d83ec955 SHA1 e5ada46d4b9f9eb72e880aab2499cabcb9bacf89 SHA256 3f902195dd97cb406a5ea1444e7517a28b672fb136a7de05ad0c46a136e39ce3
-EBUILD phpmyadmin-2.11.9.5.ebuild 1750 RMD160 cc9a4e6da07836e6bf79ed4e7ccdb3a08bf4316b SHA1 98991a15306f591e1da9075d095f7a33f1cb4fc2 SHA256 0733d7e75d9129df05846cf0e796d07bcb5cbc56b9d4581a768f0142fa6ef1f3
-EBUILD phpmyadmin-2.11.9.6.ebuild 1749 RMD160 ed063612ec6ae6f00ff405c186179fcc07866d8b SHA1 372b3f464c0401fdce0cb937bc504be108fb3bf1 SHA256 e5a68c59101f44d4638dbabc579f9743082e7755164d6d69eeb9b3edc1afef64
-EBUILD phpmyadmin-3.2.2.1.ebuild 1325 RMD160 eb456544541af79a8e512491180ab5633fa2cfc9 SHA1 a2a62bede4e8e21be5d74d92ec0126473fa9b459 SHA256 9d326fe5a29d243d9d7efe38479f3f6e560c1de09bc27365405d6c1271cbe2f0
-EBUILD phpmyadmin-3.3.2.ebuild 1373 RMD160 facaaa08b0c6f08e81dd6b4708a31826a259a923 SHA1 976c6b6a11a43ea4e02f21ba3b2ed0450971e08b SHA256 98c5b3ec5ffe399ab144d6b2dc34da7db537809644f269d0dd9db367bd51449e
-MISC ChangeLog 52765 RMD160 7e5c11feff78ff7f554956b28b6c827dea1fbbeb SHA1 15a786a12ebdebd6564353f047b9b59d128d7870 SHA256 348e84617fa841dd146b9e0bcbcdebc6ba18cd59ec1a95feec50973e5d1fc78d
+EBUILD phpmyadmin-3.3.5.1.ebuild 1345 RMD160 a206b7ca513eeb3c2cc2fd12fb0f84993877913c SHA1 b572d0408090c7ffa24f876565b48b60aa9db97f SHA256 d73efad364f795c9c606b488cb1598071b8ec5d05f882fd8ab7457b12e6635ea
+MISC ChangeLog 53028 RMD160 6e455238b8b33e05c7df9f3b11673d6569c20a40 SHA1 f45baa4749638d371ed8ed2555f5cb807d90882a SHA256 8975c97ed5a297f3e17f7e3a2c301bb907c64966bdace78ded2a1713a360692f
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxDYx0ACgkQcsIHjyDViGTY0QCfUwqFyKx5dFqAExeezQo0Vbxf
-yMEAn0VaJhPGL3vf8t4H8Adan5OK22zf
-=qYr/
+iF4EAREIAAYFAkxvG04ACgkQ3Ca6Xy8+rvT1CQD/UhK9hVAkiCE5Zo5z+5X5xUoZ
+OuHWslW+63CRiOtDLgUA/16bMY+FTmyzBwwkc7uoZu6CN0hTUdfHblU7n1umOiPT
+=CbF/
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild
deleted file mode 100644
index 5aa605cf16b5..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild,v 1.9 2009/11/03 17:26:43 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 ~ia64 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 "crypt 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.9.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
deleted file mode 100644
index b9960c56d80a..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild,v 1.9 2009/11/21 18:56:02 nixnut 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 ~ia64 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 "crypt 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-3.2.2.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
deleted file mode 100644
index 64776c80098e..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild,v 1.3 2009/11/21 18:56:02 nixnut 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=""
-
-RDEPEND=">=virtual/mysql-5.0"
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,pcre,session,spl,unicode]
-	|| (
-		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
-
-	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_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.3.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild
index e18cb2828c2f..a9b5a639ecc2 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.3.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.3.2.ebuild,v 1.1 2010/04/30 21:41:43 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild,v 1.1 2010/08/21 00:18:15 a3li Exp $
 
 EAPI="2"
 
@@ -17,7 +17,6 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=virtual/mysql-5.0"
 RDEPEND="
 	dev-lang/php[crypt,ctype,filter,session,unicode]
 	|| (