Module Name:	pkgsrc
Committed By:	salo
Date:		Fri Feb 25 22:20:04 UTC 2005

Modified Files:
	pkgsrc/databases/phpmyadmin [pkgsrc-2004Q4]: Makefile PLIST distinfo

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.25 -r1.25.2.1 pkgsrc/databases/phpmyadmin/Makefile
cvs rdiff -r1.8 -r1.8.2.1 pkgsrc/databases/phpmyadmin/PLIST \
    pkgsrc/databases/phpmyadmin/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.