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

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.131
- databases/phpmyadmin/PLIST                                    1.37
- databases/phpmyadmin/distinfo                                 1.88

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sat Jul 26 10:33:02 UTC 2014

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

   Log Message:
   Update "phpmyadmin" package to version 4.2.6. The following bugs have
   been fixed since version 4.2.5:
   - bug #4471 Undefined index warning with referenced column.
   - bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is back
   - bug #4482 Multi Column sorting (improved user experience)
   - bug #4478 Server validation does not work while in setup/mysqli
   - bug       Undefined variable when grid editing a foreign key column
   - bug #4481 mult_submits.inc.php Undefined variable Error
   - bug #4485 Sorting breaks the copy column feature
   - bug #4440 Javascript error when renaming table
   - bug #4483 'New window' link (selflink) disappears, causing Javascript err=
   or
   - bug #4489 Incorrect detection of privileges for routine creation
   - bug #4459 First few characters of database name aren't clickable when
               expanded
   - bug #4486 [security] XSS injection due to unescaped table comment
   - bug #4488 [security] XSS injection due to unescaped table name (triggers)
   - bug #4492 [security] XSS in AJAX confirmation messages
   - bug #4491 [security] Missing validation for accessing User groups feature


   To generate a diff of this commit:
   cvs rdiff -u -r1.130 -r1.131 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/phpmyadmin/PLIST
   cvs rdiff -u -r1.87 -r1.88 pkgsrc/databases/phpmyadmin/distinfo
Pullup ticket #4465 - requested by dholland
lang/openjdk7: fix for netbsd-5

Revisions pulled up:
- lang/openjdk7/Makefile                                        1.71-1.72
- lang/openjdk7/bootstrap.mk                                    1.11
- lang/openjdk7/distinfo                                        1.50-1.51
- lang/openjdk7/patches/patch-aa                                1.12
- lang/openjdk7/patches/patch-ak                                1.7
- lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java 1.1
- lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk    1.1
- lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd 1.1
- lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c 1.1
- lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c 1.1
- lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h 1.1
- lang/openjdk7/patches/patch-jdk_test_jprt.config              1.1

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Mon Jul 21 00:15:41 UTC 2014

   Modified Files:
   	pkgsrc/lang/openjdk7: Makefile distinfo
   Added Files:
   	pkgsrc/lang/openjdk7/patches:
   	    patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd
   	    patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c

   Log Message:
   Bump PKGREVISION. Fix PR pkg/48982.

   * Use fork instead of posix_spawn under NetBSD 5.


   To generate a diff of this commit:
   cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/openjdk7/Makefile
   cvs rdiff -u -r1.49 -r1.50 pkgsrc/lang/openjdk7/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd \
       pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Fri Jul 25 20:35:14 UTC 2014

   Modified Files:
   	pkgsrc/lang/openjdk7: Makefile bootstrap.mk distinfo
   	pkgsrc/lang/openjdk7/patches: patch-aa patch-ak
   Added Files:
   	pkgsrc/lang/openjdk7/patches:
   	    patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java
   	    patch-jdk_make_java_net_FILES__c.gmk
   	    patch-jdk_src_solaris_native_java_lang_java__props__md.c
   	    patch-jdk_src_solaris_native_java_net_net__util__md.h
   	    patch-jdk_test_jprt.config

   Log Message:
   Bump PKGREVISION

   * Use working bootstrap kits for DragonFly from DPorts.
   * Borrow patches from DragonFly Dports.
     Fix build under DragonFly 3.6.2 and 3.8.1.


   To generate a diff of this commit:
   cvs rdiff -u -r1.71 -r1.72 pkgsrc/lang/openjdk7/Makefile
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/openjdk7/bootstrap.mk
   cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/openjdk7/distinfo
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/openjdk7/patches/patch-aa
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk7/patches/patch-ak
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java \
       pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk \
       pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c \
       pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h \
       pkgsrc/lang/openjdk7/patches/patch-jdk_test_jprt.config
pullups 4461 4464 4465