Non-maintainer version bump as per security bug #303761.

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

3 files changed, 82 insertions, 3 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 8e14c18dc59e..44c591d12a35 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.380 2010/04/30 21:41:43 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.381 2010/06/11 17:11:53 keytoaster Exp $
+
+*phpmyadmin-2.11.10 (11 Jun 2010)
+
+  11 Jun 2010; Tobias Heinlein <keytoaster@gentoo.org>
+  +phpmyadmin-2.11.10.ebuild:
+  Non-maintainer version bump as per security bug #303761.
 
 *phpmyadmin-3.3.2 (30 Apr 2010)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 01094f6e3f2f..c4eed5ec3046 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -7,10 +10,17 @@ DIST phpMyAdmin-2.11.9.5-all-languages-utf-8-only.tar.bz2 2243708 RMD160 10e64ed
 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
-EBUILD phpmyadmin-2.11.10.ebuild 1749 RMD160 ed063612ec6ae6f00ff405c186179fcc07866d8b SHA1 372b3f464c0401fdce0cb937bc504be108fb3bf1 SHA256 e5a68c59101f44d4638dbabc579f9743082e7755164d6d69eeb9b3edc1afef64
+EBUILD phpmyadmin-2.11.10.ebuild 1759 RMD160 808c786d23c22ccedd36b46d2108c066aa085485 SHA1 246d9e64c3204753ec367693333701a402644308 SHA256 5a2285e8b66eb15d05ab3a26d2823784a14c64aa48399d688dc41990967f4869
 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 52025 RMD160 e7b7e155d9831ec6b99a86cfedb341590d783cf4 SHA1 3ed4eae76100838b57db0971f741d95116561e4b SHA256 4a4adc569d6d1188eb46cb098b7ce3e5f95886fea7c91319202c9cf9945d4d0d
+MISC ChangeLog 52211 RMD160 bf82cfb435743f64cf9bba2aa107a8d90673f144 SHA1 2b9ad54e29360167170d1e07681e8dd5779b8c85 SHA256 3a940d8614ccf9dbed843bf57f147000e9dd25168515ac34aaee6e4c1b957a17
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwSbmMACgkQt3UOBHx+2m87CACffXdyxFJiU5Fp9QamS5AlUt7H
+9dwAn2zN4aoSgg/yybsJsFclAxpq9VGB
+=g8a1
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild
new file mode 100644
index 000000000000..2fe55554c1c2
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild
@@ -0,0 +1,63 @@
+# 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-2.11.10.ebuild,v 1.3 2010/06/11 17:11:53 keytoaster 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
+}