Version bump wrt security bug #110146.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 92 insertions, 13 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 2461c2cb47a3..d5ed6d9d1894 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.131 2005/10/16 16:20:28 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.132 2005/10/23 16:32:41 rl03 Exp $
+
+*phpmyadmin-2.6.4_p3 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.6.4_p3.ebuild:
+  Version bump wrt security bug #110146.
 
   16 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
   phpmyadmin-2.6.4_p2.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 544a9ab180e0..52f05a950602 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3e4eec8f22830e45cd9ffc79e388dcbc ChangeLog 18320
-MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
-MD5 a90f4d723611e1a4b40a0878a0d54d77 files/digest-phpmyadmin-2.6.4 70
+MD5 88d8b130fcfa51d7a585a36c76e3cd0f phpmyadmin-2.6.4_p1.ebuild 2099
+MD5 74c8272ae11ffa29961cd1521dc9a432 phpmyadmin-2.6.4_p3.ebuild 2099
+MD5 dd3ceb42db834178f2ba23ca3644f870 phpmyadmin-2.6.4.ebuild 2073
+MD5 18c8e6ab133d6c5425490b29d6be39f3 phpmyadmin-2.6.4_p2.ebuild 2094
+MD5 5cc481aac77f214e2cd5a04c2d469742 ChangeLog 18472
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 52aedae70a1162031d63efef8fc2591e files/digest-phpmyadmin-2.6.4_p1 74
 MD5 389160b9fda295e6d5758a3678652a3f files/digest-phpmyadmin-2.6.4_p2 74
-MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
-MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
+MD5 0fb913f47fa22640fc0df136df21818c files/digest-phpmyadmin-2.6.4_p3 74
+MD5 a90f4d723611e1a4b40a0878a0d54d77 files/digest-phpmyadmin-2.6.4 70
 MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
 MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
-MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
-MD5 dd3ceb42db834178f2ba23ca3644f870 phpmyadmin-2.6.4.ebuild 2073
-MD5 88d8b130fcfa51d7a585a36c76e3cd0f phpmyadmin-2.6.4_p1.ebuild 2099
-MD5 18c8e6ab133d6c5425490b29d6be39f3 phpmyadmin-2.6.4_p2.ebuild 2094
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDUn3nntT9W3vfTuoRAjbpAJsFmpbebXs9TbIwI1ug43MzhZpYYgCfc9kT
-Oc+LRVVZJ1xe4tVeapA1X1g=
-=+Cj0
+iD8DBQFDW7tFEzitwsaoONoRAqi7AJ9rGgS2WVZ9cwerD9jj59g9Xaw52QCfdAcV
+WFFs0n2IBh06vfvEhwFe8so=
+=98Dt
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p3 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p3
new file mode 100644
index 000000000000..1e1b635d9e25
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p3
@@ -0,0 +1 @@
+MD5 66f7287ce59d2f41ec180a04d5a3094a phpMyAdmin-2.6.4-pl3.tar.bz2 1722662
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
new file mode 100644
index 000000000000..dcf82de20a29
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.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_p3.ebuild,v 1.1 2005/10/23 16:32:41 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.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 ChangeLog 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}
+	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
+}