Pullup ticket 722 - requested by Adrian Portelli

security update for phpmyadmin

Revisions pulled up:
- pkgsrc/databases/phpmyadmin/Makefile		1.33
- pkgsrc/databases/phpmyadmin/PLIST		1.11
- pkgsrc/databases/phpmyadmin/distinfo		1.13

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Mon Aug 29 17:09:31 UTC 2005

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

   Log Message:
   Update to 2.6.4-rc1
   Security fix for two XSS security issues
   Lots of other changes, a brief summary includes:
   > Improvements:
   > Foreign-key dropdowns can be more customized
   > Export: configurable filename templates
   > Display column comments while editing data
   > Transformations: new hexadecimal mode
   > HTTP auth: support FastCGI
   > Themes: can now have different theme per server
   > OLD_PASSWORD in the list of functions
   > Better messages when checking numerical input
   > Allow adding DROP TABLE when copying databases
   > Better support of information_schema
   > Various interface CSS improvements
   > Tree subgroups in left panel database selector
   > Documentation: links and anchors to every FAQ item
   > Table comments move to page header
   > Export: configurable default charset
   > Removed warning about PmaAbsoluteUri not set
   > Fixes:
   > Database search in MySQL 5.0.x on fields without a charset
   > Invalid "normal" cursor style
   > Browsing state when deleting multiple rows
   > Support bigger queries in print view, insert row, export results
   > Unsaved changes to relations were lost when changing display field
   > Exporting under IE 6 (Windows XP SP2)
   > Better catching of parse errors in config file
   > XSS on the cookie-based login panel
   > Show all while browsing foreign values
   > Escaping of special characters in ENUM or SET
   > XSS on table creation page
   > Using mysqli extension with MySQL 4.0.x
   > "empty result set" message was sometimes not returned
   > Incorrect message "You should define a primary key"
   > Abide cfg['Lang'] settings even if using MySQL > 4.1.x

3 files changed, 22 insertions, 7 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index a513510f28b..67313e17dda 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/20 22:18:13 jlam Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2005/08/29 21:11:32 salo Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -19,7 +19,7 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \
 		PMDIR=${PMDIR} EXDIR=${EXDIR}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	2.6.2-rc1
+DIST_VERSION=	2.6.4-rc1
 DOC_FILES=	CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index f7a0f21f611..0ed065f7ae2 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/04/04 12:55:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.10.2.1 2005/08/29 21:11:32 salo Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -35,6 +35,7 @@ share/phpmyadmin/db_operations.php
 share/phpmyadmin/db_printview.php
 share/phpmyadmin/db_search.php
 share/phpmyadmin/docs.css
+share/phpmyadmin/error.php
 share/phpmyadmin/export.php
 share/phpmyadmin/footer.inc.php
 share/phpmyadmin/header.inc.php
@@ -50,6 +51,9 @@ share/phpmyadmin/lang/azerbaijani-iso-8859-9.inc.php
 share/phpmyadmin/lang/azerbaijani-utf-8.inc.php
 share/phpmyadmin/lang/basque-iso-8859-1.inc.php
 share/phpmyadmin/lang/basque-utf-8.inc.php
+share/phpmyadmin/lang/belarusian_cyrillic-utf-8.inc.php
+share/phpmyadmin/lang/belarusian_cyrillic-windows-1251.inc.php
+share/phpmyadmin/lang/belarusian_latin-utf-8.inc.php
 share/phpmyadmin/lang/bosnian-utf-8.inc.php
 share/phpmyadmin/lang/bosnian-windows-1250.inc.php
 share/phpmyadmin/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -75,6 +79,7 @@ share/phpmyadmin/lang/dutch-iso-8859-1.inc.php
 share/phpmyadmin/lang/dutch-iso-8859-15.inc.php
 share/phpmyadmin/lang/dutch-utf-8.inc.php
 share/phpmyadmin/lang/english-iso-8859-1.inc.php
+share/phpmyadmin/lang/english-iso-8859-15.inc.php
 share/phpmyadmin/lang/english-utf-8.inc.php
 share/phpmyadmin/lang/estonian-iso-8859-1.inc.php
 share/phpmyadmin/lang/estonian-utf-8.inc.php
@@ -113,6 +118,7 @@ share/phpmyadmin/lang/lithuanian-utf-8.inc.php
 share/phpmyadmin/lang/lithuanian-windows-1257.inc.php
 share/phpmyadmin/lang/malay-iso-8859-1.inc.php
 share/phpmyadmin/lang/malay-utf-8.inc.php
+share/phpmyadmin/lang/mongolian-utf-8.inc.php
 share/phpmyadmin/lang/norwegian-iso-8859-1.inc.php
 share/phpmyadmin/lang/norwegian-utf-8.inc.php
 share/phpmyadmin/lang/persian-utf-8.inc.php
@@ -144,12 +150,15 @@ share/phpmyadmin/lang/spanish-iso-8859-15.inc.php
 share/phpmyadmin/lang/spanish-utf-8.inc.php
 share/phpmyadmin/lang/swedish-iso-8859-1.inc.php
 share/phpmyadmin/lang/swedish-utf-8.inc.php
+share/phpmyadmin/lang/tatarish-iso-8859-9.inc.php
+share/phpmyadmin/lang/tatarish-utf-8.inc.php
 share/phpmyadmin/lang/thai-tis-620.inc.php
 share/phpmyadmin/lang/thai-utf-8.inc.php
 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/license.php
 share/phpmyadmin/ldi_check.php
 share/phpmyadmin/ldi_table.php
 share/phpmyadmin/left.php
@@ -159,6 +168,7 @@ share/phpmyadmin/libraries/auth/http.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/common.lib.php
 share/phpmyadmin/libraries/config_import.lib.php
 share/phpmyadmin/libraries/database_interface.lib.php
@@ -169,6 +179,7 @@ share/phpmyadmin/libraries/dbg/setup.php
 share/phpmyadmin/libraries/dbi/mysql.dbi.lib.php
 share/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php
 share/phpmyadmin/libraries/defines.lib.php
+share/phpmyadmin/libraries/display_create_database.lib.php
 share/phpmyadmin/libraries/display_export.lib.php
 share/phpmyadmin/libraries/display_tbl.lib.php
 share/phpmyadmin/libraries/display_tbl_links.lib.php
@@ -219,6 +230,7 @@ share/phpmyadmin/libraries/ob.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
 share/phpmyadmin/libraries/select_lang.lib.php
 share/phpmyadmin/libraries/select_server.lib.php
 share/phpmyadmin/libraries/select_theme.lib.php
@@ -238,6 +250,7 @@ share/phpmyadmin/libraries/transformations/README
 share/phpmyadmin/libraries/transformations/TEMPLATE
 share/phpmyadmin/libraries/transformations/TEMPLATE_MIMETYPE
 share/phpmyadmin/libraries/transformations/application_octetstream__download.inc.php
+share/phpmyadmin/libraries/transformations/application_octetstream__hex.inc.php
 share/phpmyadmin/libraries/transformations/global.inc.php
 share/phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php
 share/phpmyadmin/libraries/transformations/image_jpeg__link.inc.php
@@ -260,6 +273,7 @@ share/phpmyadmin/phpinfo.php
 share/phpmyadmin/queryframe.php
 share/phpmyadmin/querywindow.php
 share/phpmyadmin/read_dump.php
+share/phpmyadmin/readme.php
 share/phpmyadmin/scripts/convertcfg.pl
 share/phpmyadmin/scripts/create_tables.sql
 share/phpmyadmin/scripts/create_tables_mysql_4_1_2+.sql
@@ -509,6 +523,7 @@ share/phpmyadmin/themes/original/img/dot_green.png
 share/phpmyadmin/themes/original/img/dot_red.png
 share/phpmyadmin/themes/original/img/dot_violet.png
 share/phpmyadmin/themes/original/img/dot_yellow.png
+share/phpmyadmin/themes/original/img/error.ico
 share/phpmyadmin/themes/original/img/frm_linevrlt.png
 share/phpmyadmin/themes/original/img/item.png
 share/phpmyadmin/themes/original/img/item_ltr.png
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 8a05c3c9f86..8eb8f404d9b 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/04/04 12:55:16 tron Exp $
+$NetBSD: distinfo,v 1.12.2.1 2005/08/29 21:11:32 salo Exp $
 
-SHA1 (phpMyAdmin-2.6.2-rc1.tar.bz2) = 2bf06bad9546fc9403c79ee0540ad0bb3fcfd016
-RMD160 (phpMyAdmin-2.6.2-rc1.tar.bz2) = 8c31c76c753a474d4478cfe6491b6f6637929921
-Size (phpMyAdmin-2.6.2-rc1.tar.bz2) = 1638568 bytes
+SHA1 (phpMyAdmin-2.6.4-rc1.tar.bz2) = 64350681ca04a19e1ab68780ab4904fa9717b0ba
+RMD160 (phpMyAdmin-2.6.4-rc1.tar.bz2) = 482059d0073636f204056bf5ea44dc28b0136696
+Size (phpMyAdmin-2.6.4-rc1.tar.bz2) = 1728180 bytes