Version bump. The installation of the PMA setup utility can now be controlled via the 'setup' USE flag.

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

5 files changed, 91 insertions, 9 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 0a8280112a7b..a0c09349a685 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.413 2011/01/05 15:25:36 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.414 2011/05/15 22:16:45 a3li Exp $
+
+*phpmyadmin-3.4.0 (15 May 2011)
+
+  15 May 2011; Alex Legler <a3li@gentoo.org> files/postinstall-en-3.1.txt,
+  +phpmyadmin-3.4.0.ebuild, metadata.xml:
+  Version bump. The installation of the PMA setup utility can now be controlled
+  via the 'setup' USE flag.
 
 *phpmyadmin-3.3.9 (05 Jan 2011)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index d926dcfa1749..e368b4eb980f 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX postinstall-en-3.1.txt 1106 RMD160 75302bc9009db38cd7564feb5f48a776ab6457e8 SHA1 fab327c0a7212c85e283632a83d3899aa4388f2c SHA256 80296f8df3e1c7740f205bd876c841dd5712a262c4d903034f5db6fb8f26448a
+AUX postinstall-en-3.1.txt 1160 RMD160 f5645bf90c63d3b7f06e41fcde28f5d8492b4333 SHA1 99e9233354267e41cc53194f36d73a19cd6e7271 SHA256 0fa47a49b9c5604339335d36ce9d1506a1cd07644d219fb7f35e2e4432fa8dbf
 DIST phpMyAdmin-3.3.8.1-all-languages.tar.bz2 3678725 RMD160 4cab0e77659b6a87f6f6be4b2e20baffa2e6a69a SHA1 8482a115c6cfeaaaff50af49624652b67eaf5492 SHA256 1819f58623c7a38679a477e853fc4f3eddbe502600904ddbe348b8362d72cb33
 DIST phpMyAdmin-3.3.9-all-languages.tar.bz2 3675936 RMD160 ab52c09fe20adb9e2509251abcae2fb88b6b19d0 SHA1 bbaaaec4b8ea4f34a277b7d6e900bb12ce94a505 SHA256 0dbcc3b4e9800448219437b9babdc9d5bf727c39c97b52a0b56c50f5753b3f2d
+DIST phpMyAdmin-3.4.0-all-languages.tar.bz2 4548030 RMD160 72c12a217d6d5bc78ac091f4a0e7bea16a43e318 SHA1 0f39a992acb9c4c436fba1cce67a23107bf1cd92 SHA256 8dbc70fa22f76d6cf34723d5349450184327e33fe742bbf5bcf396c757769708
 EBUILD phpmyadmin-3.3.8.1.ebuild 1293 RMD160 21861c53242aa5aa17d9e51f66c5174df530fbda SHA1 d5ef3aa123599924b2462bf93765b52e7df7e4b3 SHA256 2efbc919c25e8e64a11be43cc9fa8f2191c47566b0df882f1a70903b80cd7462
 EBUILD phpmyadmin-3.3.9.ebuild 1296 RMD160 270cc763cc3a0d9e37f6d01fea3dbf5055a8214c SHA1 a0a6a3e547de5aeecb3e1fda357eb0c3a0a4ef27 SHA256 6719c2491033c55861e840a5f1577a54c717027076129ffdf4e2eeb516637643
-MISC ChangeLog 56358 RMD160 a76b1cfff68a12a0207f60ab221121d019db8703 SHA1 d23ff2794114dba88e44c47c2d816be6da93211b SHA256 edf621b14f56f1db0a52c97f850c0692bd1545602090b26180fa75019a5af85c
-MISC metadata.xml 251 RMD160 affa8959c85e1ad0b930d310bae9f1aa3ebb9936 SHA1 540c6819f9ce504eadeb342fc7ba531e44e6d256 SHA256 7baccd41d0a6847a8e87c42420c72e1e8655f4cb7b6b2a2690eb9bdba5a51d07
+EBUILD phpmyadmin-3.4.0.ebuild 1623 RMD160 ce1b6a56d35b31c812e40ed4cf2bd3a3dde450b5 SHA1 633e78422e217a75276377913415d3299e669a75 SHA256 24e7569623e1aec28ea1e2b6ee97a460a184e403262721b88ba5fa6eea46fbea
+MISC ChangeLog 56617 RMD160 769f3ee2c06ef0ce4f951ac7a5afca2a1cb68445 SHA1 694264a7d986536947ae6b5437f20d38e901cffe SHA256 3c6b75c29b51aab2eca41295f8f5eae2e8f91a8c7b6dd8d42a8774edfa182cc5
+MISC metadata.xml 497 RMD160 eaba4b5566af47342cdcd58d660191afe16fd30a SHA1 ded49266c2f95c2b3367e6c56379fffc04410a70 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0kjXkACgkQ3Ca6Xy8+rvTScgD/anOoUedmJtri0pWK5yzWGuTz
-eS8hIY2LuzRUX/hzuHwA/jn63VdZy3/cvYK+zyRgsuvCIlzmWedOopADAMhIbu3v
-=ruSv
+iF4EAREIAAYFAk3QUNgACgkQ3Ca6Xy8+rvR/KQD/bhTSOCiUyPugu1YszHUdjGnD
+MNDNAy59N6bNAXTD9egA/02GCvmiWOJfDmLKdK/uQoy02l5p7t4PRSss/SmTpS5N
+=pvDs
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
index 29a8dc77ba7a..4e72581eb82d 100644
--- a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
@@ -2,7 +2,8 @@ If this is a new installation:
 
 1. Configure ${PN}:
 
-a) Create config.inc.php. You can use the web-based installer:
+a) Create config.inc.php. You can use the web-based installer
+   (this requires the 'setup' USE flag to be enabled):
 
    mkdir ${MY_INSTALLDIR}/config
    chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index ec867187f02e..fb25c5886ffe 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -6,4 +6,12 @@
 		<email>a3li@gentoo.org</email>
 		<name>Alex Legler</name>
 	</maintainer>
+	<use>
+		<flag name="setup">
+			Installs the phpMyAdmin setup utility.
+			Users who don't use the utility should disable this USE flag
+			for security reasons as the setup tool was the target of various
+			exploits in the past.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.4.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.4.0.ebuild
new file mode 100644
index 000000000000..8820bd445de4
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-3.4.0.ebuild
@@ -0,0 +1,64 @@
+# 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.0.ebuild,v 1.1 2011/05/15 22:16:46 a3li 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
+}