Security bump. See #112690

Package-Manager: portage-1.589-cvs

4 files changed, 88 insertions, 18 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 4b7c46d42aa4..017bb3c02bcb 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.141 2005/11/10 14:00:51 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.142 2005/11/17 22:09:12 mholzer Exp $
+
+*phpmyadmin-2.6.4_p4 (17 Nov 2005)
+
+  17 Nov 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpmyadmin-2.6.4_p4.ebuild:
+  Security bump. See #112690
 
   10 Nov 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2.7,
   phpmyadmin-2.7.0_beta1.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index a85f2cfa33ff..1f4ce09a0750 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6e358909bac88b65fab218ee14a160c3 phpmyadmin-2.7.0_beta1.ebuild 2067
-MD5 06ef9cf16f596c7eace1c9a7e6e54725 phpmyadmin-2.6.4_p3.ebuild 2093
-MD5 5a95072bd30c67fc3d618f921c5b0f3e ChangeLog 19691
+MD5 6b68a4c5839a551d900ef7b2b4849bda ChangeLog 19841
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 06ef9cf16f596c7eace1c9a7e6e54725 phpmyadmin-2.6.4_p3.ebuild 2093
+MD5 6e358909bac88b65fab218ee14a160c3 phpmyadmin-2.7.0_beta1.ebuild 2067
+MD5 54dba578ed813fcab2119eca50b53061 phpmyadmin-2.6.4_p4.ebuild 2102
 MD5 0fb913f47fa22640fc0df136df21818c files/digest-phpmyadmin-2.6.4_p3 74
-MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
-MD5 0cd8fc0cfff0431b90baeaa43ab92365 files/digest-phpmyadmin-2.7.0_beta1 76
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
+MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
-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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDc1KdEzitwsaoONoRAiFBAJ9iuN+jgw4S/baqmLDyjapqsc99dwCgi1UY
-CtzDE7js3dlZdkKDfmr5x5A=
-=4Pi2
------END PGP SIGNATURE-----
+MD5 0cd8fc0cfff0431b90baeaa43ab92365 files/digest-phpmyadmin-2.7.0_beta1 76
+MD5 f9b280ad4bce0ff1073ad7692ae4ef27 files/digest-phpmyadmin-2.6.4_p4 74
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p4
new file mode 100644
index 000000000000..1dab96b5f5e1
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p4
@@ -0,0 +1 @@
+MD5 a49885849bec79d35f6bdae73cdb813d phpMyAdmin-2.6.4-pl4.tar.bz2 1722973
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild
new file mode 100644
index 000000000000..fe1fd21e645c
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild
@@ -0,0 +1,71 @@
+# 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.6.4_p4.ebuild,v 1.1 2005/11/17 22:09:12 mholzer 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.inc.php-2.5.6.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.inc.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"
+
+	# 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}
+	for doc in ${docs} LICENSE; do
+		rm -f ${D}/${MY_HTDOCSDIR}/${doc}
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_src_install
+
+	fperms 0640 ${MY_HTDOCSDIR}/config.inc.php
+	fowners root:apache ${MY_HTDOCSDIR}/config.inc.php
+	# bug #88831, make sure the create script is world-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}