From matthew@thebunker.net  Tue Sep 13 18:26:12 2005
Return-Path: <matthew@thebunker.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4CFEF16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Sep 2005 18:26:12 +0000 (GMT)
	(envelope-from matthew@thebunker.net)
Received: from male.aldigital.co.uk (male.thebunker.net [213.129.64.13])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9D8D243D46
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Sep 2005 18:26:11 +0000 (GMT)
	(envelope-from matthew@thebunker.net)
Received: from lack-of-gravitas.thebunker.net (gateway.ash.thebunker.net [213.129.64.4])
	(using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits))
	(No client certificate requested)
	by male.aldigital.co.uk (Postfix) with ESMTP id 9BF78976F9
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Sep 2005 19:26:09 +0100 (BST)
Received: from lack-of-gravitas.thebunker.net (localhost [127.0.0.1])
	by lack-of-gravitas.thebunker.net (8.13.4/8.13.4) with ESMTP id j8DIQ9RF092740
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Sep 2005 19:26:09 +0100 (BST)
	(envelope-from matthew@lack-of-gravitas.thebunker.net)
Received: (from matthew@localhost)
	by lack-of-gravitas.thebunker.net (8.13.4/8.13.4/Submit) id j8DIQ8WN092739;
	Tue, 13 Sep 2005 19:26:08 +0100 (BST)
	(envelope-from matthew)
Message-Id: <200509131826.j8DIQ8WN092739@lack-of-gravitas.thebunker.net>
Date: Tue, 13 Sep 2005 19:26:08 +0100 (BST)
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Reply-To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] databases/phpmyadmin update to 2.6.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86085
>Category:       ports
>Synopsis:       [maintainer] databases/phpmyadmin update to 2.6.4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 13 18:30:13 GMT 2005
>Closed-Date:    Tue Sep 13 20:45:31 GMT 2005
>Last-Modified:  Tue Sep 13 20:45:31 GMT 2005
>Originator:     Matthew Seaman
>Release:        FreeBSD 6.0-BETA3 i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD lack-of-gravitas.thebunker.net 6.0-BETA3 FreeBSD 6.0-BETA3 #3: Tue Aug 30 13:36:31 BST 2005 root@lack-of-gravitas.thebunker.net:/usr/obj/usr/src/sys/LACK-OF-GRAVITAS i386


	
>Description:

Update to the new release version 2.6.4.  Release notes are at

http://www.phpmyadmin.net/home_page/downloads.php?relnotes=0

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
    * XSS on username (cookie-based login)

Note: despite what the phpMyAdmin developers say under "fixes",
installing php5-mysqli port with MySQL client versions other than
4.1.x is not currently permitted by the ports infrastructure.


>How-To-Repeat:
	
>Fix:

	

--- phpmyadmin.diff begins here ---
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile	Thu Sep  1 08:17:56 2005
+++ phpmyadmin/Makefile	Tue Sep 13 19:15:06 2005
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.6.4.r1
-#DISTVERSION=	2.6.4-rc1
+PORTVERSION=	2.6.4
+#DISTVERSION=	2.6.4
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\..(.)$/-rc\1/}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	A set of PHP-scripts to manage MySQL over the web
@@ -54,7 +54,7 @@
 
 OPTIONS=	BZ2	 "bzip2 library support" on \
 		GD	 "GD library support" on \
-		MYSQLI	 "Improved MySQL support (PHP5, MySQL 4.1 only)" off \
+		MYSQLI	 "Improved MySQL support" off \
 		OPENSSL	 "OpenSSL support" on \
 		PDF	 "PDFlib support (implies GD)" on \
 		ZLIB	 "ZLIB support" on \
@@ -103,6 +103,8 @@
 	${ECHO_MSG} "    WITH_SUPHP=yes   Install appropriately for use with"
 	${ECHO_MSG} "                     the www/suphp port [default: no]"
 	${ECHO_MSG} ""
+	${ECHO_MSG} "Note that selecting the MYSQLI option will only work"
+	${ECHO_MSG} "with PHP5 and MySQL 4.1.x"
 
 post-patch:
 	${MV} ${WRKSRC}/${CFGFILE} ${WRKSRC}/${CFGFILE}.sample
diff -Nur /usr/ports/databases/phpmyadmin/distinfo phpmyadmin/distinfo
--- /usr/ports/databases/phpmyadmin/distinfo	Thu Sep  1 08:17:56 2005
+++ phpmyadmin/distinfo	Tue Sep 13 17:51:39 2005
@@ -1,2 +1,2 @@
-MD5 (phpMyAdmin-2.6.4-rc1.tar.bz2) = dfa8a387ae7e69ec3888a1e58b68a8cc
-SIZE (phpMyAdmin-2.6.4-rc1.tar.bz2) = 1728180
+MD5 (phpMyAdmin-2.6.4.tar.bz2) = cb24f2aff8cd16cb8d1026b7e5934582
+SIZE (phpMyAdmin-2.6.4.tar.bz2) = 1731434
--- phpmyadmin.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Sep 13 20:45:24 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86085 
>Unformatted:
