Pullup ticket 309 - requested by Adrian Portelli

security fix for phpmyadmin

Revisions pulled up:
- pkgsrc/databases/phpmyadmin/Makefile 1.26-1.29
- pkgsrc/databases/phpmyadmin/PLIST    1.9
- pkgsrc/databases/phpmyadmin/distinfo 1.10-1.11

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Thu Feb 24 17:26:03 UTC 2005

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

   Log Message:
   - Update from 2.6.1-rc1 to 2.6.1-pl1
   - Addresses known security issues as well as numerious other changes
   - ok'ed tron@
   [ Changelog skipped]
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu Feb 24 17:50:43 UTC 2005

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile

   Log Message:
   Add dependence on "php-mbstring" package because phpMyAdmin complains
   about the lack of multibyte support otherwise.
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu Feb 24 20:52:09 UTC 2005

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile distinfo

   Log Message:
   Update "phpmyadmin" to 2.6.1pl2. It fixes a serious regression in 2.6.1pl1
   which e.g. completely broke editing entries in a table.

3 files changed, 15 insertions, 6 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index e33d74b313b..59bd5613535 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.25.2.1 2005/02/25 22:20:04 salo Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -10,6 +10,7 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.phpmyadmin.net/
 COMMENT=	Set of PHP-scripts to adminstrate MySQL over the WWW
 
+DEPENDS+=	php-mbstring{,i}>=4.3.3:../../misc/php-mbstring
 DEPENDS+=	php-mysql{,i}>=4.3.3:../../databases/php-mysql
 
 PLIST_SUBST+=	CP="${CP}" DIST_VERSION=${DIST_VERSION} \
@@ -18,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.1-rc1
+DIST_VERSION=	2.6.1-pl2
 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..16b72d368e9 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.8.2.1 2005/02/25 22:20:04 salo 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 fd62039cf61..8107c73845d 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/12/14 20:38:47 adrianp Exp $
+$NetBSD: distinfo,v 1.8.2.1 2005/02/25 22:20:04 salo Exp $
 
-SHA1 (phpMyAdmin-2.6.1-rc1.tar.bz2) = 944ce58619c3e23f30da5fffd15925ef00ade2c0
-Size (phpMyAdmin-2.6.1-rc1.tar.bz2) = 1311277 bytes
+SHA1 (phpMyAdmin-2.6.1-pl2.tar.bz2) = d482aac86c080b38b7a21b32019f1d9c6e48edef
+Size (phpMyAdmin-2.6.1-pl2.tar.bz2) = 1541665 bytes