Pullup ticket #4451 - requested by tron
databases/phpmyadmin: security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.130
- databases/phpmyadmin/distinfo                                 1.87

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jul 13 07:39:04 UTC 2014

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile distinfo

   Log Message:
   Update "phpmyadmin" package to version 4.2.5. The following bugs have
   been fixed since version 4.2.3:
   - bug #4467 shell_exec() has been disabled for security reasons
   - bug #4470 Error while submitting empty query
   - bug #4463 Fatal error: Class 'PMA_DatabaseInterface' not found
   - bug #4469 Fixed cookie based login for installations without mcrypt
   - bug #4473 incorrect result count when having clause is used
   -           mcrypt: remove the requirement (64-bit) and the related warning
   - bug #4449 Mediawiki export does not produce table header row; also fix
               related PHP warnings
   - bug #4442 New lines are added to query every time
   - bug #4445 Fatal error on SQL Export of join query
   - bug #4448 Dump binary columns in hexadecimal notation not working
   - Regenerate cookie encryption IV for every session
   - bug #4405 Cannot import (open_basedir): fix another case
   - bug #4457 SQL tab - Insert queries not showing affected row count
   - bug       Missing warning about existing account, on multi-server config
   - bug #4435 WHERE clause can be undefined
   - bug       SQL export views as tables option getting ignored
   - bug #4464 [security] XSS injection due to unescaped db/table name in
               navigation hiding
   - bug #4465 [security] XSS injection due to unescaped db/table name in
               recent/favorite tables


   To generate a diff of this commit:
   cvs rdiff -u -r1.129 -r1.130 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.86 -r1.87 pkgsrc/databases/phpmyadmin/distinfo
#4451
Merge branch 'pkgsrc_2014Q2' into joyent/feature/miscfix/2014Q2