Pullup ticket #3686 - requested by tron

databases/phpmyadmin security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.97-1.98
- databases/phpmyadmin/PLIST                                    1.25
- databases/phpmyadmin/distinfo                                 1.58-1.59

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Feb 16 20:19:25 UTC 2012

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

   Log Message:
   Update "phpmyadmin" package to version 3.4.10. Changes since 3.4.9:
   - bug #3460090 [interface] TextareaAutoSelect feature broken
   - patch #3375984 [export] PHP Array export might generate invalid php code
   - bug #3049209 [import] Import from ODS ignores cell that is the same as
     cell before
   - bug #3463933 [display] SELECT DISTINCT displays wrong total records found
   - patch #3458944 [operations] copy table data missing
     SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
   - bug #3469254 [edit] Setting data to NULL and drop-downs
   - bug #3477063 [edit] Missing set fields and values in generated INSERT query
   - bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145)

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sat Feb 18 23:04:45 UTC 2012

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile distinfo

   Log Message:
   pdatep "phpmyadmin" package to version 3.4.10.1. Changes since 3.4.10:
   - [security] XSS in replication setup, see PMASA-2012-1

3 files changed, 8 insertions, 77 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index e4f8a4bd259..d1d5a0ec77a 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2011/12/23 08:07:44 tron Exp $
+# $NetBSD: Makefile,v 1.96.2.1 2012/02/19 04:19:43 sbd Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -29,7 +29,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=	3.4.9
+DIST_VERSION=	3.4.10.1
 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 dafc6726c0b..f0a7ed2d2f5 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2011/09/14 22:25:27 tron Exp $
+@comment $NetBSD: PLIST,v 1.24.4.1 2012/02/19 04:19:43 sbd Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -240,66 +240,10 @@ share/phpmyadmin/libraries/tbl_links.inc.php
 share/phpmyadmin/libraries/tbl_properties.inc.php
 share/phpmyadmin/libraries/tbl_replace_fields.inc.php
 share/phpmyadmin/libraries/tbl_triggers.lib.php
-share/phpmyadmin/libraries/tcpdf/CHANGELOG.TXT
 share/phpmyadmin/libraries/tcpdf/LICENSE.TXT
 share/phpmyadmin/libraries/tcpdf/README.TXT
-share/phpmyadmin/libraries/tcpdf/cache/chapter_demo_1.txt
-share/phpmyadmin/libraries/tcpdf/cache/chapter_demo_2.txt
-share/phpmyadmin/libraries/tcpdf/cache/table_data_demo.txt
-share/phpmyadmin/libraries/tcpdf/cache/utf8test.txt
-share/phpmyadmin/libraries/tcpdf/config/lang/afr.php
-share/phpmyadmin/libraries/tcpdf/config/lang/ara.php
-share/phpmyadmin/libraries/tcpdf/config/lang/aze.php
-share/phpmyadmin/libraries/tcpdf/config/lang/bel.php
-share/phpmyadmin/libraries/tcpdf/config/lang/bra.php
-share/phpmyadmin/libraries/tcpdf/config/lang/cat.php
-share/phpmyadmin/libraries/tcpdf/config/lang/ces.php
-share/phpmyadmin/libraries/tcpdf/config/lang/chi.php
-share/phpmyadmin/libraries/tcpdf/config/lang/cym.php
-share/phpmyadmin/libraries/tcpdf/config/lang/dan.php
-share/phpmyadmin/libraries/tcpdf/config/lang/eng.php
-share/phpmyadmin/libraries/tcpdf/config/lang/est.php
-share/phpmyadmin/libraries/tcpdf/config/lang/eus.php
-share/phpmyadmin/libraries/tcpdf/config/lang/fra.php
-share/phpmyadmin/libraries/tcpdf/config/lang/ger.php
-share/phpmyadmin/libraries/tcpdf/config/lang/gle.php
-share/phpmyadmin/libraries/tcpdf/config/lang/glg.php
-share/phpmyadmin/libraries/tcpdf/config/lang/hat.php
-share/phpmyadmin/libraries/tcpdf/config/lang/heb.php
-share/phpmyadmin/libraries/tcpdf/config/lang/hrv.php
-share/phpmyadmin/libraries/tcpdf/config/lang/hun.php
-share/phpmyadmin/libraries/tcpdf/config/lang/hye.php
-share/phpmyadmin/libraries/tcpdf/config/lang/ind.php
-share/phpmyadmin/libraries/tcpdf/config/lang/ita.php
-share/phpmyadmin/libraries/tcpdf/config/lang/kat.php
-share/phpmyadmin/libraries/tcpdf/config/lang/kor.php
-share/phpmyadmin/libraries/tcpdf/config/lang/mkd.php
-share/phpmyadmin/libraries/tcpdf/config/lang/mlt.php
-share/phpmyadmin/libraries/tcpdf/config/lang/msa.php
-share/phpmyadmin/libraries/tcpdf/config/lang/nld.php
-share/phpmyadmin/libraries/tcpdf/config/lang/nob.php
-share/phpmyadmin/libraries/tcpdf/config/lang/pol.php
-share/phpmyadmin/libraries/tcpdf/config/lang/por.php
-share/phpmyadmin/libraries/tcpdf/config/lang/ron.php
-share/phpmyadmin/libraries/tcpdf/config/lang/rus.php
-share/phpmyadmin/libraries/tcpdf/config/lang/slv.php
-share/phpmyadmin/libraries/tcpdf/config/lang/spa.php
-share/phpmyadmin/libraries/tcpdf/config/lang/sqi.php
-share/phpmyadmin/libraries/tcpdf/config/lang/srp.php
-share/phpmyadmin/libraries/tcpdf/config/lang/swa.php
-share/phpmyadmin/libraries/tcpdf/config/lang/swe.php
-share/phpmyadmin/libraries/tcpdf/config/lang/urd.php
-share/phpmyadmin/libraries/tcpdf/config/lang/yid.php
-share/phpmyadmin/libraries/tcpdf/config/lang/zho.php
 share/phpmyadmin/libraries/tcpdf/config/tcpdf_config.php
-share/phpmyadmin/libraries/tcpdf/config/tcpdf_config_alt.php
-share/phpmyadmin/libraries/tcpdf/fonts/README.TXT
-share/phpmyadmin/libraries/tcpdf/fonts/courier.php
-share/phpmyadmin/libraries/tcpdf/fonts/courierb.php
-share/phpmyadmin/libraries/tcpdf/fonts/courierbi.php
-share/phpmyadmin/libraries/tcpdf/fonts/courieri.php
-share/phpmyadmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/LICENSE
-share/phpmyadmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/README
+share/phpmyadmin/libraries/tcpdf/encodings_maps.php
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusans.ctg.z
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusans.php
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusans.z
@@ -313,20 +257,7 @@ share/phpmyadmin/libraries/tcpdf/fonts/dejavuserifb.ctg.z
 share/phpmyadmin/libraries/tcpdf/fonts/dejavuserifb.php
 share/phpmyadmin/libraries/tcpdf/fonts/dejavuserifb.z
 share/phpmyadmin/libraries/tcpdf/fonts/helvetica.php
-share/phpmyadmin/libraries/tcpdf/fonts/helveticab.php
-share/phpmyadmin/libraries/tcpdf/fonts/helveticabi.php
-share/phpmyadmin/libraries/tcpdf/fonts/helveticai.php
-share/phpmyadmin/libraries/tcpdf/fonts/symbol.php
-share/phpmyadmin/libraries/tcpdf/fonts/times.php
-share/phpmyadmin/libraries/tcpdf/fonts/timesb.php
-share/phpmyadmin/libraries/tcpdf/fonts/timesbi.php
-share/phpmyadmin/libraries/tcpdf/fonts/timesi.php
-share/phpmyadmin/libraries/tcpdf/fonts/zapfdingbats.php
 share/phpmyadmin/libraries/tcpdf/htmlcolors.php
-share/phpmyadmin/libraries/tcpdf/spotcolors.php
-share/phpmyadmin/libraries/tcpdf/tcpdf.crt
-share/phpmyadmin/libraries/tcpdf/tcpdf.fdf
-share/phpmyadmin/libraries/tcpdf/tcpdf.p12
 share/phpmyadmin/libraries/tcpdf/tcpdf.php
 share/phpmyadmin/libraries/tcpdf/unicode_data.php
 share/phpmyadmin/libraries/transformations.lib.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 6e2263416e1..ee476496e9c 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.57 2011/12/23 08:07:44 tron Exp $
+$NetBSD: distinfo,v 1.57.2.1 2012/02/19 04:19:43 sbd Exp $
 
-SHA1 (phpMyAdmin-3.4.9-all-languages.tar.bz2) = 4ac4f15fb305ef243b88b17e405e9d451bd56de9
-RMD160 (phpMyAdmin-3.4.9-all-languages.tar.bz2) = 2bec1bd147af6ff00cdb999a35800b95f986a518
-Size (phpMyAdmin-3.4.9-all-languages.tar.bz2) = 4666051 bytes
+SHA1 (phpMyAdmin-3.4.10.1-all-languages.tar.bz2) = d83a517310b47bbe5d7b00c42b86121dfb3db485
+RMD160 (phpMyAdmin-3.4.10.1-all-languages.tar.bz2) = cdfdd41d769f978bda3653477edc30d36c27f9d9
+Size (phpMyAdmin-3.4.10.1-all-languages.tar.bz2) = 4722083 bytes