Non-maintainer commit: Version bump, security bugs 263711 and 266438, bump request 270877.

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

4 files changed, 89 insertions, 6 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 137c90ca6f73..9de12af17ea5 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/phpmyadmin
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.359 2009/02/28 11:07:22 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.360 2009/06/19 14:38:56 a3li Exp $
+
+*phpmyadmin-3.2.0 (19 Jun 2009)
+*phpmyadmin-2.11.9.5 (19 Jun 2009)
+
+  19 Jun 2009; Alex Legler <a3li@gentoo.org> +phpmyadmin-2.11.9.5.ebuild,
+  -phpmyadmin-3.1.2.ebuild, +phpmyadmin-3.2.0.ebuild:
+  Non-maintainer commit: Version bump, security bugs 263711 and 266438, bump
+  request 270877.
 
   28 Feb 2009; Robin H. Johnson <robbat2@gentoo.org>
   phpmyadmin-3.1.2.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index e013b6e7a82c..34b1b9286b1b 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,10 +1,22 @@
+-----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
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
 DIST phpMyAdmin-2.11.9.4-all-languages-utf-8-only.tar.bz2 2243244 RMD160 dff596b0ecd38d461650662cb6542aa868e64302 SHA1 469a15667a53f962ddd89e2b5c0b2a76fe197be4 SHA256 fbbb5a7d87df3d0ca13b8b7758cef46d4570b2ecb1776a4f26009ac2f76f320a
-DIST phpMyAdmin-3.1.2-all-languages.tar.bz2 2647073 RMD160 7b8403d4f0c6330ef16a86504d87ae798e133c03 SHA1 c5e43fb49888bd31df968c386a456b1b07125fb7 SHA256 1c4a6b016f2e7d5b7042e500963786a04990c55c2a8aa6b7db4b4029c3db9cb6
+DIST phpMyAdmin-2.11.9.5-all-languages-utf-8-only.tar.bz2 2243708 RMD160 10e64ed0dde29272aee98997d99b486e8619fed2 SHA1 fbe83d0969b998f04809b41f4e33d717f93b3967 SHA256 9779e82d003da0e5e3a3875d0bf1a31ffb2f57bbd99230ae4ab91ad080b3daa3
+DIST phpMyAdmin-3.2.0-all-languages.tar.bz2 2687597 RMD160 a719ec9d29a58482d82d2106b6115be3e4555d96 SHA1 a548aff1f42cfdf113458675c2e80313e2549d25 SHA256 c47885dc902afa03268bcdb537799893e8f38e119c7a9327b596a6b1ac79cd08
 EBUILD phpmyadmin-2.11.9.4.ebuild 1744 RMD160 16e704cd7dd248a0cc81db0c2d57908c4bc67009 SHA1 f74e793c9dbb5a1f641d2dadfa1ee049a1f78f05 SHA256 45ea5b16854dfe2183f3ff0ede4e0af5d0aa1d3be8b89db1ccac89a3c990b7ff
-EBUILD phpmyadmin-3.1.2.ebuild 1693 RMD160 a5396ba63889b8a02ab4bddcac790b8de9a8edf5 SHA1 3fc4901abeeb5c75b1a500d4c14ff3df29782007 SHA256 66df8b7b70c8a59ad5e9c8bf20e77020cf431859d6479b0950f6f0d39523d894
-MISC ChangeLog 49020 RMD160 61711566f7a4c5e49dea854f9aa62bb2be48005c SHA1 155fd07bef09bfb2bea8e1655615e3ac0a136e06 SHA256 2fdc864ea77e7babca3b5c82b5ed9c46a9c56cd774c36b0d51d5b25801d5cc77
+EBUILD phpmyadmin-2.11.9.5.ebuild 1748 RMD160 e04520d652c9a498269c783ea68fa94624aa3f9e SHA1 9c95aeacd41b5f313a31cc037fcc57c3f570ae1a SHA256 f4afac6f18089bd54f08bbfee0509c576b980acbf6b63355aacab9577655ff3e
+EBUILD phpmyadmin-3.2.0.ebuild 1690 RMD160 49bd72734cb749b6afc948bdee1aeb4c34b65a1b SHA1 b33bc70d7fdfbc4edd1e9c4b2c8bc9586c2e2e41 SHA256 a168c4bafa211defaa7b7aa6fa75ecfbdc929e402428fe94954294acd9340f9c
+MISC ChangeLog 49309 RMD160 caa02c322001ae63d6fc8bd47f024b3677b2ffd0 SHA1 1d6539dda9c9ffdaefb2f618da96dd7fc2fa3cfe SHA256 082ba1181a3e64d0996fbeb3ee0177539df4b92b072084f898d426d0e1833ae9
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko7owsACgkQaGsKqSU7eCTVHwCeKoT031zRjR7sAOg2P2eMQve+
+otcAoJq95DEaPBmEUS7tw+bz+17iqxrE
+=sXwq
+-----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
new file mode 100644
index 000000000000..a8dfab4ef50c
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2009/06/19 14:38:56 a3li 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 "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.1.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.0.ebuild
index da13686b93fd..43eae8db2428 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.1.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.2.ebuild,v 1.2 2009/02/28 11:07:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.0.ebuild,v 1.1 2009/06/19 14:38:56 a3li Exp $
 
 inherit eutils webapp depend.php