pullup ticket 2437 requested by tron

phpmyadmin: bug fixes many

pkgsrc/databases/phpmyadmin/Makefile	1.71,1.72
pkgsrc/databases/phpmyadmin/distinfo	1.34,1.35

    Module Name:	pkgsrc
    Committed By:	tron
    Date:		Sun Jun  8 14:15:28 UTC 2008

    Modified Files:
    	pkgsrc/databases/phpmyadmin: Makefile distinfo

    Log Message:
    Update "phpmyadmin" package to version 2.11.6. Changes since 2.11.5.2:
    - bug #1903724 [interface] Displaying of very large queries
      in error message
    - bug #1905711 [compatibility] Functions deprecated in PHP 5.3:
      is_a() and get_magic_quotes_gpc()
    - bug [lang] catalan wrong accented characters
    - bug #1893034 [Export] SET NAMES for importing with command-line
      client
    + [lang] Russian update
    - bug #1910485 [core] Unsetting the whitelist during the loop
    - bug #1906980 [Export] Import of VIEWs fails if temp table exists
    - bug #1812763 [Copy] Table copy when server is in ANSI_QUOTES
      sql_mode
    - bug #1918531 [compatibility] Navigation isn't w3.org valid
    - bug #1926357 [data] BIT defaults displayed incorrectly
    - patch #1930057 [auth] colon in password prevents HTTP login
      on CGI/IIS
    - patch #1929553 [lang] Don't output BOM character in Swedish
      language file
    - patch #1895796 [lang] Typo in Japanese lang files
    - bug #1935652 [auth] Access denied (show warning about mcrypt
      on login page)
    - bug #1906983 [export] Reimport of FUNCTION fails
    - bug #1919808 [operations] Renaming a database fails to handle
      functions
    - bug #1934401 [core] Cannot force a language
    - bug #1944077 [core] Config file containing a BOM
    - bug #1947189 [scripts] Missing head tag in scripts/signon.php
    + [lang] Romanian update

    ------------------------------------------------------------------------

    Module Name:	pkgsrc
    Committed By:	tron
    Date:		Sat Jun 28 11:11:15 UTC 2008

    Modified Files:
    	pkgsrc/databases/phpmyadmin: Makefile distinfo

    Log Message:
    Update "phpmyadmin" package to version 2.11.7. Changes since 2.11.6:
    - bug #1908719 [interface] New field cannot be auto-increment and
      primary key
    - [dbi] Incorrect interpretation for some mysqli field flags
    - bug #1910621 [display] part 1: do not display a TEXT utf8_bin
      as BLOB (fixed for mysqli extension only)
    - [interface] sanitize the after_field parameter,
      thanks to Norman Hippert
    - [structure] do not remove the BINARY attribute in drop-down
    - bug #1955386 [session] Overriding session.hash_bits_per_character
    - [interface] sanitize the table comments in table print view,
      thanks to Norman Hippert
    - bug #1939031 Auto_Increment selected for TimeStamp by Default
    - patch #1957998 [display] No tilde for InnoDB row counter when
      we know it for sure, thanks to Vladyslav Bakayev - dandy76
    - bug #1955572 [display] alt text causes duplicated strings
    - bug #1762029 [interface] Cannot upload BLOB into existing row
    - bug #1981043 [export] HTML in exports getting corrupted,
      thanks to Jason Judge - jasonjudge
    - bug #1936761 [interface] BINARY not treated as BLOB:
      update/delete issues
    - protection against XSS when register_globals is on and .htaccess
      has no effect, thanks to Tim Starling
    - bug #1996943 [export] Firefox 3 and .sql.gz (corrupted);
      detect Gecko 1.9, thanks to Juergen Wind

2 files changed, 6 insertions, 6 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index fb0a35db8ba..ddca29fdc7d 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67.2.1 2008/04/28 10:41:30 rtr Exp $
+# $NetBSD: Makefile,v 1.67.2.2 2008/06/29 11:11:44 rtr Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -22,7 +22,7 @@ MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
 USE_TOOLS+=	perl:run
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	2.11.5.2
+DIST_VERSION=	2.11.7
 DOC_FILES=	CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 3b945102f34..574499dd3f9 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.32.2.1 2008/04/28 10:41:30 rtr Exp $
+$NetBSD: distinfo,v 1.32.2.2 2008/06/29 11:11:44 rtr Exp $
 
-SHA1 (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 13eae6eb086da00ff64720f473fe2ed9fcfd874b
-RMD160 (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 5b034c1c75da11cb05f4e9a5e9109f8383787cd7
-Size (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 3093323 bytes
+SHA1 (phpMyAdmin-2.11.7-all-languages.tar.bz2) = 4663b6cd45471ba8547e35e47b10fc8fd1622052
+RMD160 (phpMyAdmin-2.11.7-all-languages.tar.bz2) = 117ce8dd3a6f932e80a2355a221623d68e38eb36
+Size (phpMyAdmin-2.11.7-all-languages.tar.bz2) = 3098110 bytes