Pullup ticket 2054 - requested by tron

security update for phpmyadmin

Revisions pulled up:
- pkgsrc/databases/phpmyadmin/Makefile			1.58
- pkgsrc/databases/phpmyadmin/PLIST			1.17
- pkgsrc/databases/phpmyadmin/distinfo			1.28

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Tue Mar 20 14:17:16 UTC 2007

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile PLIST distinfo

   Log Message:
   Update "phpmyadmin" package to version 2.10.0.2:
   - Fix for PMASA-2007-3 (PHP Executor Deep Recursion Stack Overflow)
   - New graphical relation manager, called Designer, available in
     database view

3 files changed, 122 insertions, 54 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 5ec0fd6cfcd..203bc722075 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56.2.1 2007/01/10 13:22:19 ghen Exp $
+# $NetBSD: Makefile,v 1.56.2.2 2007/03/20 15:27:51 salo Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -21,7 +21,7 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \
 USE_TOOLS+=	perl:run
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	2.9.2-rc1
+DIST_VERSION=	2.10.0.2
 DOC_FILES=	CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
@@ -46,8 +46,10 @@ NO_BUILD=		yes
 
 INSTALL_DIRS=	css js lang libraries libraries/auth libraries/dbg \
 		libraries/dbi libraries/engines libraries/export \
-		libraries/fpdf libraries/fpdf/font libraries/import \
-		libraries/transformations themes themes/darkblue_orange \
+		libraries/import libraries/tcpdf libraries/tcpdf/font \
+		libraries/transformations pmd pmd/images pmd/scripts \
+		pmd/styles pmd/styles/default pmd/styles/default/images \
+		themes themes/darkblue_orange \
 		themes/darkblue_orange/css themes/darkblue_orange/img \
 		themes/original themes/original/css themes/original/img
 
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 951b7feb062..1d466fdd46f 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/10/14 11:22:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.16.2.1 2007/03/20 15:27:51 salo Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -20,15 +20,14 @@ share/phpmyadmin/css/phpmyadmin.css.php
 share/phpmyadmin/css/print.css
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
-share/phpmyadmin/db_details.php
-share/phpmyadmin/db_details_export.php
-share/phpmyadmin/db_details_importdocsql.php
-share/phpmyadmin/db_details_qbe.php
-share/phpmyadmin/db_details_structure.php
+share/phpmyadmin/db_export.php
 share/phpmyadmin/db_import.php
 share/phpmyadmin/db_operations.php
 share/phpmyadmin/db_printview.php
+share/phpmyadmin/db_qbe.php
 share/phpmyadmin/db_search.php
+share/phpmyadmin/db_sql.php
+share/phpmyadmin/db_structure.php
 share/phpmyadmin/docs.css
 share/phpmyadmin/error.php
 share/phpmyadmin/export.php
@@ -38,6 +37,7 @@ share/phpmyadmin/js/dom-drag.js
 share/phpmyadmin/js/functions.js
 share/phpmyadmin/js/indexes.js
 share/phpmyadmin/js/keyhandler.js
+share/phpmyadmin/js/navigation.js
 share/phpmyadmin/js/querywindow.js
 share/phpmyadmin/js/server_privileges.js
 share/phpmyadmin/js/tbl_change.js
@@ -160,25 +160,27 @@ share/phpmyadmin/lang/turkish-iso-8859-9.inc.php
 share/phpmyadmin/lang/turkish-utf-8.inc.php
 share/phpmyadmin/lang/ukrainian-utf-8.inc.php
 share/phpmyadmin/lang/ukrainian-windows-1251.inc.php
-share/phpmyadmin/left.php
 share/phpmyadmin/libraries/Config.class.php
+share/phpmyadmin/libraries/PMA_List.class.php
+share/phpmyadmin/libraries/PMA_List_Database.class.php
 share/phpmyadmin/libraries/Table.class.php
 share/phpmyadmin/libraries/Theme.class.php
 share/phpmyadmin/libraries/Theme_Manager.class.php
 share/phpmyadmin/libraries/auth/config.auth.lib.php
 share/phpmyadmin/libraries/auth/cookie.auth.lib.php
 share/phpmyadmin/libraries/auth/http.auth.lib.php
+share/phpmyadmin/libraries/auth/signon.auth.lib.php
 share/phpmyadmin/libraries/blowfish.php
 share/phpmyadmin/libraries/bookmark.lib.php
 share/phpmyadmin/libraries/charset_conversion.lib.php
 share/phpmyadmin/libraries/check_user_privileges.lib.php
+share/phpmyadmin/libraries/cleanup.lib.php
 share/phpmyadmin/libraries/common.lib.php
 share/phpmyadmin/libraries/config.default.php
 share/phpmyadmin/libraries/database_interface.lib.php
-share/phpmyadmin/libraries/db_config.lib.php
-share/phpmyadmin/libraries/db_details_common.inc.php
-share/phpmyadmin/libraries/db_details_db_info.inc.php
-share/phpmyadmin/libraries/db_details_links.inc.php
+share/phpmyadmin/libraries/db_common.inc.php
+share/phpmyadmin/libraries/db_info.inc.php
+share/phpmyadmin/libraries/db_links.inc.php
 share/phpmyadmin/libraries/db_table_exists.lib.php
 share/phpmyadmin/libraries/dbg/setup.php
 share/phpmyadmin/libraries/dbi/mysql.dbi.lib.php
@@ -213,28 +215,6 @@ share/phpmyadmin/libraries/export/xls.php
 share/phpmyadmin/libraries/export/xml.php
 share/phpmyadmin/libraries/file_listing.php
 share/phpmyadmin/libraries/footer.inc.php
-share/phpmyadmin/libraries/fpdf/README
-share/phpmyadmin/libraries/fpdf/font/FreeSans.ctg.z
-share/phpmyadmin/libraries/fpdf/font/FreeSans.php
-share/phpmyadmin/libraries/fpdf/font/FreeSans.z
-share/phpmyadmin/libraries/fpdf/font/FreeSansBold.ctg.z
-share/phpmyadmin/libraries/fpdf/font/FreeSansBold.php
-share/phpmyadmin/libraries/fpdf/font/FreeSansBold.z
-share/phpmyadmin/libraries/fpdf/font/courier.php
-share/phpmyadmin/libraries/fpdf/font/helvetica.php
-share/phpmyadmin/libraries/fpdf/font/helveticab.php
-share/phpmyadmin/libraries/fpdf/font/helveticabi.php
-share/phpmyadmin/libraries/fpdf/font/helveticai.php
-share/phpmyadmin/libraries/fpdf/font/symbol.php
-share/phpmyadmin/libraries/fpdf/font/tahoma.php
-share/phpmyadmin/libraries/fpdf/font/tahomab.php
-share/phpmyadmin/libraries/fpdf/font/times.php
-share/phpmyadmin/libraries/fpdf/font/timesb.php
-share/phpmyadmin/libraries/fpdf/font/timesbi.php
-share/phpmyadmin/libraries/fpdf/font/timesi.php
-share/phpmyadmin/libraries/fpdf/font/zapfdingbats.php
-share/phpmyadmin/libraries/fpdf/fpdf.php
-share/phpmyadmin/libraries/fpdf/ufpdf.php
 share/phpmyadmin/libraries/get_foreign.lib.php
 share/phpmyadmin/libraries/grab_globals.lib.php
 share/phpmyadmin/libraries/header.inc.php
@@ -245,20 +225,22 @@ share/phpmyadmin/libraries/iconv_wrapper.lib.php
 share/phpmyadmin/libraries/import.lib.php
 share/phpmyadmin/libraries/import/README
 share/phpmyadmin/libraries/import/csv.php
+share/phpmyadmin/libraries/import/docsql.php
 share/phpmyadmin/libraries/import/ldi.php
 share/phpmyadmin/libraries/import/sql.php
 share/phpmyadmin/libraries/information_schema_relations.lib.php
 share/phpmyadmin/libraries/ip_allow_deny.lib.php
+share/phpmyadmin/libraries/js_escape.lib.php
 share/phpmyadmin/libraries/kanji-encoding.lib.php
 share/phpmyadmin/libraries/language.lib.php
-share/phpmyadmin/libraries/left_header.inc.php
 share/phpmyadmin/libraries/mcrypt.lib.php
 share/phpmyadmin/libraries/mult_submits.inc.php
 share/phpmyadmin/libraries/mysql_charsets.lib.php
+share/phpmyadmin/libraries/navigation_header.inc.php
 share/phpmyadmin/libraries/ob.lib.php
 share/phpmyadmin/libraries/opendocument.lib.php
+share/phpmyadmin/libraries/parse_analyze.lib.php
 share/phpmyadmin/libraries/plugin_interface.lib.php
-share/phpmyadmin/libraries/read_dump.lib.php
 share/phpmyadmin/libraries/relation.lib.php
 share/phpmyadmin/libraries/relation_cleanup.lib.php
 share/phpmyadmin/libraries/sanitizing.lib.php
@@ -274,12 +256,31 @@ share/phpmyadmin/libraries/sqlvalidator.class.php
 share/phpmyadmin/libraries/sqlvalidator.lib.php
 share/phpmyadmin/libraries/storage_engines.lib.php
 share/phpmyadmin/libraries/string.lib.php
+share/phpmyadmin/libraries/tbl_common.php
 share/phpmyadmin/libraries/tbl_indexes.lib.php
+share/phpmyadmin/libraries/tbl_info.inc.php
+share/phpmyadmin/libraries/tbl_links.inc.php
 share/phpmyadmin/libraries/tbl_properties.inc.php
-share/phpmyadmin/libraries/tbl_properties_common.php
-share/phpmyadmin/libraries/tbl_properties_links.inc.php
-share/phpmyadmin/libraries/tbl_properties_table_info.inc.php
 share/phpmyadmin/libraries/tbl_replace_fields.inc.php
+share/phpmyadmin/libraries/tcpdf/CHANGELOG
+share/phpmyadmin/libraries/tcpdf/LICENSE
+share/phpmyadmin/libraries/tcpdf/README
+share/phpmyadmin/libraries/tcpdf/font/LICENSE
+share/phpmyadmin/libraries/tcpdf/font/README
+share/phpmyadmin/libraries/tcpdf/font/dejavusans-bold.ctg.z
+share/phpmyadmin/libraries/tcpdf/font/dejavusans-bold.php
+share/phpmyadmin/libraries/tcpdf/font/dejavusans-bold.z
+share/phpmyadmin/libraries/tcpdf/font/dejavusans.ctg.z
+share/phpmyadmin/libraries/tcpdf/font/dejavusans.php
+share/phpmyadmin/libraries/tcpdf/font/dejavusans.z
+share/phpmyadmin/libraries/tcpdf/font/dejavuserif-bold.ctg.z
+share/phpmyadmin/libraries/tcpdf/font/dejavuserif-bold.php
+share/phpmyadmin/libraries/tcpdf/font/dejavuserif-bold.z
+share/phpmyadmin/libraries/tcpdf/font/dejavuserif.ctg.z
+share/phpmyadmin/libraries/tcpdf/font/dejavuserif.php
+share/phpmyadmin/libraries/tcpdf/font/dejavuserif.z
+share/phpmyadmin/libraries/tcpdf/html_entity_decode_php4.php
+share/phpmyadmin/libraries/tcpdf/tcpdf.php
 share/phpmyadmin/libraries/transformations.lib.php
 share/phpmyadmin/libraries/transformations/README
 share/phpmyadmin/libraries/transformations/TEMPLATE
@@ -302,9 +303,68 @@ share/phpmyadmin/libraries/url_generating.lib.php
 share/phpmyadmin/libraries/zip.lib.php
 share/phpmyadmin/license.php
 share/phpmyadmin/main.php
+share/phpmyadmin/navigation.php
 share/phpmyadmin/pdf_pages.php
 share/phpmyadmin/pdf_schema.php
 share/phpmyadmin/phpinfo.php
+share/phpmyadmin/pmd/images/2leftarrow.png
+share/phpmyadmin/pmd/images/2leftarrow_m.png
+share/phpmyadmin/pmd/images/2rightarrow.png
+share/phpmyadmin/pmd/images/2rightarrow_m.png
+share/phpmyadmin/pmd/images/ang_direct.png
+share/phpmyadmin/pmd/images/bord.png
+share/phpmyadmin/pmd/images/bottom.png
+share/phpmyadmin/pmd/images/def.png
+share/phpmyadmin/pmd/images/display_field.png
+share/phpmyadmin/pmd/images/downarrow1.png
+share/phpmyadmin/pmd/images/downarrow2.png
+share/phpmyadmin/pmd/images/downarrow2_m.png
+share/phpmyadmin/pmd/images/exec.png
+share/phpmyadmin/pmd/images/exec_small.png
+share/phpmyadmin/pmd/images/favicon.ico
+share/phpmyadmin/pmd/images/grid.png
+share/phpmyadmin/pmd/images/help.png
+share/phpmyadmin/pmd/images/help_relation.png
+share/phpmyadmin/pmd/images/pdf.png
+share/phpmyadmin/pmd/images/relation.png
+share/phpmyadmin/pmd/images/reload.png
+share/phpmyadmin/pmd/images/resize.png
+share/phpmyadmin/pmd/images/rightarrow1.png
+share/phpmyadmin/pmd/images/rightarrow2.png
+share/phpmyadmin/pmd/images/save.png
+share/phpmyadmin/pmd/images/table.png
+share/phpmyadmin/pmd/images/uparrow2_m.png
+share/phpmyadmin/pmd/scripts/ajax.js
+share/phpmyadmin/pmd/scripts/iecanvas.js
+share/phpmyadmin/pmd/scripts/move.js
+share/phpmyadmin/pmd/styles/default/images/1.png
+share/phpmyadmin/pmd/styles/default/images/2.png
+share/phpmyadmin/pmd/styles/default/images/3.png
+share/phpmyadmin/pmd/styles/default/images/4.png
+share/phpmyadmin/pmd/styles/default/images/5.png
+share/phpmyadmin/pmd/styles/default/images/6.png
+share/phpmyadmin/pmd/styles/default/images/7.png
+share/phpmyadmin/pmd/styles/default/images/8.png
+share/phpmyadmin/pmd/styles/default/images/FieldKey_small.png
+share/phpmyadmin/pmd/styles/default/images/Field_small.png
+share/phpmyadmin/pmd/styles/default/images/Field_small_char.png
+share/phpmyadmin/pmd/styles/default/images/Field_small_date.png
+share/phpmyadmin/pmd/styles/default/images/Field_small_int.png
+share/phpmyadmin/pmd/styles/default/images/Header.png
+share/phpmyadmin/pmd/styles/default/images/Header_Linked.png
+share/phpmyadmin/pmd/styles/default/images/left_panel_butt.png
+share/phpmyadmin/pmd/styles/default/images/left_panel_tab.png
+share/phpmyadmin/pmd/styles/default/images/small_tab.png
+share/phpmyadmin/pmd/styles/default/images/top_panel.png
+share/phpmyadmin/pmd/styles/default/style1.css
+share/phpmyadmin/pmd_common.php
+share/phpmyadmin/pmd_display_field.php
+share/phpmyadmin/pmd_general.php
+share/phpmyadmin/pmd_help.php
+share/phpmyadmin/pmd_pdf.php
+share/phpmyadmin/pmd_relation_new.php
+share/phpmyadmin/pmd_relation_upd.php
+share/phpmyadmin/pmd_save_pos.php
 share/phpmyadmin/querywindow.php
 share/phpmyadmin/readme.php
 share/phpmyadmin/scripts/convertcfg.pl
@@ -328,21 +388,20 @@ share/phpmyadmin/tbl_addfield.php
 share/phpmyadmin/tbl_alter.php
 share/phpmyadmin/tbl_change.php
 share/phpmyadmin/tbl_create.php
+share/phpmyadmin/tbl_export.php
 share/phpmyadmin/tbl_import.php
 share/phpmyadmin/tbl_indexes.php
 share/phpmyadmin/tbl_move_copy.php
+share/phpmyadmin/tbl_operations.php
 share/phpmyadmin/tbl_printview.php
-share/phpmyadmin/tbl_properties.php
-share/phpmyadmin/tbl_properties_export.php
-share/phpmyadmin/tbl_properties_operations.php
-share/phpmyadmin/tbl_properties_structure.php
 share/phpmyadmin/tbl_relation.php
 share/phpmyadmin/tbl_replace.php
 share/phpmyadmin/tbl_row_action.php
 share/phpmyadmin/tbl_select.php
+share/phpmyadmin/tbl_sql.php
+share/phpmyadmin/tbl_structure.php
 share/phpmyadmin/themes.php
 share/phpmyadmin/themes/darkblue_orange/css/theme_right.css.php
-share/phpmyadmin/themes/darkblue_orange/img/window-new.png
 share/phpmyadmin/themes/darkblue_orange/img/arrow_ltr.png
 share/phpmyadmin/themes/darkblue_orange/img/arrow_rtl.png
 share/phpmyadmin/themes/darkblue_orange/img/asc_order.png
@@ -456,13 +515,13 @@ share/phpmyadmin/themes/darkblue_orange/img/s_warn.png
 share/phpmyadmin/themes/darkblue_orange/img/spacer.png
 share/phpmyadmin/themes/darkblue_orange/img/tbl_header.png
 share/phpmyadmin/themes/darkblue_orange/img/tbl_th.png
+share/phpmyadmin/themes/darkblue_orange/img/window-new.png
 share/phpmyadmin/themes/darkblue_orange/info.inc.php
 share/phpmyadmin/themes/darkblue_orange/layout.inc.php
 share/phpmyadmin/themes/darkblue_orange/screen.png
 share/phpmyadmin/themes/original/css/theme_left.css.php
 share/phpmyadmin/themes/original/css/theme_print.css.php
 share/phpmyadmin/themes/original/css/theme_right.css.php
-share/phpmyadmin/themes/original/img/window-new.png
 share/phpmyadmin/themes/original/img/arrow_ltr.png
 share/phpmyadmin/themes/original/img/arrow_rtl.png
 share/phpmyadmin/themes/original/img/asc_order.png
@@ -575,6 +634,7 @@ share/phpmyadmin/themes/original/img/s_views.png
 share/phpmyadmin/themes/original/img/s_warn.png
 share/phpmyadmin/themes/original/img/spacer.png
 share/phpmyadmin/themes/original/img/vertical_line.png
+share/phpmyadmin/themes/original/img/window-new.png
 share/phpmyadmin/themes/original/info.inc.php
 share/phpmyadmin/themes/original/layout.inc.php
 share/phpmyadmin/themes/original/screen.png
@@ -590,10 +650,16 @@ share/phpmyadmin/user_password.php
 @dirrm share/phpmyadmin/themes/darkblue_orange
 @dirrm share/phpmyadmin/themes
 @dirrm share/phpmyadmin/scripts
+@dirrm share/phpmyadmin/pmd/styles/default/images
+@dirrm share/phpmyadmin/pmd/styles/default
+@dirrm share/phpmyadmin/pmd/styles
+@dirrm share/phpmyadmin/pmd/scripts
+@dirrm share/phpmyadmin/pmd/images
+@dirrm share/phpmyadmin/pmd
 @dirrm share/phpmyadmin/libraries/transformations
+@dirrm share/phpmyadmin/libraries/tcpdf/font
+@dirrm share/phpmyadmin/libraries/tcpdf
 @dirrm share/phpmyadmin/libraries/import
-@dirrm share/phpmyadmin/libraries/fpdf/font
-@dirrm share/phpmyadmin/libraries/fpdf
 @dirrm share/phpmyadmin/libraries/export
 @dirrm share/phpmyadmin/libraries/engines
 @dirrm share/phpmyadmin/libraries/dbi
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 0485783e2b4..fad3ade3d7b 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26.2.1 2007/01/10 13:22:19 ghen Exp $
+$NetBSD: distinfo,v 1.26.2.2 2007/03/20 15:27:51 salo Exp $
 
-SHA1 (phpMyAdmin-2.9.2-rc1-all-languages.tar.bz2) = 9f7384dbdf4a89d18198c147ccb135668044468d
-RMD160 (phpMyAdmin-2.9.2-rc1-all-languages.tar.bz2) = dfda0cb145b5ec8f7f3cc20090224bd903b5c72d
-Size (phpMyAdmin-2.9.2-rc1-all-languages.tar.bz2) = 2352924 bytes
+SHA1 (phpMyAdmin-2.10.0.2-all-languages.tar.bz2) = 004bd9b3d86b5ced31671b780fba656c59678cee
+RMD160 (phpMyAdmin-2.10.0.2-all-languages.tar.bz2) = 432f8c4e2b7b3f36a0994182f1bd90401c807db3
+Size (phpMyAdmin-2.10.0.2-all-languages.tar.bz2) = 3020505 bytes