Version bump wrt security bug #114662.

(Portage version: 2.0.51.22-r2)

4 files changed, 83 insertions, 7 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 3696ca1ad75a..ac91c1287a13 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.152 2005/12/07 09:01:54 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.153 2005/12/07 14:30:24 rl03 Exp $
+
+*phpmyadmin-2.7.0_p1 (07 Dec 2005)
+
+  07 Dec 2005; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.7.0_p1.ebuild:
+  Version bump wrt security bug #114662.
 
   07 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
   phpmyadmin-2.7.0.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index dca3ce804b04..2fa08806e86c 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,12 +1,14 @@
-MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 8a8c80816c9dac5c4e0050b792130e04 phpmyadmin-2.6.4_p4.ebuild 2094
-MD5 d670b82e5b346e9633346c26d5e62564 ChangeLog 21089
 MD5 10cb26dd25c6800b3ac9f9db3ee2b1f3 phpmyadmin-2.7.0.ebuild 2030
-MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
-MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 dff2d86ad4a88e4032487f5cff658bbd phpmyadmin-2.7.0_p1.ebuild 2058
+MD5 d670b82e5b346e9633346c26d5e62564 ChangeLog 21089
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 f9b280ad4bce0ff1073ad7692ae4ef27 files/digest-phpmyadmin-2.6.4_p4 74
+MD5 df2cdcb5a7b42d061bc4603ee5b7d1d3 files/digest-phpmyadmin-2.7.0_p1 74
 MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
-MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
 MD5 16a14fb034708b905343ca130a2815ed files/digest-phpmyadmin-2.7.0 70
+MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
 MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
-MD5 f9b280ad4bce0ff1073ad7692ae4ef27 files/digest-phpmyadmin-2.6.4_p4 74
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
new file mode 100644
index 000000000000..230e213f3463
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
@@ -0,0 +1 @@
+MD5 39bfebd35f9a2de03504812df173f27d phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild
new file mode 100644
index 000000000000..77dd2f6e414d
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild,v 1.1 2005/12/07 14:30:24 rl03 Exp $
+
+inherit eutils webapp
+
+MY_PV=${PV/_p/-pl}
+MY_P=phpMyAdmin-${MY_PV}
+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 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+	virtual/httpd-php
+	sys-apps/findutils
+	!<=dev-db/phpmyadmin-2.5.6"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/config.default.php-2.7.0.patch
+
+	# Remove .cvs* files and CVS directories
+	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+}
+
+src_compile() {
+	einfo "Setting random user/password details for the controluser"
+
+	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+	sed -e "s/@pmapass@/${pmapass}/g" -i config.default.php
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
+
+	# install the SQL scripts available to us
+	#
+	# unfortunately, we do not have scripts to upgrade from older versions
+	# these are things we need to add at a later date
+
+	webapp_sqlscript mysql ${T}/mysql-setup.sql
+
+	dodoc ${docs} ChangeLog
+	dohtml Documentation.html
+
+	# Copy the app's main files
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.default.php
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig-2.7
+	webapp_src_install
+
+	fperms 0640 ${MY_HTDOCSDIR}/config.default.php
+	fowners root:apache ${MY_HTDOCSDIR}/config.default.php
+	# bug #88831, make sure the create script is world-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}