From bc34e517e4378e11310e24ae7c00e19a20349f85 Mon Sep 17 00:00:00 2001
From: Renat Lumpau <rl03@gentoo.org>
Date: Sun, 11 Sep 2005 13:31:46 +0000
Subject: [PATCH] Version bump wrt security bug #105598. Package-Manager:
 portage-2.0.51.22-r2

---
 dev-db/phpmyadmin/ChangeLog                   |  7 +-
 dev-db/phpmyadmin/Manifest                    | 10 +--
 .../phpmyadmin/files/digest-phpmyadmin-2.6.4  |  1 +
 dev-db/phpmyadmin/phpmyadmin-2.6.4.ebuild     | 70 +++++++++++++++++++
 4 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4
 create mode 100644 dev-db/phpmyadmin/phpmyadmin-2.6.4.ebuild

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 47f73b4c6c8a..bcb1ae22109c 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.121 2005/09/02 11:09:14 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.122 2005/09/11 13:31:46 rl03 Exp $
+
+*phpmyadmin-2.6.4 (11 Sep 2005)
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.6.4.ebuild:
+  Version bump wrt security bug #105598.
 
   02 Sep 2005; Renat Lumpau <rl03@gentoo.org> files/reconfig:
   Fix reconfig script wrt bug #104495.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index cc83125a226f..70e91990adfe 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -2,9 +2,11 @@
 Hash: SHA1
 
 MD5 9c32ebccf18915d5520cc69c20bc677b phpmyadmin-2.6.4_rc1.ebuild 2084
-MD5 8b034db5fa617230282c62561b50d70b ChangeLog 17087
+MD5 dd3ceb42db834178f2ba23ca3644f870 phpmyadmin-2.6.4.ebuild 2073
+MD5 b89e211f506f313856a9519aac7616b3 ChangeLog 17234
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 cf627de1acb2efda0af3d42a61305df2 files/digest-phpmyadmin-2.6.4_rc1 74
+MD5 a90f4d723611e1a4b40a0878a0d54d77 files/digest-phpmyadmin-2.6.4 70
 MD5 4f79e26c8e5060be5dd522af91639d9b files/postinstall-en.txt 511
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
@@ -13,7 +15,7 @@ MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDGDL0EzitwsaoONoRAn0bAJ92GIGeGtKyEa6jnXC20uf5L+lE4QCfXuct
-7gEcqXfVapW5bR0aHZJBszc=
-=5o5I
+iD8DBQFDJDHZEzitwsaoONoRAgZGAJ9Op1DutdBUWNuF2kYr/xCv14V0uwCg0JRP
+gOVQouibW64EluYrGwoJ1Ro=
+=Lrvn
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4
new file mode 100644
index 000000000000..2dffcbf9589c
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4
@@ -0,0 +1 @@
+MD5 cb24f2aff8cd16cb8d1026b7e5934582 phpMyAdmin-2.6.4.tar.bz2 1731434
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4.ebuild
new file mode 100644
index 000000000000..843beccdb38e
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4.ebuild
@@ -0,0 +1,70 @@
+# 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.ebuild,v 1.1 2005/09/11 13:31:46 rl03 Exp $
+
+inherit eutils webapp
+
+MY_P=phpMyAdmin-${PV/_rc/-rc}
+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-2.6.4 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
+}
-- 
2.26.2