Revision bump for security bug 87952; tidy all the old versions from previous vulnerabilities. Also updated metadata.xml since twp no longer maintains this package.

(Portage version: 2.0.51.19)

11 files changed, 29 insertions, 297 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index e833413a316b..5dcb8054a173 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,16 @@
 # 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.95 2005/03/29 14:57:05 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.96 2005/04/08 16:20:10 ka0ttic Exp $
+
+*phpmyadmin-2.6.2_rc1 (08 Apr 2005)
+
+  08 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/phpmyadmin-mysql-setup.sql.in, metadata.xml,
+  -phpmyadmin-2.6.1_rc1.ebuild, -phpmyadmin-2.6.1.ebuild,
+  -phpmyadmin-2.6.1_p2.ebuild, +phpmyadmin-2.6.2_rc1.ebuild:
+  Revision bump for security bug 87952; tidy all the old versions from
+  previous vulnerabilities. Also updated metadata.xml since twp no longer
+  maintains this package.
 
   29 Mar 2005; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.6.1_p2-r1.ebuild:
   Stable on hppa.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 4dea691c7975..eaeb47d2da5e 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,16 +1,11 @@
-MD5 30b3585d004ef3a0d25e5a86bd914223 ChangeLog 13270
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 3a33dda459f41b062d86576003c1e0ec phpmyadmin-2.6.1.ebuild 2595
+MD5 b76ee2cc324fbe0e0f17e167fa846596 phpmyadmin-2.6.2_rc1.ebuild 2398
 MD5 be80e52ff2f5bf4da91c8eb07716f050 phpmyadmin-2.6.1_p2-r1.ebuild 2475
-MD5 8953a4dca66a41467a427449f47ea16e phpmyadmin-2.6.1_p2.ebuild 2599
-MD5 d0ac5e24e09567b4888c6ee2fbd88b3e phpmyadmin-2.6.1_rc1.ebuild 2593
-MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
+MD5 e94364e9a86efdb113ddf85aa2552efe ChangeLog 13701
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
+MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
-MD5 c4e16f440d397574f36ec04130d54ba0 files/digest-phpmyadmin-2.6.1 70
-MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2 74
+MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
+MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
 MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2-r1 74
-MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 74
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
-MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
-MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1
deleted file mode 100644
index bf51b198b185..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eaa23b48760f2b31a8725bf85b0acecd phpMyAdmin-2.6.1.tar.bz2 1544628
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_p2
deleted file mode 100644
index f8fec6e3ca1a..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 787feeebe16ef7ab43e75e4046550da2 phpMyAdmin-2.6.1-pl2.tar.bz2 1541665
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_rc1
deleted file mode 100644
index fa2dfb8b84a0..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b413cc56b177547a94e387fa0f7d0334 phpMyAdmin-2.6.1-rc1.tar.bz2 1311277
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1
new file mode 100644
index 000000000000..58fddbd5836c
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1
@@ -0,0 +1 @@
+MD5 20093576299c6cc1468aa67b3dcedf50 phpMyAdmin-2.6.2-rc1.tar.bz2 1638568
diff --git a/dev-db/phpmyadmin/files/phpmyadmin-mysql-setup.sql.in b/dev-db/phpmyadmin/files/phpmyadmin-mysql-setup.sql.in
deleted file mode 100644
index 1ccbf393d3d1..000000000000
--- a/dev-db/phpmyadmin/files/phpmyadmin-mysql-setup.sql.in
+++ /dev/null
@@ -1,70 +0,0 @@
-GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY '@pmapass@';
-
-GRANT SELECT (Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv,
-	Create_priv, Drop_priv, Reload_priv, Shutdown_priv, Process_priv,
-	File_priv, Grant_priv, References_priv, Index_priv, Alter_priv)
-	ON mysql.user TO 'pma'@'localhost';
-
-GRANT SELECT ON mysql.db TO 'pma'@'localhost';
-
-GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)
-	ON mysql.tables_priv TO 'pma'@'localhost';
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON pmadb.* TO 'pma'@'localhost';
-
-CREATE DATABASE IF NOT EXISTS pmadb;
-USE pmadb;
-
-CREATE TABLE IF NOT EXISTS `PMA_bookmark` (
-	`id` int(11) DEFAULT '0' NOT NULL auto_increment,
-	`dbase` varchar(255) NOT NULL,
-	`user` varchar(255) NOT NULL,
-	`label` varchar(255) NOT NULL,
-	`query` text NOT NULL,
-	PRIMARY KEY (id)
-	) TYPE=MyISAM COMMENT='Bookmarks';
-
-CREATE TABLE IF NOT EXISTS `PMA_relation` (
-	`master_db` varchar(64) NOT NULL default '',
-	`master_table` varchar(64) NOT NULL default '',
-	`master_field` varchar(64) NOT NULL default '',
-	`foreign_db` varchar(64) NOT NULL default '',
-	`foreign_table` varchar(64) NOT NULL default '',
-	`foreign_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`master_db`, `master_table`, `master_field`),
-	KEY foreign_field (foreign_db, foreign_table)
-	) TYPE=MyISAM COMMENT='Relation table';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_info` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`display_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`db_name`, `table_name`)
-	) TYPE=MyISAM COMMENT='Table information for phpMyAdmin';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_coords` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`pdf_page_number` int NOT NULL default '0',
-	`x` float unsigned NOT NULL default '0',
-	`y` float unsigned NOT NULL default '0',
-	PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`)
-	) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output';
-
-CREATE TABLE IF NOT EXISTS `PMA_pdf_pages` (
-	`db_name` varchar(64) NOT NULL default '',
-	`page_nr` int(10) unsigned NOT NULL auto_increment,
-	`page_descr` varchar(50) NOT NULL default '',
-	PRIMARY KEY (page_nr),
-	KEY (db_name)
-	) TYPE=MyISAM COMMENT='PDF Relationpages for PMA';
-
-CREATE TABLE IF NOT EXISTS `PMA_column_comments` (
-	id int(5) unsigned NOT NULL auto_increment,
-	db_name varchar(64) NOT NULL default '',
-	table_name varchar(64) NOT NULL default '',
-	column_name varchar(64) NOT NULL default '',
-	`comment` varchar(255) NOT NULL default '',
-	PRIMARY KEY (id),
-	UNIQUE KEY db_name (db_name, table_name, column_name)
-	) TYPE=MyISAM COMMENT='Comments for Columns';
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index d9bb4626fb2b..6632069b5aff 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>twp@gentoo.org</email>
-  <name>Tom Payne</name>
-</maintainer>
+	<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.1.ebuild
deleted file mode 100644
index 6f16f61dfda0..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.1.ebuild,v 1.1 2005/01/25 23:09:46 twp Exp $
-
-inherit eutils webapp
-
-MY_PV=${PV/_p/-pl}
-MY_PV=${PV/_rc/-rc}
-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 ~ppc ~hppa ~sparc ~x86 ~amd64 ~mips"
-IUSE=""
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/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}"
-	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
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild
deleted file mode 100644
index ab4b114bfba6..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.1_rc1.ebuild,v 1.8 2005/01/11 17:25:05 twp Exp $
-
-inherit eutils webapp
-
-MY_PV=${PV/_p/-pl}
-MY_PV=${PV/_rc/-rc}
-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 ppc hppa sparc x86 amd64 ~mips"
-IUSE=""
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/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}"
-	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
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.2_rc1.ebuild
index 882d4ce23315..25918dd5c271 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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.1_p2.ebuild,v 1.6 2005/03/01 18:24:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2_rc1.ebuild,v 1.1 2005/04/08 16:20:10 ka0ttic Exp $
 
 inherit eutils webapp
 
@@ -11,11 +11,10 @@ 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 ppc ~hppa sparc x86 amd64 ~mips"
+KEYWORDS="~alpha ~ppc ~hppa ~sparc x86 ~amd64 ~mips"
 IUSE=""
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/php
+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}
@@ -27,6 +26,10 @@ src_unpack() {
 
 	# Remove .cvs* files and CVS directories
 	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+
+	sed -e "s:\${MY_SQLSCRIPTSDIR}:${MY_SQLSCRIPTSDIR}:" \
+		-e "s:\${PVR}:${PVR}:" \
+		${FILESDIR}/postinstall-en.txt > ${WORKDIR}/postinstall-en.txt
 }
 
 src_compile() {
@@ -71,21 +74,11 @@ src_install() {
 
 	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
+	webapp_postinst_txt en ${WORKDIR}/postinstall-en.txt
 
 	# all done
 	#