diff options
author | Tom William Payne <twp@gentoo.org> | 2003-10-22 15:40:59 +0000 |
---|---|---|
committer | Tom William Payne <twp@gentoo.org> | 2003-10-22 15:40:59 +0000 |
commit | c676e9d9f7386d65c4b15d9ace48f02db0f3249a (patch) | |
tree | 25dd1dcd7edb77a0fcae9b4ca3663c77a58946f9 /dev-db | |
parent | Version bump. Thanks to Michele Noberasco (#31738). (diff) | |
download | historical-c676e9d9f7386d65c4b15d9ace48f02db0f3249a.tar.gz historical-c676e9d9f7386d65c4b15d9ace48f02db0f3249a.tar.bz2 historical-c676e9d9f7386d65c4b15d9ace48f02db0f3249a.zip |
Bug # 31537
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 7 | ||||
-rw-r--r-- | dev-db/phpmyadmin/Manifest | 12 | ||||
-rw-r--r-- | dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch | 55 | ||||
-rw-r--r-- | dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4 | 1 | ||||
-rw-r--r-- | dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.4 | 84 | ||||
-rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild | 95 |
6 files changed, 249 insertions, 5 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index 03f6f03d5ae1..655aa91f4c47 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.29 2003/10/21 15:37:46 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.30 2003/10/22 15:40:47 twp Exp $ 22 Oct 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.0.ebuild, phpmyadmin-2.5.3-r1.ebuild, files/config.inc.php-2.5.2.patch: adding RESTRICT="nomirror" +*phpmyadmin-2.5.4 (20 Oct 2003) + + 20 Oct 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.4.ebuild : + Version bump. Bug # 31537. Update MySQL dependency. + 29 Sep 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.3-r1.ebuild: Marked x86 stable. diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index 990d557e8fd8..6221ec1d7657 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,12 +1,16 @@ -MD5 a944727c321178338ab16ca9f9b2bb16 ChangeLog 5151 -MD5 b8fd9f5d7c7bbf1cbe564fe5f049b49f phpmyadmin-2.5.3-r1.ebuild 2964 +MD5 e8580382588c0b2a8bb29fbea3c923a8 ChangeLog 5303 +MD5 f462f1cc0d8f13281bf254643b38d90b phpmyadmin-2.5.4.ebuild 2939 MD5 9271438a437f2e8bc3eef67f40678fcc phpmyadmin-2.5.0.ebuild 2681 +MD5 b8fd9f5d7c7bbf1cbe564fe5f049b49f phpmyadmin-2.5.3-r1.ebuild 2964 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 MD5 2f1fcee3c3573d6d92cbcddd4da6291d files/config.inc.php-2.5.0.patch 4826 -MD5 42ef286700d159ee2e074c6782ace0ac files/digest-phpmyadmin-2.5.3-r1 74 +MD5 c1b0654f2909f7a01d9621c1dd41cca3 files/digest-phpmyadmin-2.5.4 74 +MD5 069e2c15dc9725b90d0255b042d88489 files/config.inc.php-2.5.4.patch 4826 +MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.4 3230 MD5 099c45dd9e247d526bfc7777abb5e232 files/digest-phpmyadmin-2.5.0 73 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.0 3230 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712 -MD5 fe846e076048ecd9c28277a5fc9ea0c9 files/config.inc.php-2.5.3.patch 4826 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.3 3230 +MD5 fe846e076048ecd9c28277a5fc9ea0c9 files/config.inc.php-2.5.3.patch 4826 +MD5 42ef286700d159ee2e074c6782ace0ac files/digest-phpmyadmin-2.5.3-r1 74 diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch new file mode 100644 index 000000000000..cf729cde8d9c --- /dev/null +++ b/dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch @@ -0,0 +1,55 @@ +--- phpMyAdmin-2.5.4/config.inc.php 2003-10-18 23:32:01.000000000 +0200 ++++ phpMyAdmin/config.inc.php 2003-10-20 17:29:55.000000000 +0200 +@@ -72,11 +72,11 @@ + $cfg['Servers'][$i]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket') + $cfg['Servers'][$i]['compress'] = FALSE; // Use compressed protocol for the MySQL connection + // (requires PHP >= 4.3.0) +-$cfg['Servers'][$i]['controluser'] = ''; // MySQL control user settings ++$cfg['Servers'][$i]['controluser'] = 'pma'; // MySQL control user settings + // (this user must have read-only +-$cfg['Servers'][$i]['controlpass'] = ''; // access to the "mysql/user" ++$cfg['Servers'][$i]['controlpass'] = '@pmapass@'; // access to the "mysql/user" + // and "mysql/db" tables) +-$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (config, http or cookie based)? ++$cfg['Servers'][$i]['auth_type'] = 'http'; // Authentication method (config, http or cookie based)? + $cfg['Servers'][$i]['user'] = 'root'; // MySQL user + $cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed + // with 'config' auth_type) +@@ -87,29 +87,29 @@ + // of db-names + $cfg['Servers'][$i]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname + +-$cfg['Servers'][$i]['pmadb'] = ''; // Database used for Relation, Bookmark and PDF Features ++$cfg['Servers'][$i]['pmadb'] = 'pmadb'; // Database used for Relation, Bookmark and PDF Features + // (see scripts/create_tables.sql) + // - leave blank for no support + // DEFAULT: 'phpmyadmin' +-$cfg['Servers'][$i]['bookmarktable'] = ''; // Bookmark table ++$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark';// Bookmark table + // - leave blank for no bookmark support + // DEFAULT: 'pma_bookmark' +-$cfg['Servers'][$i]['relation'] = ''; // table to describe the relation between links (see doc) ++$cfg['Servers'][$i]['relation'] = 'PMA_relation';// table to describe the relation between links (see doc) + // - leave blank for no relation-links support + // DEFAULT: 'pma_relation' +-$cfg['Servers'][$i]['table_info'] = ''; // table to describe the display fields ++$cfg['Servers'][$i]['table_info'] = 'PMA_table_info';// table to describe the display fields + // - leave blank for no display fields support + // DEFAULT: 'pma_table_info' +-$cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tables position for the PDF schema ++$cfg['Servers'][$i]['table_coords'] = 'PMA_table_coords';// table to describe the tables position for the PDF schema + // - leave blank for no PDF schema support + // DEFAULT: 'pma_table_coords' +-$cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf ++$cfg['Servers'][$i]['pdf_pages'] = 'PMA_pdf_pages';// table to describe pages of relationpdf + // - leave blank if you don't want to use this + // DEFAULT: 'pma_pdf_pages' +-$cfg['Servers'][$i]['column_info'] = ''; // table to store column information ++$cfg['Servers'][$i]['column_info'] = 'PMA_column_info';// table to store column information + // - leave blank for no column comments/mime types + // DEFAULT: 'pma_column_info' +-$cfg['Servers'][$i]['history'] = ''; // table to store SQL history ++$cfg['Servers'][$i]['history'] = 'PMA_history';// table to store SQL history + // - leave blank for no SQL query history + // DEFAULT: 'pma_history' + $cfg['Servers'][$i]['verbose_check'] = TRUE; // set to FALSE if you know that your pma_* tables diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4 new file mode 100644 index 000000000000..38752f13df68 --- /dev/null +++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4 @@ -0,0 +1 @@ +MD5 c3a8d771c9846dd95b7283c7ce0f20dd phpMyAdmin-2.5.4-php.tar.bz2 1051651 diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.4 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.4 new file mode 100644 index 000000000000..147c07f721b8 --- /dev/null +++ b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.4 @@ -0,0 +1,84 @@ +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_info` ( + 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 '', + mimetype varchar(255) NOT NULL default '', + transformation varchar(255) NOT NULL default '', + transformation_options varchar(255) NOT NULL default '', + PRIMARY KEY (id), + UNIQUE KEY db_name (db_name, table_name, column_name) + ) TYPE=MyISAM COMMENT='Comments for Columns'; + +CREATE TABLE IF NOT EXISTS `PMA_history` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `username` VARCHAR( 64 ) NOT NULL , + `db` VARCHAR( 64 ) NOT NULL , + `table` VARCHAR( 64 ) NOT NULL , + `timevalue` TIMESTAMP NOT NULL , + `sqlquery` TEXT NOT NULL , + PRIMARY KEY ( `id` ) , + INDEX ( `username` , `db` , `table` , `timevalue` ) + ) TYPE=MyISAM COMMENT='SQL history'; diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild new file mode 100644 index 000000000000..756138140f32 --- /dev/null +++ b/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild,v 1.1 2003/10/22 15:40:47 twp Exp $ + +inherit eutils +inherit webapp-apache + +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}-php.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~arm ~ppc ~hppa ~mips ~sparc ~x86" +DEPEND=">=net-www/apache-1.3 + >=dev-db/mysql-3.21 <dev-db/mysql-5.0 + >=dev-php/mod_php-3.0.8 + sys-apps/findutils" +S=${WORKDIR}/${MY_P} + +webapp-detect || NO_WEBSERVER=1 + +pkg_setup() { + webapp-pkg_setup "${NO_WEBSERVER}" + einfo "Installing into ${ROOT}${HTTPD_ROOT}." +} + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/config.inc.php-${PV}.patch +} + +src_compile() { + 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-${PV} > ${T}/mysql-setup.sql +} + +src_install() { + + local DocumentRoot=${HTTPD_ROOT} + local destdir=${DocumentRoot}/phpmyadmin + local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO" + + # Copy everything + mkdir -p ${D}${destdir} + cp -r . ${D}${destdir} + # Remove documentation files + for doc in ${docs} INSTALL; do + rm -f ${D}${destdir}/${doc} + done + # Remove .cvs* files and CVS directories + find ${D}${destdir} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf + # Fix permissions + find ${D}${destdir} -type d | xargs chmod 755 + find ${D}${destdir} -type f | xargs chmod 644 + + dodoc ${docs} ChangeLog LICENSE README + + dosym /etc/phpmyadmin/config.inc.php ${destdir}/config.inc.php + insinto /etc/phpmyadmin + insopts -g apache -m 640 + doins config.inc.php + doins ${T}/mysql-setup.sql + +} + +pkg_postinst() { + einfo + einfo "To complete installation, you must" + einfo "1. Update your configuration files:" + einfo " etc-update" + einfo "2. Update MySQL's grant tables and the pmadb database:" + einfo " ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config" + einfo "3. Reload MySQL:" + einfo " /etc/init.d/mysql restart" + einfo + einfo "If you are upgrading from an earlier version and are using phpMyAdmin's" + einfo "features for master/foreign tables be sure to read" + einfo " http://localhost/phpmyadmin/Documentation.html#col_com" + einfo "You will need to perform the ALTER TABLE step yourself." + einfo + einfo "Finally, point your browser to http://localhost/phpmyadmin/." + einfo +} + +pkg_config() { + einfo "This will execute the contents of ${ROOT}etc/phpmyadmin/mysql-setup.sql" + einfo "Type in your MySQL root password:" + mysql -u root -p < ${ROOT}etc/phpmyadmin/mysql-setup.sql || die + einfo "You need to reload MySQL for the changes to take effect" +} |