From: Martin Holzer <mholzer@gentoo.org>
Date: Wed, 12 Oct 2005 20:47:38 +0000 (+0000)
Subject: Revision bump for security bug 108939
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4dd9a21c6834c4485345deb9769be2f59729fe3;p=gentoo.git

Revision bump for security bug 108939
Package-Manager: portage-1.589-cvs
---

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index a65b0074809c..dda3b834c13b 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.125 2005/09/15 23:42:45 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.126 2005/10/12 20:47:38 mholzer Exp $
+
+*phpmyadmin-2.6.4_p2 (12 Oct 2005)
+
+  12 Oct 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpmyadmin-2.6.4_p2.ebuild:
+  Revision bump for security bug 108939
 
   15 Sep 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
   Added note to postinstall instructions wrt bug #104495.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 61410f1445d8..9518d3c9bfb6 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 4e2f7f3299b8b7231c9581e7c1d94c4b ChangeLog 17752
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 88d8b130fcfa51d7a585a36c76e3cd0f phpmyadmin-2.6.4_p1.ebuild 2099
 MD5 dd3ceb42db834178f2ba23ca3644f870 phpmyadmin-2.6.4.ebuild 2073
-MD5 dbbd2b0096692907343fae3f575b7553 ChangeLog 17591
-MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
-MD5 52aedae70a1162031d63efef8fc2591e files/digest-phpmyadmin-2.6.4_p1 74
+MD5 dfb71c0ce8ad89b01d1af5e839477251 phpmyadmin-2.6.4_p2.ebuild 2102
 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 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 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
 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)
-
-iD8DBQFDKgcBEzitwsaoONoRAiehAJ9bel4gwhtHSwf0i60wtjYqPPxmNgCeLoXa
-mjWdISc0eL8++cHtQS+P3pI=
-=O3aM
------END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p2
new file mode 100644
index 000000000000..83cdbbd13636
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p2
@@ -0,0 +1 @@
+MD5 7d0e0ac0ebf97be76043ed4cbba588c9 phpMyAdmin-2.6.4-pl2.tar.bz2 1722828
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p2.ebuild
new file mode 100644
index 000000000000..22653c56b8a5
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p2.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_p2.ebuild,v 1.1 2005/10/12 20:47:38 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 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
+}