version bump wrt security #215502

Package-Manager: portage-2.1.4.4

3 files changed, 78 insertions, 6 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index dbcc71963a23..185bfa31669b 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.296 2008/03/06 15:40:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.297 2008/04/03 08:59:40 hollow Exp $
+
+*phpmyadmin-2.11.5.1 (03 Apr 2008)
+
+  03 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  +phpmyadmin-2.11.5.1.ebuild:
+  version bump wrt security #215502
 
 *phpmyadmin-2.11.5-r1 (06 Mar 2008)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 7ee281129ab8..bebec890ebc9 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -5,14 +5,16 @@ AUX phpmyadmin-2.11.5-custom-cert.patch 1000 RMD160 e8ae7f29c5958e8626c91bf62600
 AUX postinstall-en-2.8.0.txt 1117 RMD160 09838ab10f2f2cc44ca6154d182ddb573905f12c SHA1 c0c08a1ca71c54a1c900221a5bfd1fd12ecbb04a SHA256 b353e94a59c71131bc617f2e2c2b8d659c67d9277c86d20545da6b26bb08d12d
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
 DIST phpMyAdmin-2.11.5-all-languages-utf-8-only.tar.bz2 2243629 RMD160 510e64bc8e0dc42ce888882f2eb4aaca8f5870f7 SHA1 5dc42d057b6682a9de4ae0bf9ef5536ec1ad7138 SHA256 72741558abe60d5f0e721c86a7b70c164ff4015b0cbb63920f311396aefb7f10
+DIST phpMyAdmin-2.11.5.1-all-languages-utf-8-only.tar.bz2 2243519 RMD160 12f4e14411d36cfe24b233094780e21262d305a9 SHA1 ecd2254025c9f14472e82d102b4b2e1a127ddcbe SHA256 d21767449d901ef68bd693d9b0b8ce27c11fb4b3a1caa2331dd071f0f146ef7c
 EBUILD phpmyadmin-2.11.5-r1.ebuild 1786 RMD160 14393a40d3329b4d32720d110a41731d9e1611b7 SHA1 f42d40e798dfff38c0caf7fecc56be207e2deb27 SHA256 c3083f3a6275c42a33d791cd8ff25fc9db645553e241a4d3c07c6c5e069bf66f
+EBUILD phpmyadmin-2.11.5.1.ebuild 1785 RMD160 6656258d075bebd5ab31769bf4a13fd1744c87e8 SHA1 cd99fb1baef3d9397b4cd3f3c7d25f6e78042103 SHA256 effc721d30de459dff7a23c09e9613ec1ccda7940495b798917521984f737a08
 EBUILD phpmyadmin-2.11.5.ebuild 1685 RMD160 64b2e4e2460011d7211a6bdaf72101c229f729ac SHA1 b85112d991989778e76cf3abbfc3810b3a33dfef SHA256 b658522d3be6a581b2763100b3abaff310a8db1e6d8a8b8b551d8e96753124ce
-MISC ChangeLog 40302 RMD160 35f611e5896f5a3994ca444de499ba8934e0dcca SHA1 a9c93504c7f961fc63ddd5cdf5f24052c54520cf SHA256 db32c51d50380c0c2fbe66a90048513122aaf619ec411b0baef74ec4d3de0cbf
+MISC ChangeLog 40456 RMD160 898ab4687b56250dd3790888d906055022b889f9 SHA1 4706058df45809542066deeed562dab5d3749a9d SHA256 78f2d063c4a81f5c6ec8ddde1badebd7022809efb74ac99e3f6f464133791739
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfQEG8ACgkQmPFBzbX68WHFCACfWRvYXc+y+95BqNGjktLHfG2e
-9KAAnig/DAlbJqQkd2vPlLuoixVKaoHE
-=hGbD
+iD8DBQFH9JyGmPFBzbX68WERAj6jAJ4qpPUYqUhDJl9LtRLxBQ2YFoHKnACfTbW5
+GkpA+QBees/5MdmLFA10WQg=
+=qKae
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.5.1.ebuild
new file mode 100644
index 000000000000..8316bc9ce732
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.5.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.5.1.ebuild,v 1.1 2008/04/03 08:59:40 hollow 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 "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 "mysql if using dev-lang/php-4"
+		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
+}