Pullup ticket #4120 - requested by drochner
textproc/libxml2: security patch

Revisions pulled up:
- textproc/libxml2/Makefile                                     1.124
- textproc/libxml2/distinfo                                     1.99-1.100
- textproc/libxml2/patches/patch-SA53061_1                      1.1-1.2
- textproc/libxml2/patches/patch-SA53061_2                      1.1

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Thu Apr 18 10:17:42 UTC 2013

   Modified Files:
           pkgsrc/textproc/libxml2: Makefile distinfo
   Added Files:
           pkgsrc/textproc/libxml2/patches: patch-SA53061_1 patch-SA53061_2

   Log Message:
   add patch from upstream to fix Multiple Use-After-Free Vulnerabilities
   (no CVE# assigned yet)
   bump PKGREV

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri Apr 19 09:47:43 UTC 2013

   Modified Files:
           pkgsrc/textproc/libxml2: distinfo
           pkgsrc/textproc/libxml2/patches: patch-SA53061_1

   Log Message:
   add CVE reference
Pullup ticket #4120.
Pullup ticket #4113 - requested by tron
databases/phpmyadmin: security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.114
- databases/phpmyadmin/distinfo                                 1.72

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Apr  9 07:07:05 UTC 2013

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile distinfo

   Log Message:
   Update "phpmyadmin" package to version 3.5.8. Changes since 3.5.7:
   - bug #3828 MariaDB reported as MySQL
   - bug #3854 Incorrect header for Safari 6.0
   - bug #3705 Attempt to open trigger for edit gives NULL
   - Use HTML5 DOCTYPE
   - [security] Self-XSS on GIS visualisation page, reported by Janek Vind
   - bug #3800 Incorrect keyhandler behaviour #2


   To generate a diff of this commit:
   cvs rdiff -u -r1.113 -r1.114 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.71 -r1.72 pkgsrc/databases/phpmyadmin/distinfo
pullup 4113
Merge branch 'pkgsrc_2013Q1' into joyent/feature/multiarch/2013Q1