Pullup ticket 2225 - requested by tron

security update for phpmyadmin

- pkgsrc/databases/phpmyadmin/Makefile			1.62
- pkgsrc/databases/phpmyadmin/PLIST			1.18
- pkgsrc/databases/phpmyadmin/distinfo			1.30

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Nov 12 14:05:26 UTC 2007

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

   Log Message:
   Update "phpmyadmin" package to version 2.11.2.1.
   Change since version 2.10.2:
   - creating VIEWs from query results
   - managing triggers, procedures and functions
   - supports MySQL 5.0.37 query profiling
   - improved interface for servers hosting thousands of databases and tables.
   - security fixes for PMASA-2007-5, PMASA-2007-6 and PMASA-2007-7

3 files changed, 38 insertions, 15 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index ed6d097e4d7..6ac1d338066 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/07/04 20:54:36 jlam Exp $
+# $NetBSD: Makefile,v 1.61.2.1 2007/11/13 11:53:20 ghen Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -21,7 +21,7 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \
 USE_TOOLS+=	perl:run
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	2.10.2
+DIST_VERSION=	2.11.2.1
 DOC_FILES=	CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
@@ -80,9 +80,17 @@ do-install:
 	${INSTALL_DATA}	${WRKSRC}/ChangeLog ${PMDIR}
 
 	for dir in ${INSTALL_DIRS}; do					\
-		for file in "${WRKSRC}/$$dir"/*; do			\
-			${TEST} -f "$$file" -a `${BASENAME} "$$file" .sh` = `${BASENAME} "$$file"` &&				\
-			${INSTALL_DATA} $$file ${PMDIR}/$$dir;		\
+		for file in ${WRKSRC}/$$dir/*; do			\
+			case "$$file" in				\
+			*.sh)						\
+				;;					\
+			*)						\
+				if [ -f "$$file" ]; then		\
+					${INSTALL_DATA} "$$file"	\
+					  ${PMDIR}/$$dir;		\
+				fi					\
+				;;					\
+			esac;						\
 		done							\
 	done
 
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index fc557787ce8..4ae8c81ffbf 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/03/20 14:17:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.17.6.1 2007/11/13 11:53:21 ghen Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -16,8 +16,6 @@ share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
 share/phpmyadmin/config.inc.php
 share/phpmyadmin/config.sample.inc.php
-share/phpmyadmin/css/phpmyadmin.css.php
-share/phpmyadmin/css/print.css
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
 share/phpmyadmin/db_export.php
@@ -161,8 +159,6 @@ 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/libraries/Config.class.php
-share/phpmyadmin/libraries/PMA_List.class.php
-share/phpmyadmin/libraries/PMA_List_Database.class.php
 share/phpmyadmin/libraries/Table.class.php
 share/phpmyadmin/libraries/Theme.class.php
 share/phpmyadmin/libraries/Theme_Manager.class.php
@@ -254,7 +250,6 @@ share/phpmyadmin/libraries/sqlparser.data.php
 share/phpmyadmin/libraries/sqlparser.lib.php
 share/phpmyadmin/libraries/sqlvalidator.class.php
 share/phpmyadmin/libraries/sqlvalidator.lib.php
-share/phpmyadmin/libraries/storage_engines.lib.php
 share/phpmyadmin/libraries/string.lib.php
 share/phpmyadmin/libraries/tbl_common.php
 share/phpmyadmin/libraries/tbl_indexes.lib.php
@@ -642,6 +637,26 @@ share/phpmyadmin/transformation_overview.php
 share/phpmyadmin/transformation_wrapper.php
 share/phpmyadmin/translators.html
 share/phpmyadmin/user_password.php
+share/phpmyadmin/lang/macedonian_cyrillic-utf-8.inc.php
+share/phpmyadmin/lang/macedonian_cyrillic-windows-1251.inc.php
+share/phpmyadmin/lang/sinhala-utf-8.inc.php
+share/phpmyadmin/libraries/File.class.php
+share/phpmyadmin/libraries/List.class.php
+share/phpmyadmin/libraries/List_Database.class.php
+share/phpmyadmin/libraries/StorageEngine.class.php
+share/phpmyadmin/libraries/common.inc.php
+share/phpmyadmin/libraries/core.lib.php
+share/phpmyadmin/libraries/db_routines.inc.php
+share/phpmyadmin/libraries/display_change_password.lib.php
+share/phpmyadmin/libraries/export/yaml.php
+share/phpmyadmin/libraries/string_mb.lib.php
+share/phpmyadmin/libraries/string_native.lib.php
+share/phpmyadmin/libraries/string_type_ctype.lib.php
+share/phpmyadmin/libraries/string_type_native.lib.php
+share/phpmyadmin/libraries/tbl_triggers.lib.php
+share/phpmyadmin/phpmyadmin.css.php
+share/phpmyadmin/print.css
+share/phpmyadmin/view_create.php
 @dirrm share/phpmyadmin/themes/original/img
 @dirrm share/phpmyadmin/themes/original/css
 @dirrm share/phpmyadmin/themes/original
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 3f2cd4004b5..c6a8100ae37 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.29 2007/07/03 14:18:14 tron Exp $
+$NetBSD: distinfo,v 1.29.2.1 2007/11/13 11:53:21 ghen Exp $
 
-SHA1 (phpMyAdmin-2.10.2-all-languages.tar.bz2) = b213ecd9605ed248f37a7c19bc41282f7d92a233
-RMD160 (phpMyAdmin-2.10.2-all-languages.tar.bz2) = 5858f46aa912e0cb5e6206802746679d68776d14
-Size (phpMyAdmin-2.10.2-all-languages.tar.bz2) = 2996012 bytes
+SHA1 (phpMyAdmin-2.11.2.1-all-languages.tar.bz2) = a73e5438f041233838e2e940fce14b5b4230133e
+RMD160 (phpMyAdmin-2.11.2.1-all-languages.tar.bz2) = 9478445bb7a0431412944b2a97314162a455a1b1
+Size (phpMyAdmin-2.11.2.1-all-languages.tar.bz2) = 3083390 bytes