Version bump (security fix). Bug # 56048.

4 files changed, 109 insertions, 9 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 5e3b688934d1..3d91c9f92694 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.50 2004/06/27 11:37:11 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.51 2004/07/04 18:04:57 twp Exp $
+
+*phpmyadmin-2.5.7_p1 (04 Jul 2004)
+
+  04 Jul 2004; <twp@gentoo.org> +phpmyadmin-2.5.7_p1.ebuild:
+  Version bump (security fix). Bug # 56048.
 
   27 Jun 2004; <twp@gentoo.org> files/mysql-setup.sql.in-2.5.6,
   phpmyadmin-2.5.7.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 137ab78b5355..80e6ea5a83d9 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,13 +1,15 @@
-MD5 6a129733721199ad65b2b4d98b56d22d phpmyadmin-2.5.6.ebuild 2970
-MD5 f8fb9a60938f441b06dcf0281fc16d47 phpmyadmin-2.5.6-r1.ebuild 2584
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 f8da2aba2f4f5e8d53180a7406d523eb phpmyadmin-2.5.7.ebuild 2581
+MD5 f8da2aba2f4f5e8d53180a7406d523eb phpmyadmin-2.5.7_p1.ebuild 2581
+MD5 6a129733721199ad65b2b4d98b56d22d phpmyadmin-2.5.6.ebuild 2970
 MD5 add65c15fc5fcb2ba15e7877f2ce53b1 ChangeLog 7775
-MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 f8fb9a60938f441b06dcf0281fc16d47 phpmyadmin-2.5.6-r1.ebuild 2584
+MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
 MD5 09deb77d7dc18f657af1dc07afa81072 files/digest-phpmyadmin-2.5.7 70
-MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
-MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
+MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
-MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
+MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
+MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
 MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6-r1 70
-MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
+MD5 4bc84bc21f355fef1b2041ab45d3c6a5 files/digest-phpmyadmin-2.5.7_p1 74
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7_p1
new file mode 100644
index 000000000000..d23977f88b0a
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7_p1
@@ -0,0 +1 @@
+MD5 93b7c7f3dfcfd6df9c2ea26f31a51772 phpMyAdmin-2.5.7-pl1.tar.bz2 1123591
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild
new file mode 100644
index 000000000000..b69e7a0e8960
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild,v 1.1 2004/07/04 18:04:57 twp Exp $
+
+inherit eutils webapp
+
+MY_P=phpMyAdmin-${PV/_p/-pl}
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha -arm ~ppc -hppa -mips ~sparc ~x86 ~amd64"
+DEPEND=">=net-www/apache-1.3
+	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.0
+	>=dev-php/mod_php-3.0.8
+	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}"
+	mv config.inc.php ${T}/config.inc.php
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		${T}/config.inc.php > 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="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README"
+
+	# 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
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	# Copy the app's main files
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	# Identify the configuration files that this app uses
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
+
+	# Identify any script files that need #! headers adding to run under
+	# a CGI script (such as PHP/CGI)
+	#
+	# for phpmyadmin, we *assume* that all .php files that don't end in
+	# .inc.php need to have CGI/BIN support added
+
+	for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
+	done
+
+	# there are no files which need to be owned by the web server
+
+	# add the post-installation instructions
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	# all done
+	#
+	# now we let the eclass strut its stuff ;-)
+
+	webapp_src_install
+}