[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Update to 1.7.141

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5296d52ede3
branches:  trunk
changeset: 366383:a5296d52ede3
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Aug 14 00:02:16 2017 +0000

description:
Update to 1.7.141

* Support build and run under NetBSD PaX MPROTECT environment

Changelog:
Many bugfixes and security bugfixes

diffstat:

 lang/openjdk7/Makefile                                                                                 |  52 +++++++-
 lang/openjdk7/PLIST                                                                                    |  21 ++-
 lang/openjdk7/bootstrap.mk                                                                             |  14 +-
 lang/openjdk7/distinfo                                                                                 |  38 +++---
 lang/openjdk7/patches/patch-al                                                                         |   8 +-
 lang/openjdk7/patches/patch-ap                                                                         |  12 +-
 lang/openjdk7/patches/patch-bd                                                                         |   8 +-
 lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile                                                  |  62 ++++++++++
 lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp                                      |  12 +-
 lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile                                              |  20 +-
 lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile                                              |  20 +-
 lang/openjdk7/patches/patch-jdk_make_common_Program.gmk                                                |   6 +-
 lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk                                                  |  22 +-
 lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile                                         |  12 +-
 lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd                     |   4 +-
 lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java                            |   8 +-
 lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java |   8 +-
 lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c                         |  50 --------
 lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h                            |  16 +-
 19 files changed, 226 insertions(+), 167 deletions(-)

diffs (truncated from 874 to 300 lines):

diff -r b7944a94863f -r a5296d52ede3 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Sun Aug 13 23:45:17 2017 +0000
+++ b/lang/openjdk7/Makefile    Mon Aug 14 00:02:16 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.115 2017/05/09 14:26:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.116 2017/08/14 00:02:16 ryoon Exp $
 
-JDK_MICRO=     80
-DISTNAME=      openjdk-1.7.${JDK_MICRO}-20150609
+JDK_MICRO=     141
+DISTNAME=      openjdk-1.7.${JDK_MICRO}-20170813
 PKGNAME=       openjdk7-1.7.${JDK_MICRO}
-PKGREVISION=   7
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.xz
@@ -23,6 +22,26 @@
 JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps jstack keytool \
                orbd policytool rmid rmiregistry servertool tnameserv
 
+NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/[a-ik-z]*
+NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/j[b-z]*
+NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/jar*
+NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/java
+NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/java[a-z]*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && defined(TOOLS_PLATFORM.paxctl)
+SUBST_CLASSES+=                        set-paxctl
+SUBST_STAGE.set-paxctl=                pre-build
+SUBST_MESSAGE.set-paxctl=      Setting NetBSD paxctl
+SUBST_FILES.set-paxctl=                make/Defs-internal.gmk
+SUBST_FILES.set-paxctl+=       jdk/make/com/sun/jmx/Makefile
+SUBST_SED.set-paxctl+=         -e 's,/usr/sbin/paxmark.sh,${PAXCTL},'
+SUBST_SED.set-paxctl+=         -e 's,-vmsp,+m,'
+SUBST_SED.set-paxctl+=         -e 's,-vm,+m,'
+SUBST_SED.set-paxctl+=         -e 's,\^PaX,.,'
+.endif
+
 MAKE_ENV+=             PKGSRC_ZIPEXE=${TOOLS_PATH.zip}
 MAKE_ENV+=             PKGSRC_UNZIP=${TOOLS_PATH.unzip}
 MAKE_ENV+=             PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx
@@ -190,6 +209,14 @@
 .if exists(/usr/lib/libstdc++.so.7)
        ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
 .endif
+.if defined(TOOLS_PLATFORM.paxctl)
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/jre/bin/*
+.endif
 
 do-build: ${WRKDIR}/stage3-done
 
@@ -201,8 +228,20 @@
        mv ${BUILDDIR} ${BUILDDIR}-stage1
        touch ${.TARGET}
 
+# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now
+${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done
+.if defined(TOOLS_PLATFORM.paxctl)
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
+       ${PAXCTL} +m ${WRKDIR}/bootstrap/jre/bin/*
+.endif
+       touch ${.TARGET}
+
 # stage 2 rebuilds the JDK using native tools
-${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
+${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done
        ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET}
        touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
        touch ${.TARGET}
@@ -212,6 +251,9 @@
        touch ${.TARGET}
 
 ${WRKDIR}/cacerts.out:
+.if defined(TOOLS_PLATFORM.paxctl)
+       ${PAXCTL} +m ${WRKSRC}/build/*/bin/keytool
+.endif
        mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts &&              \
                ${PREFIX}/sbin/mozilla-rootcerts extract
        for cert in ${WRKDIR}/cacerts/*.pem; do                         \
diff -r b7944a94863f -r a5296d52ede3 lang/openjdk7/PLIST
--- a/lang/openjdk7/PLIST       Sun Aug 13 23:45:17 2017 +0000
+++ b/lang/openjdk7/PLIST       Mon Aug 14 00:02:16 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2017/03/31 07:55:35 abs Exp $
+@comment $NetBSD: PLIST,v 1.26 2017/08/14 00:02:16 ryoon Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -448,6 +448,7 @@
 java/openjdk7/jre/lib/rhino.jar
 java/openjdk7/jre/lib/rt.jar
 java/openjdk7/jre/lib/security/US_export_policy.jar
+java/openjdk7/jre/lib/security/blacklisted.certs
 java/openjdk7/jre/lib/security/cacerts
 java/openjdk7/jre/lib/security/java.policy
 java/openjdk7/jre/lib/security/java.security
@@ -473,7 +474,6 @@
 java/openjdk7/jre/lib/zi/Africa/Windhoek
 java/openjdk7/jre/lib/zi/America/Adak
 java/openjdk7/jre/lib/zi/America/Anchorage
-java/openjdk7/jre/lib/zi/America/Antigua
 java/openjdk7/jre/lib/zi/America/Araguaina
 java/openjdk7/jre/lib/zi/America/Argentina/Buenos_Aires
 java/openjdk7/jre/lib/zi/America/Argentina/Catamarca
@@ -503,7 +503,6 @@
 java/openjdk7/jre/lib/zi/America/Cancun
 java/openjdk7/jre/lib/zi/America/Caracas
 java/openjdk7/jre/lib/zi/America/Cayenne
-java/openjdk7/jre/lib/zi/America/Cayman
 java/openjdk7/jre/lib/zi/America/Chicago
 java/openjdk7/jre/lib/zi/America/Chihuahua
 java/openjdk7/jre/lib/zi/America/Costa_Rica
@@ -519,6 +518,7 @@
 java/openjdk7/jre/lib/zi/America/Eirunepe
 java/openjdk7/jre/lib/zi/America/El_Salvador
 java/openjdk7/jre/lib/zi/America/Fortaleza
+java/openjdk7/jre/lib/zi/America/Fort_Nelson
 java/openjdk7/jre/lib/zi/America/Glace_Bay
 java/openjdk7/jre/lib/zi/America/Godthab
 java/openjdk7/jre/lib/zi/America/Goose_Bay
@@ -560,7 +560,6 @@
 java/openjdk7/jre/lib/zi/America/Moncton
 java/openjdk7/jre/lib/zi/America/Monterrey
 java/openjdk7/jre/lib/zi/America/Montevideo
-java/openjdk7/jre/lib/zi/America/Montreal
 java/openjdk7/jre/lib/zi/America/Nassau
 java/openjdk7/jre/lib/zi/America/New_York
 java/openjdk7/jre/lib/zi/America/Nipigon
@@ -578,13 +577,13 @@
 java/openjdk7/jre/lib/zi/America/Port_of_Spain
 java/openjdk7/jre/lib/zi/America/Porto_Velho
 java/openjdk7/jre/lib/zi/America/Puerto_Rico
+java/openjdk7/jre/lib/zi/America/Punta_Arenas
 java/openjdk7/jre/lib/zi/America/Rainy_River
 java/openjdk7/jre/lib/zi/America/Rankin_Inlet
 java/openjdk7/jre/lib/zi/America/Recife
 java/openjdk7/jre/lib/zi/America/Regina
 java/openjdk7/jre/lib/zi/America/Resolute
 java/openjdk7/jre/lib/zi/America/Rio_Branco
-java/openjdk7/jre/lib/zi/America/Santa_Isabel
 java/openjdk7/jre/lib/zi/America/Santarem
 java/openjdk7/jre/lib/zi/America/Santiago
 java/openjdk7/jre/lib/zi/America/Santo_Domingo
@@ -619,8 +618,10 @@
 java/openjdk7/jre/lib/zi/Asia/Aqtau
 java/openjdk7/jre/lib/zi/Asia/Aqtobe
 java/openjdk7/jre/lib/zi/Asia/Ashgabat
+java/openjdk7/jre/lib/zi/Asia/Atyrau
 java/openjdk7/jre/lib/zi/Asia/Baghdad
 java/openjdk7/jre/lib/zi/Asia/Baku
+java/openjdk7/jre/lib/zi/Asia/Barnaul
 java/openjdk7/jre/lib/zi/Asia/Bangkok
 java/openjdk7/jre/lib/zi/Asia/Beirut
 java/openjdk7/jre/lib/zi/Asia/Bishkek
@@ -633,6 +634,7 @@
 java/openjdk7/jre/lib/zi/Asia/Dili
 java/openjdk7/jre/lib/zi/Asia/Dubai
 java/openjdk7/jre/lib/zi/Asia/Dushanbe
+java/openjdk7/jre/lib/zi/Asia/Famagusta
 java/openjdk7/jre/lib/zi/Asia/Gaza
 java/openjdk7/jre/lib/zi/Asia/Hebron
 java/openjdk7/jre/lib/zi/Asia/Ho_Chi_Minh
@@ -664,7 +666,6 @@
 java/openjdk7/jre/lib/zi/Asia/Pyongyang
 java/openjdk7/jre/lib/zi/Asia/Qatar
 java/openjdk7/jre/lib/zi/Asia/Qyzylorda
-java/openjdk7/jre/lib/zi/Asia/Rangoon
 java/openjdk7/jre/lib/zi/Asia/Riyadh
 java/openjdk7/jre/lib/zi/Asia/Riyadh87
 java/openjdk7/jre/lib/zi/Asia/Riyadh88
@@ -681,12 +682,14 @@
 java/openjdk7/jre/lib/zi/Asia/Tehran
 java/openjdk7/jre/lib/zi/Asia/Thimphu
 java/openjdk7/jre/lib/zi/Asia/Tokyo
+java/openjdk7/jre/lib/zi/Asia/Tomsk
 java/openjdk7/jre/lib/zi/Asia/Ulaanbaatar
 java/openjdk7/jre/lib/zi/Asia/Urumqi
 java/openjdk7/jre/lib/zi/Asia/Ust-Nera
 java/openjdk7/jre/lib/zi/Asia/Vladivostok
 java/openjdk7/jre/lib/zi/Asia/Yakutsk
 java/openjdk7/jre/lib/zi/Asia/Yekaterinburg
+java/openjdk7/jre/lib/zi/Asia/Yangon
 java/openjdk7/jre/lib/zi/Asia/Yerevan
 java/openjdk7/jre/lib/zi/Atlantic/Azores
 java/openjdk7/jre/lib/zi/Atlantic/Bermuda
@@ -745,6 +748,7 @@
 java/openjdk7/jre/lib/zi/Etc/UTC
 java/openjdk7/jre/lib/zi/Europe/Amsterdam
 java/openjdk7/jre/lib/zi/Europe/Andorra
+java/openjdk7/jre/lib/zi/Europe/Astrakhan
 java/openjdk7/jre/lib/zi/Europe/Athens
 java/openjdk7/jre/lib/zi/Europe/Belgrade
 java/openjdk7/jre/lib/zi/Europe/Berlin
@@ -759,6 +763,7 @@
 java/openjdk7/jre/lib/zi/Europe/Istanbul
 java/openjdk7/jre/lib/zi/Europe/Kaliningrad
 java/openjdk7/jre/lib/zi/Europe/Kiev
+java/openjdk7/jre/lib/zi/Europe/Kirov
 java/openjdk7/jre/lib/zi/Europe/Lisbon
 java/openjdk7/jre/lib/zi/Europe/London
 java/openjdk7/jre/lib/zi/Europe/Luxembourg
@@ -773,11 +778,13 @@
 java/openjdk7/jre/lib/zi/Europe/Riga
 java/openjdk7/jre/lib/zi/Europe/Rome
 java/openjdk7/jre/lib/zi/Europe/Samara
+java/openjdk7/jre/lib/zi/Europe/Saratov
 java/openjdk7/jre/lib/zi/Europe/Simferopol
 java/openjdk7/jre/lib/zi/Europe/Sofia
 java/openjdk7/jre/lib/zi/Europe/Stockholm
 java/openjdk7/jre/lib/zi/Europe/Tallinn
 java/openjdk7/jre/lib/zi/Europe/Tirane
+java/openjdk7/jre/lib/zi/Europe/Ulyanovsk
 java/openjdk7/jre/lib/zi/Europe/Uzhgorod
 java/openjdk7/jre/lib/zi/Europe/Vienna
 java/openjdk7/jre/lib/zi/Europe/Vilnius
@@ -820,7 +827,6 @@
 java/openjdk7/jre/lib/zi/Pacific/Kwajalein
 java/openjdk7/jre/lib/zi/Pacific/Majuro
 java/openjdk7/jre/lib/zi/Pacific/Marquesas
-java/openjdk7/jre/lib/zi/Pacific/Midway
 java/openjdk7/jre/lib/zi/Pacific/Nauru
 java/openjdk7/jre/lib/zi/Pacific/Niue
 java/openjdk7/jre/lib/zi/Pacific/Norfolk
@@ -831,7 +837,6 @@
 java/openjdk7/jre/lib/zi/Pacific/Pohnpei
 java/openjdk7/jre/lib/zi/Pacific/Port_Moresby
 java/openjdk7/jre/lib/zi/Pacific/Rarotonga
-java/openjdk7/jre/lib/zi/Pacific/Saipan
 java/openjdk7/jre/lib/zi/Pacific/Tahiti
 java/openjdk7/jre/lib/zi/Pacific/Tarawa
 java/openjdk7/jre/lib/zi/Pacific/Tongatapu
diff -r b7944a94863f -r a5296d52ede3 lang/openjdk7/bootstrap.mk
--- a/lang/openjdk7/bootstrap.mk        Sun Aug 13 23:45:17 2017 +0000
+++ b/lang/openjdk7/bootstrap.mk        Mon Aug 14 00:02:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.19 2015/03/06 12:11:54 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.20 2017/08/14 00:02:16 ryoon Exp $
 #
 # This file contains a map of available binary bootstrap toolchains
 # and which kit to use for each supported platform.
@@ -23,8 +23,8 @@
 # All binary kits from now on MUST have an accompanying PGP signature from
 # the person who prepared the kit. Unsigned binaries on ftp will be purged.
 
-ONLY_FOR_PLATFORM=     NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
-ONLY_FOR_PLATFORM+=    NetBSD-7.*-sparc64 NetBSD-7.*-earmv[67]hf
+ONLY_FOR_PLATFORM=     NetBSD-[5678].*-i386 NetBSD-[5678].*-x86_64
+ONLY_FOR_PLATFORM+=    NetBSD-[78].*-sparc64 NetBSD-[78].*-earmv[67]hf
 ONLY_FOR_PLATFORM+=    DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
 
 BOOT.nb5-i386=         bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz
@@ -61,22 +61,22 @@
 EXTRACT_ONLY+=         ${BOOT.nb6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-i386) || !empty(MACHINE_PLATFORM:MNetBSD-7.*-i386) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-i386) || !empty(MACHINE_PLATFORM:MNetBSD-[78].*-i386) || make(distinfo)
 DISTFILES+=            ${BOOT.nb7-i386}
 EXTRACT_ONLY+=         ${BOOT.nb7-i386}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-7.*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-[78].*-x86_64) || make(distinfo)
 DISTFILES+=            ${BOOT.nb7-amd64}
 EXTRACT_ONLY+=         ${BOOT.nb7-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-sparc64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-[78].*-sparc64) || make(distinfo)
 DISTFILES+=            ${BOOT.nb7-sparc64}
 EXTRACT_ONLY+=         ${BOOT.nb7-sparc64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-earmv[67]hf) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-[78].*-earmv[67]hf) || make(distinfo)
 DISTFILES+=            ${BOOT.nb7-earmv6hf}
 EXTRACT_ONLY+=         ${BOOT.nb7-earmv6hf}
 .endif
diff -r b7944a94863f -r a5296d52ede3 lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Sun Aug 13 23:45:17 2017 +0000
+++ b/lang/openjdk7/distinfo    Mon Aug 14 00:02:16 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2015/11/03 22:59:10 tnn Exp $
+$NetBSD: distinfo,v 1.89 2017/08/14 00:02:16 ryoon Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -48,10 +48,10 @@
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140