diff options
| author | ryoon <ryoon@pkgsrc.org> | 2017-08-14 00:02:16 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2017-08-14 00:02:16 +0000 |
| commit | 21995d030d6d8c5a15acbf5936ecc6d17fc17a0a (patch) | |
| tree | 2528fa93218c2916a3b7f1ef975786f94a58acde | |
| parent | 70a2b7bb4767f376f9825f0cee0ed2c7d1fb8e8c (diff) | |
| download | pkgsrc-21995d030d6d8c5a15acbf5936ecc6d17fc17a0a.tar.gz | |
Update to 1.7.141
* Support build and run under NetBSD PaX MPROTECT environment
Changelog:
Many bugfixes and security bugfixes
19 files changed, 225 insertions, 166 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index ff833dad7d3..a238954f482 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -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_HOME= ${PREFIX}/java/${JAVA_NAME} 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 @@ post-extract: .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 @@ ${WRKDIR}/stage1-done: 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 @@ ${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 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 --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST index 035a4d9292d..cf7e54cb907 100644 --- a/lang/openjdk7/PLIST +++ b/lang/openjdk7/PLIST @@ -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/resources.jar 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/Tunis 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/Campo_Grande 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/Edmonton 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/Miquelon 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-au-Prince 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/Anadyr 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/Dhaka 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/Pontianak 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/Tbilisi 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/UCT 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/Helsinki 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/Prague 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/Kosrae 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/Pitcairn 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 --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk index 198fcce82aa..5961b3f92bd 100644 --- a/lang/openjdk7/bootstrap.mk +++ b/lang/openjdk7/bootstrap.mk @@ -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 @@ DISTFILES+= ${BOOT.nb6-amd64} 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 --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 1b8b28bad50..bf3e9eed2d7 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -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 @@ SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29b RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes -SHA1 (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 90f79a0436d539f58fb5ac70dda1ab9e9fc96ae0 -RMD160 (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 175e665bca448534195e0d9bd77f3d8dc66fcb07 -SHA512 (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 7183aec6796ba0ab420f91bf686383db744c7732e7a5825b1db5ba92bf15172590d9af210ba9ba74f3122990def6e5c1218b8bbc8891b42fa2d526008a182556 -Size (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 40534324 bytes +SHA1 (openjdk7/openjdk-1.7.141-20170813.tar.xz) = c9c53863a4131db5662e85b01325593f2720dd5f +RMD160 (openjdk7/openjdk-1.7.141-20170813.tar.xz) = 9631011e7c11e1f53cf3757a75dc139f98dcb088 +SHA512 (openjdk7/openjdk-1.7.141-20170813.tar.xz) = f4a1189c7d46632a5e5d2dbacd82a49e100a041376d677d1053c8a7beb9560b1c5ada555f6d1f8b88232738067ae752fa1a06596f655931116d28f222d6e0f20 +Size (openjdk7/openjdk-1.7.141-20170813.tar.xz) = 43218080 bytes SHA1 (openjdk7/rhino1_7R5.zip) = 39ada4cca8c7f651a68eda3f307ff9b68808f0ce RMD160 (openjdk7/rhino1_7R5.zip) = 04d47e3b108cfb62d8252c358b6f785c8268fc45 SHA512 (openjdk7/rhino1_7R5.zip) = 0f89d76dd5dee348b4d0593f3ee46e4a3918770991cd5752ae92fa31958b49407f5beeb258d44241411d8cc4f1ce09193791c001f19b6423ddcfe128a184f863 @@ -63,15 +63,15 @@ SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 SHA1 (patch-ah) = 2d67794791d84294e0ff1a217cb538725ddd95f0 SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897 -SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175 +SHA1 (patch-al) = 9df456ae11f1c11f885ed3881dc4ef2aa4585b6e SHA1 (patch-am) = 77185fb77c7b569f1d1a389a15eb8aca76f51c92 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd SHA1 (patch-ao) = 5eba16fc16c9a54a855951a153dc9138956dcf08 -SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476 +SHA1 (patch-ap) = bb88b3004190160f143ffa5c52e323e566b58686 SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf -SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423 +SHA1 (patch-bd) = 74c9f16002ad168c0575ac48ba9d86c6f0c71630 SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a @@ -79,6 +79,7 @@ SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58 +SHA1 (patch-hotspot_make_bsd_Makefile) = 6e7ddd879726f4780c7fae691674fbf5259a3b81 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 0606206a28b741ee7c3c34cf62a3a227238fb98c SHA1 (patch-hotspot_make_bsd_makefiles_zeroshark.make) = fe0e3d001f2ff996c44dd977595e08c06f911773 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 @@ -106,7 +107,7 @@ SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 -SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2 +SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = cea59006e61c00c90608e131ed1346966be4e495 SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 @@ -119,13 +120,13 @@ SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 1935e82 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 -SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 697467f606ff6a13127ea9027018ca401d354e58 -SHA1 (patch-jdk_make_com_sun_nio_Makefile) = ab2ce3fd1a1a8ad6009d81025cc07077abe9a048 +SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 13c85421b59aa6a98201d9760e28eec76e691f37 +SHA1 (patch-jdk_make_com_sun_nio_Makefile) = 82baf043563d790170809594ff69086ba5cec8e8 SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = d813b39d23cc90c9f51c4714e6f066cc7804e61d SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 -SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239 +SHA1 (patch-jdk_make_common_Program.gmk) = 727a1f2281910c8b9354713ac0a12156ddfc3594 SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91 @@ -136,10 +137,10 @@ SHA1 (patch-jdk_make_java_net_FILES__c.gmk) = 31aefe6781989d98bdb23433fc5b6ed6ab SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c SHA1 (patch-jdk_make_java_npt_Makefile) = 91903de199e8546bb17c8dc30ae616eeb7c8b906 SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a -SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30 +SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = 5379efff76c3cbb1bf56554aaa7890f169b6fc7d SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460 SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b -SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = 43a2ffd403570ca681b817f13ea429698e9783b9 +SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = 81d6fb29a2063667ac153f723330663c0e71f2c2 SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335 @@ -154,16 +155,15 @@ SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da30 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716 -SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 9f0b2ab0789367a2d46cbd4581144beec9e36680 -SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 265d9f401eff6a39d607c8c8a14ecb56c089ed44 -SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 02e51e702868e1cea4a2628eccbcaa81f231efce +SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = dfa4eae8f6e0296fcba8f1519f11b4de8ac95f36 +SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 5ac6eaf6b32ad8bef50830364ea1fd455bdbbb3f +SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 2bb10608969e9ef747d1cc0a6b8796fe4b38a4e7 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 1a7a73c41a35b1719d8a68e9cea2aa47d5e828fc -SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 205b724aa91169cfe81217893bc5922e5b47da6f SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 3bc9e099a6c3152645882e4fba128ae8e709efbb SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc695a14cab51fa7089eb2a0a04b SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7 -SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = c6f3b3bcaf67951a458f01788a9d32e5873c7e5a +SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = 9059e8a5eace5ae48dd913e5ce57b9bface68745 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 SHA1 (patch-jdk_test_Makefile) = 0bdd1af41390bb0e02244c7596d5c35b9771bfb6 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb diff --git a/lang/openjdk7/patches/patch-al b/lang/openjdk7/patches/patch-al index 49caa2af2fd..4182b2c346f 100644 --- a/lang/openjdk7/patches/patch-al +++ b/lang/openjdk7/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.5 2014/01/02 01:16:35 ryoon Exp $ +$NetBSD: patch-al,v 1.6 2017/08/14 00:02:16 ryoon Exp $ DragonFly support. ---- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2014-01-01 05:53:43.000000000 +0000 +--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2017-08-13 05:55:21.000000000 +0000 +++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java @@ -28,6 +28,8 @@ package sun.nio.fs; import java.nio.file.spi.FileSystemProvider; @@ -45,5 +45,5 @@ DragonFly support. - if (osname.endsWith("BSD")) + if (osname.endsWith("BSD") || osname.equals("DragonFly")) return createProvider("sun.nio.fs.BsdFileSystemProvider"); - throw new AssertionError("Platform not recognized"); - } + if (osname.equals("AIX") || osname.equals("OS400")) + return createProvider("sun.nio.fs.AixFileSystemProvider"); diff --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap index cc339041933..149b296c307 100644 --- a/lang/openjdk7/patches/patch-ap +++ b/lang/openjdk7/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.6 2014/06/01 17:55:33 wiz Exp $ +$NetBSD: patch-ap,v 1.7 2017/08/14 00:02:16 ryoon Exp $ Use pkgsrc fontconfig. ---- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2014-01-01 05:53:43.000000000 +0000 +--- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2017-08-13 05:55:21.000000000 +0000 +++ jdk/src/solaris/native/sun/awt/fontpath.c @@ -73,8 +73,8 @@ extern Display *awt_display; #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1") @@ -15,7 +15,7 @@ Use pkgsrc fontconfig. #endif #define MAXFDIRS 512 /* Max number of directories that contain fonts */ -@@ -182,6 +182,27 @@ static char *fullLinuxFontPath[] = { +@@ -190,6 +190,27 @@ static char *fullAixFontPath[] = { NULL, /* terminates the list */ }; #endif @@ -43,9 +43,9 @@ Use pkgsrc fontconfig. static char **getFontConfigLocations(); -@@ -551,6 +572,7 @@ static char *getPlatformFontPathChars(JN - #else /* IF SOLARIS */ - knowndirs = fullSolarisFontPath; +@@ -561,6 +582,7 @@ static char *getPlatformFontPathChars(JN + #elif defined(AIX) + knowndirs = fullAixFontPath; #endif + knowndirs = pkgsrcFontPath; diff --git a/lang/openjdk7/patches/patch-bd b/lang/openjdk7/patches/patch-bd index fb63c6c686a..753285de606 100644 --- a/lang/openjdk7/patches/patch-bd +++ b/lang/openjdk7/patches/patch-bd @@ -1,12 +1,12 @@ -$NetBSD: patch-bd,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-bd,v 1.5 2017/08/14 00:02:16 ryoon Exp $ Support __progname and environ. ---- jdk/make/com/sun/java/pack/mapfile-vers.orig 2012-08-10 17:21:30.000000000 +0000 +--- jdk/make/com/sun/java/pack/mapfile-vers.orig 2017-08-13 05:55:12.000000000 +0000 +++ jdk/make/com/sun/java/pack/mapfile-vers -@@ -28,6 +28,8 @@ +@@ -33,6 +33,8 @@ - SUNWprivate_1.1 { + { global: + __progname; + environ; diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile b/lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile new file mode 100644 index 00000000000..ee2ae0e7ea3 --- /dev/null +++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile @@ -0,0 +1,62 @@ +$NetBSD: patch-hotspot_make_bsd_Makefile,v 1.1 2017/08/14 00:02:16 ryoon Exp $ + +* Disable run of test_gamma to fix invocation failure from PaX MPROTECT + Partially from http://hg.openjdk.java.net/hsx/hsx25/hotspot/rev/98f3af397705 + +--- hotspot/make/bsd/Makefile.orig 2017-08-13 05:55:27.000000000 +0000 ++++ hotspot/make/bsd/Makefile +@@ -290,54 +290,36 @@ platform_zero: $(GAMMADIR)/make/$(OSNAME + + $(TARGETS_C2): $(SUBDIRS_C2) + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) +-ifeq ($(TEST_IN_BUILD),true) +- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma +-endif + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_TIERED): $(SUBDIRS_TIERED) + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) +-ifeq ($(TEST_IN_BUILD),true) +- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma +-endif + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_C1): $(SUBDIRS_C1) + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) +-ifeq ($(TEST_IN_BUILD),true) +- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma +-endif + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_CORE): $(SUBDIRS_CORE) + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) +-ifeq ($(TEST_IN_BUILD),true) +- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma +-endif + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_ZERO): $(SUBDIRS_ZERO) + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) +-ifeq ($(TEST_IN_BUILD),true) +- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma +-endif + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_SHARK): $(SUBDIRS_SHARK) + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) +-ifeq ($(TEST_IN_BUILD),true) +- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma +-endif + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install + endif diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp index 7c3cbb460ae..23e04e8a1a5 100644 --- a/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp +++ b/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.2 2017/08/14 00:02:16 ryoon Exp $ rlim_t fixes. ---- hotspot/src/os/posix/vm/os_posix.cpp.orig 2013-06-11 09:37:03.648327363 +0000 +--- hotspot/src/os/posix/vm/os_posix.cpp.orig 2017-08-13 05:55:27.000000000 +0000 +++ hotspot/src/os/posix/vm/os_posix.cpp -@@ -130,12 +130,12 @@ void os::Posix::print_rlimit_info(output +@@ -162,12 +162,12 @@ void os::Posix::print_rlimit_info(output st->print(" STACK "); getrlimit(RLIMIT_STACK, &rlim); @@ -18,8 +18,8 @@ rlim_t fixes. + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); else st->print("%uk", rlim.rlim_cur >> 10); - //Isn't there on solaris -@@ -148,7 +148,7 @@ void os::Posix::print_rlimit_info(output + // Isn't there on solaris and aix. +@@ -180,7 +180,7 @@ void os::Posix::print_rlimit_info(output st->print(", NOFILE "); getrlimit(RLIMIT_NOFILE, &rlim); @@ -28,7 +28,7 @@ rlim_t fixes. else st->print("%d", rlim.rlim_cur); #ifdef __OpenBSD__ -@@ -160,7 +160,7 @@ void os::Posix::print_rlimit_info(output +@@ -192,7 +192,7 @@ void os::Posix::print_rlimit_info(output #else st->print(", AS "); getrlimit(RLIMIT_AS, &rlim); diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile index 8a73ffb2afa..c7269c05113 100644 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile @@ -1,9 +1,9 @@ -$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.2 2015/02/10 19:31:54 tnn Exp $ +$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.3 2017/08/14 00:02:16 ryoon Exp $ Disable SunOS multiarch. Let the build find intermediate libs when it wants to run intermediate rmic. ---- jdk/make/com/sun/jmx/Makefile.orig 2015-01-26 15:20:56.000000000 +0000 +--- jdk/make/com/sun/jmx/Makefile.orig 2017-08-13 05:55:12.000000000 +0000 +++ jdk/make/com/sun/jmx/Makefile @@ -106,7 +106,7 @@ FILES_ties = $(subst javax/management/ @@ -14,12 +14,12 @@ Let the build find intermediate libs when it wants to run intermediate rmic. RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java endif ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9) -@@ -114,7 +114,7 @@ RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/jav - endif - - ifeq ($(CROSS_COMPILE_ARCH),) --RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main -+RMIC = env LD_LIBRARY_PATH=$(OUTPUTDIR)/lib/$(LIBARCH):$(OUTPUTDIR)/lib/$(LIBARCH)/jli:$(LD_LIBRARY_PATH) $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main +@@ -118,7 +118,7 @@ RMIC_VM = $(RMIC_JAVA) else - RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main + RMIC_VM = $(BOOT_JAVA_CMD) endif +-RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main ++RMIC = env LD_LIBRARY_PATH=$(OUTPUTDIR)/lib/$(LIBARCH):$(OUTPUTDIR)/lib/$(LIBARCH)/jli:$(LD_LIBRARY_PATH) $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main + + $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class + $(prep-target) diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile index 9798afbf30a..a4949df61cf 100644 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile @@ -1,19 +1,15 @@ -$NetBSD: patch-jdk_make_com_sun_nio_Makefile,v 1.1 2015/01/27 12:31:06 ryoon Exp $ +$NetBSD: patch-jdk_make_com_sun_nio_Makefile,v 1.2 2017/08/14 00:02:16 ryoon Exp $ * NetBSD has no SCTP support. ---- jdk/make/com/sun/nio/Makefile.orig 2015-01-26 15:20:56.000000000 +0000 +--- jdk/make/com/sun/nio/Makefile.orig 2017-08-13 05:55:12.000000000 +0000 +++ jdk/make/com/sun/nio/Makefile -@@ -29,8 +29,12 @@ - - BUILDDIR = ../../.. +@@ -31,7 +31,7 @@ BUILDDIR = ../../.. include $(BUILDDIR)/common/Defs.gmk -+ -+# disable for NetBSD -+ifneq ($(OS_VENDOR), NetBSD) + + # MMM: disable for now +-ifeq (, $(findstring $(PLATFORM), macosx aix)) ++ifeq (, $(findstring $(PLATFORM), macosx aix netbsd)) include $(BUILDDIR)/common/Subdirs.gmk SUBDIRS = sctp -+endif - - all build clean clobber:: - $(SUBDIRS-loop) + endif diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk index 533b319d0c6..8c4f2f6647e 100644 --- a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk +++ b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_make_common_Program.gmk,v 1.3 2014/01/02 01:16:35 ryoon Exp $ +$NetBSD: patch-jdk_make_common_Program.gmk,v 1.4 2017/08/14 00:02:16 ryoon Exp $ GCC support. ---- jdk/make/common/Program.gmk.orig 2014-01-01 05:53:33.000000000 +0000 +--- jdk/make/common/Program.gmk.orig 2017-08-13 05:55:12.000000000 +0000 +++ jdk/make/common/Program.gmk @@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM) ifndef CROSS_COMPILE_ARCH @@ -39,4 +39,4 @@ GCC support. + endif # SYSTEM_ZLIB endif # PLATFORM linux solaris - ifeq ($(PLATFORM), windows) + # AIX can not handle $ORIGIN so we have to link with the static JLI version (libjli.a) diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk b/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk index 08bd0b903de..32c3a889c68 100644 --- a/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk +++ b/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk @@ -1,9 +1,18 @@ -$NetBSD: patch-jdk_make_sun_awt_mawt.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_make_sun_awt_mawt.gmk,v 1.2 2017/08/14 00:02:16 ryoon Exp $ Fix "Extraneous text after `ifeq' directive". ---- jdk/make/sun/awt/mawt.gmk.orig 2013-06-14 12:22:13.564220901 +0000 +--- jdk/make/sun/awt/mawt.gmk.orig 2017-08-13 05:55:12.000000000 +0000 +++ jdk/make/sun/awt/mawt.gmk +@@ -166,7 +166,7 @@ LIBXMU_OPT = + LIBXMU = $(LIBXMU_$(VARIANT)) + + ifeq ($(PLATFORM), solaris) +-OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi ++OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -X11 -lXi + endif + + ifneq (,$(findstring $(PLATFORM), bsd linux macosx)) @@ -193,7 +193,7 @@ endif # # Other extra flags needed for compiling. @@ -13,7 +22,7 @@ Fix "Extraneous text after `ifeq' directive". CPPFLAGS += -I$(CUPS_HEADERS_PATH) ifndef HEADLESS -@@ -245,13 +245,13 @@ ifeq ($(PLATFORM), linux) +@@ -245,7 +245,7 @@ ifeq ($(PLATFORM), linux) $(wildcard /usr/include/X11/extensions)) endif @@ -22,10 +31,3 @@ Fix "Extraneous text after `ifeq' directive". CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ -I$(OPENWIN_HOME)/include \ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" - endif - --ifeq ($(PLATFORM), macosx)) -+ifeq ($(PLATFORM), macosx) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include - endif diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile index 1861f5b99bf..3335f1284bc 100644 --- a/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile @@ -1,11 +1,11 @@ -$NetBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.2 2015/04/27 19:24:17 jperkin Exp $ +$NetBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.3 2017/08/14 00:02:16 ryoon Exp $ GCC support. ---- jdk/make/sun/splashscreen/Makefile.orig 2013-06-11 09:37:03.893407544 +0000 +--- jdk/make/sun/splashscreen/Makefile.orig 2017-08-13 05:55:16.000000000 +0000 +++ jdk/make/sun/splashscreen/Makefile -@@ -91,6 +91,11 @@ else ifneq ($(PLATFORM), windows) - OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv +@@ -109,6 +109,11 @@ else ifneq ($(PLATFORM), windows) + OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread endif endif + ifeq ($(PLATFORM), solaris) @@ -13,6 +13,6 @@ GCC support. + OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv + endif + endif - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread else # PLATFORM + CFLAGS += -DWITH_WIN32 + OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd index 9dde94039e2..48ec7fba74f 100644 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd @@ -1,8 +1,10 @@ -$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.2 2015/06/09 15:03:43 tnn Exp $ +$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.3 2017/08/14 00:02:16 ryoon Exp $ * Under NetBSD 5, use fork instead of posix_spawn. NetBSD 5 has no posix_spawn. +++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd +--- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd.orig 2017-08-13 05:55:20.000000000 +0000 ++++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd @@ -103,14 +103,28 @@ final class UNIXProcess extends Process helperpath = toCString(javahome + "/lib/jspawnhelper"); } diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java index 0659d7f92c9..faf1c5ab618 100644 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java @@ -1,9 +1,9 @@ -$NetBSD: patch-jdk_src_solaris_classes_sun_net_PortConfig.java,v 1.2 2014/05/02 10:48:13 ryoon Exp $ +$NetBSD: patch-jdk_src_solaris_classes_sun_net_PortConfig.java,v 1.3 2017/08/14 00:02:16 ryoon Exp $ ---- jdk/src/solaris/classes/sun/net/PortConfig.java.orig 2014-05-01 13:11:40.000000000 +0000 +--- jdk/src/solaris/classes/sun/net/PortConfig.java.orig 2017-08-13 05:55:21.000000000 +0000 +++ jdk/src/solaris/classes/sun/net/PortConfig.java -@@ -52,7 +52,7 @@ public final class PortConfig { - } else if (os.startsWith("SunOS")) { +@@ -59,7 +59,7 @@ public final class PortConfig { + } else if (os.startsWith("AIX")) { defaultLower = 32768; defaultUpper = 65535; - } else if (os.contains("OS X") || os.endsWith("BSD")) { diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java index b91b402018b..740e6130b8c 100644 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java @@ -1,9 +1,9 @@ -$NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java,v 1.2 2014/05/02 10:48:13 ryoon Exp $ +$NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java,v 1.3 2017/08/14 00:02:16 ryoon Exp $ * Fix apache-tomcat7's error, "java.lang.InternalError: platform not recognized" patch is from http://www.freebsd.org/cgi/query-pr.cgi?pr=183389 ---- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig 2014-05-01 13:11:40.000000000 +0000 +--- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig 2017-08-13 05:55:21.000000000 +0000 +++ jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java @@ -50,7 +50,7 @@ public class DefaultAsynchronousChannelP return new SolarisAsynchronousChannelProvider(); @@ -12,5 +12,5 @@ $NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProv - if (osname.contains("OS X") || osname.endsWith("BSD")) + if (osname.contains("OS X") || osname.endsWith("BSD") || osname.contains("DragonFly")) return new BsdAsynchronousChannelProvider(); - throw new InternalError("platform not recognized"); - } + if (osname.equals("AIX")) + return new AixAsynchronousChannelProvider(); diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c deleted file mode 100644 index 4972e23da83..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c,v 1.1 2014/07/21 00:15:41 ryoon Exp $ - -* NetBSD 5 has no posix_spawn. - ---- jdk/src/solaris/native/java/lang/UNIXProcess_md.c.orig 2014-06-14 20:38:31.000000000 +0000 -+++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c -@@ -48,9 +48,15 @@ - #include <signal.h> - #include <string.h> - -+#if defined(__NetBSD__) -+#include <sys/param.h> -+#endif -+ - #if defined(__solaris__) || defined(_ALLBSD_SOURCE) -+#if !defined(__NetBSD__) || (__NetBSD_Version__ >= 600000000) - #include <spawn.h> - #endif -+#endif - - #include "childproc.h" - -@@ -460,6 +466,7 @@ forkChild(ChildStuff *c) { - } - - #if defined(__solaris__) || defined(_ALLBSD_SOURCE) -+#if !defined(__NetBSD__) || (__NetBSD_Version__ >= 600000000) - static pid_t - spawnChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) { - pid_t resultPid; -@@ -543,6 +550,7 @@ spawnChild(JNIEnv *env, jobject process, - return resultPid; - } - #endif -+#endif - - /* - * Start a child process running function childProcess. -@@ -556,9 +564,11 @@ startChild(JNIEnv *env, jobject process, - case MODE_FORK: - return forkChild(c); - #if defined(__solaris__) || defined(_ALLBSD_SOURCE) -+#if !defined(__NetBSD__) || (__NetBSD_Version__ >= 600000000) - case MODE_POSIX_SPAWN: - return spawnChild(env, process, c, helperpath); - #endif -+#endif - default: - return -1; - } diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h index aa7384b1c80..bf97323a359 100644 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h @@ -1,13 +1,13 @@ -$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.h,v 1.1 2014/07/25 20:35:14 ryoon Exp $ +$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.h,v 1.2 2017/08/14 00:02:16 ryoon Exp $ ---- jdk/src/solaris/native/java/net/net_util_md.h.orig 2014-06-14 20:38:31.000000000 +0000 +--- jdk/src/solaris/native/java/net/net_util_md.h.orig 2017-08-13 05:55:21.000000000 +0000 +++ jdk/src/solaris/native/java/net/net_util_md.h -@@ -37,7 +37,7 @@ - #endif - - --#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined(__DragonFly__) +@@ -46,7 +46,7 @@ + close subroutine does not return until the select call returns. + ... + */ +-#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined (_AIX) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined (_AIX) || defined(__DragonFly__) extern int NET_Timeout(int s, long timeout); extern int NET_Read(int s, void* buf, size_t len); extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, |