- Update from 2.6.1-rc1 to 2.6.1-pl1

- Addresses known security issues as well as numerious other changes
- ok'ed tron@

> ----------------------
> phpMyAdmin - Changelog
> ----------------------
>
> $Id: ChangeLog,v 2.871.2.21 2005/02/24 01:20:35 lem9 Exp $
> $Source: /cvsroot/phpmyadmin/phpMyAdmin/ChangeLog,v $
>
> 2005-02-23 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/auth/cookie.auth.lib.php: bug1149373, error when
>       blowfish_secret is empty
>     ### 2.6.1-pl1 released
>
> 2005-02-23 Alexander M. Turek  <me (at) derrabus.de>
>     * libraries/grab_globals.lib.php: More hotfixes against bug1149381.
>     * libraries/mysql_charsets.lib.php: Detection for new Japanese charsets
>       (cp932 and eucjpms) that will be introduced with MySQL 5.0.3.
>
> 2005-02-22 Alexander M. Turek  <me (at) derrabus.de>
>     * libraries/grab_globals.lib.php: Hotfix against bug1149381 and parts
>       of bug1149383.
>
> 2005-02-07 Alexander M. Turek  <me (at) derrabus.de>
>     * libraries/mcrypt.lib.php: bug1117907 ("wrong parameter count" with
>       php 4.1.x).
>
> 2005-02-03 Alexander M. Turek  <me (at) derrabus.de>
>     * tbl_addfield.php: bug1040682 (adding field with collation).
>
> 2005-01-29 Alexander M. Turek  <me (at) derrabus.de>
>     * lang/japanese-utf-8.inc.php: bug1111855 ("Undefined index" when using
>       the Janapese language file under MySQL 4.1.
>
> 2005-01-28 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/dbi/mysqli.dbi.lib.php: bug1111706, call to undefined
>       function PMA_reloadNavigation(). A failed connection was not properly
>       detected
>
> 2005-01-23 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * tbl_query_box.php: bug1107937, undefined $fields_list
>     * lang/estonian: Update thanks to Alvar Soome - finsoft.
>     ### 2.6.1 released
>
> 2005-01-23 Michal Cihar  <michal (at) cihar.com>
>     * export.php: Back to Content-Type application/x-bzip2 on bzip2 export
>       (bug1106652).
>
> 2005-01-23 Alexander M. Turek  <me (at) derrabus.de>
>     * libraries/sqlparser.data.php: Added some keywords.
>
> 2005-01-22 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/bookmark.lib.php: bug1103289, num_rows and MYSQL_USE_RESULT,
>       and fix a typo "boommark"
>     * lang/galician: Updated, thanks to Xosé Calvo.
>     * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
>
> 2005-01-17 Michal Cihar  <michal (at) cihar.com>
>     * lang/czech: Fix typos (translation1103785).
>
> 2005-01-16 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/common.lib.php: bug1103201, wrong treatment of MySQL error
>       1060 in the logic for error 1062
>
> 2005-01-11 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/dbi/mysqli.dbi.lib.php: bug1076213, headers sent
>       on invalid login
>
> 2005-01-10 Michal Cihar  <michal (at) cihar.com>
>     * lang/czech: Fix typo (translation1099459).
>
> 2005-01-10 Olivier Mueller <om (at) omnis.ch>
>     * README: copyright, we're in 2005
>
> 2005-01-09 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * lang/danish: Updated, thanks to AlleyKat - dk_alleykat.
>     * lang/catalan update, thanks to Xavier Navarro (xavin).
>     * lang/japanese: updated, thanks to Tadashi Jokagi (elf2000)
>     * lang/dutch: Updates, thanks to Ivo Teel.
>     * lang/indonesian: Update thanks to Rachim Tamsjadi - tamsy.
>     * lang/galician: Updated, thanks to Xosé Calvo.
>     * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
>     ### 2.6.1-rc2 released
>
> 2005-01-07 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * tbl_addfield.php: bug1082680, undefined $field_charset when adding
>       a FLOAT field in MySQL 4.1.x
>
> 2005-01-07 Michal Cihar  <michal (at) cihar.com>
>     * Documentation.html, tbl_change.php, tbl_properties.inc.php,
>       libraries/functions.js, libraries/tbl_change.js,
>       libraries/keyhandler.js: Use Option key for Safari for moving (bug
>       1094137), move key handler function to separate file so we have only
>       one, make movement work correctly in vertical display of properties.
>     * libraries/common.lib.php: Fix timestamp in uva condition with MySQL 4.1
>       (bug1097593).
>
> 2005-01-06 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * tbl_change.php: removed old PHP3-workaround that caused problems
>       with field names like '000'
>
> 2005-01-05 Michal Cihar  <michal (at) cihar.com>
>     * tbl_properties_operations.php: Fix changning table parameters if it has
>       no auto increment (bug1096246).
>
> 2005-01-04 Alexander M. Turek  <me (at) derrabus.de>
>     * lang/german-*.inc.php:
>       - Updates and small corrections;
>       - Synchronized translation with the German MySQL documentation.
>
> 2005-01-03 Michal Cihar  <michal (at) cihar.com>
>     * export.php: Use standardised mime types and use content encoding for
>       gzip/bzip2. I hope this will fix double gzip compression as in bug
>       1094649.
>
> 2005-01-01 Michal Cihar  <michal (at) cihar.com>
>     * tbl_alter.php: Don't try to set collation for non text fields (bug
>       1094109).
>     * sql.php: Do not forget reloading when launching multiple queries (bug
>       1090818).
>
> 2004-12-30 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * lang/swedish: Updated, thanks to Björn T. Hallberg (bth).
>     * lang/norwegian: Update, thanks to Sven-Erik Andersen
>     * lang/latvian: Updated, thanks to Sandis Jerics (saaa2002).
>
> 2004-12-30 Michal Cihar  <michal (at) cihar.com>
>     * libraries/fpdf/ufpdf.php: Fix some warnings.
>
> 2004-12-29 Michal Cihar  <michal (at) cihar.com>
>     * libraries/export/sql.php: Fix typo.
>     * server_databases.php: Use same sort order as in left frame (bug
>       1087244), allow sorting even if not showing stats.
>     * pdf_schema.php, libraries/fpdf/fpdf.php, libraries/fpdf/ufpdf.php,
>       libraries/fpdf/font/FreeSans*: Added support for PDF output in utf-8,
>       uses UFPDF class from http://www.acko.net/node/56. NOTE: We now have a
>       bit modified FPDF class. (bug1046051)
>     * Documentation.html: Added info about UFPDF library.
>     * lang/czech, lang/english: Improved some texts, also bug1009667.
>
> 2004-12-28 Michal Cihar  <michal (at) cihar.com>
>     * libraries/tbl_move_copy.php: Fix constraints copying (bug1085900).
>     * config.inc.php, lang/*, libraries/common.lib.php,
>       libraries/config_import.lib.php, libraries/display_export.lib.php,
>       libraries/export/sql.php: Support for selecting SQL export compatibility
>       (RFE1060040).
>     * libraries/tbl_change.js: Faster navigation in calendar (RFE1090315).
>     * mult_submits.inc.php, tbl_row_delete.php: Fix % escaping (bug1082954).
>     * read_dump.php: Fix database name extraction from use statement (bug
>       1084777).
>     * css/phpmyadmin.css.php, libraries/common.lib.php: Disabled theme manager
>       still allows to select theme in configuration (bug1084712).
>     * tbl_replace.php: Remove unused code.
>     * main.php, lang/*, libraries/string.lib.php: Added warnings about
>       mbstring - one to disable function overloading and one for requesting
>       mbstring for multibyte charsets (bugs 1063149 and 1063821).
>     * tbl_change.php, tbl_replace.php, lang/*, libraries/common.lib.php:
>       Support for editing next entry (when numeric primary key) (RFE1074906).
>
> 2004-12-26 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/database_interface.lib.php: bug1085647, wrong parameters
>       for strpos(), thanks to Meithar - meithar
>     * libraries/select_server.lib.php, bug1073056, unable to submit selected server,
>       thanks to jamaz - jamaz
>     * tbl_change.php: bug1090608, undefined variable, thanks to peterinsb
>     * scripts/upgrade_tables_mysql_4_1_2+.sql: bug1084426, misleading comments
>     * tbl_create.php: bug1085494, illegal length value for LONGTEXT, thanks to mjec
>
> 2004-12-16 Marc Delisle  <lem9 (at) users.sourceforge.net>
>     * libraries/blowfish.php: bug1085997, undefined variables,
>       patch thanks to Chandrakumar Muthaiah - sudhach
>
> 2004-12-14 Alexander M. Turek  <me (at) derrabus.de>
>     * libraries/sqlparser.data.php: Added keywords NAMES and VIEW.
>
> 2004-12-13 Michal Cihar  <michal (at) cihar.com>
>     * libraries/tbl_change.js: Do not catch Alt and Shift keys (bug1082315).
>     * libraries/export/sql.php: Do not duplicate constraints when exporting
>       multiple databases (bug1084459).

3 files changed, 15 insertions, 7 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index e33d74b313b..73f03af1175 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/12/16 23:30:05 jdolecek Exp $
+# $NetBSD: Makefile,v 1.26 2005/02/24 17:26:03 adrianp Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -18,7 +18,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.1-rc1
+DIST_VERSION=	2.6.1-pl1
 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 f9336c27b60..4388175c3c5 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/12/14 20:38:47 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/02/24 17:26:03 adrianp Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -170,6 +170,12 @@ share/phpmyadmin/libraries/export/sql.php
 share/phpmyadmin/libraries/export/xls.php
 share/phpmyadmin/libraries/export/xml.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
@@ -184,6 +190,7 @@ 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/functions.js
 share/phpmyadmin/libraries/get_foreign.lib.php
 share/phpmyadmin/libraries/grab_globals.lib.php
@@ -192,6 +199,7 @@ share/phpmyadmin/libraries/header_meta_style.inc.php
 share/phpmyadmin/libraries/indexes.js
 share/phpmyadmin/libraries/ip_allow_deny.lib.php
 share/phpmyadmin/libraries/kanji-encoding.lib.php
+share/phpmyadmin/libraries/keyhandler.js
 share/phpmyadmin/libraries/left.js
 share/phpmyadmin/libraries/mcrypt.lib.php
 share/phpmyadmin/libraries/mysql_charsets.lib.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index f6e73a6d7af..14c1c117e2a 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 16:33:08 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/02/24 17:26:03 adrianp Exp $
 
-SHA1 (phpMyAdmin-2.6.1-rc1.tar.bz2) = 944ce58619c3e23f30da5fffd15925ef00ade2c0
-RMD160 (phpMyAdmin-2.6.1-rc1.tar.bz2) = b2ca7aaebfa45f5e3b4da6d7ffd659d686d837f5
-Size (phpMyAdmin-2.6.1-rc1.tar.bz2) = 1311277 bytes
+SHA1 (phpMyAdmin-2.6.1-pl1.tar.bz2) = b796a2e4ec6762e8a1812e577f1db1bebc69ce09
+RMD160 (phpMyAdmin-2.6.1-pl1.tar.bz2) = 9829d5263ed12e1eb38fee05d97e5131b741794b
+Size (phpMyAdmin-2.6.1-pl1.tar.bz2) = 1541672 bytes