Sat Apr 1 18:07:19 2017 UTC ()
Pullup ticket #5228 - requested by sevan
lang/openjdk8: build fix

Revisions pulled up:
- lang/openjdk8/Makefile                                        1.47
- lang/openjdk8/PLIST                                           1.7
- lang/openjdk8/distinfo                                        1.45
- lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java 1.1

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Mar 30 12:42:24 UTC 2017

   Modified Files:
           pkgsrc/lang/openjdk8: Makefile

   Log Message:
   Add a wrapper for jstack.  Bump PKGREVISION.

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Mar 30 12:57:11 UTC 2017

   Modified Files:
           pkgsrc/lang/openjdk8: distinfo
   Added Files:
           pkgsrc/lang/openjdk8/patches:
               patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java

   Log Message:
   Pull in OI fix for https://www.illumos.org/issues/7227.

   Ride previous PKGREVISION bump.

---
   Module Name:    pkgsrc
   Committed By:   abs
   Date:           Fri Mar 31 07:55:14 UTC 2017

   Modified Files:
           pkgsrc/lang/openjdk8: PLIST

   Log Message:
   Add bin/openjdk8-jstack to PLIST to fix build


(bsiegert)
diff -r1.46 -r1.46.2.1 pkgsrc/lang/openjdk8/Makefile
diff -r1.6 -r1.6.6.1 pkgsrc/lang/openjdk8/PLIST
diff -r1.44 -r1.44.2.1 pkgsrc/lang/openjdk8/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java
cvs diff -r1.46 -r1.46.2.1 pkgsrc/lang/openjdk8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/Makefile 2017/02/12 06:25:38 1.46
+++ pkgsrc/lang/openjdk8/Makefile 2017/04/01 18:07:19 1.46.2.1
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.46 2017/02/12 06:25:38 ryoon Exp $ 1# $NetBSD: Makefile,v 1.46.2.1 2017/04/01 18:07:19 bsiegert Exp $
2 2
3DISTNAME= openjdk-1.8.121-20170131 3DISTNAME= openjdk-1.8.121-20170131
4PKGNAME= openjdk8-1.8.121 4PKGNAME= openjdk8-1.8.121
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 17
18# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles 18# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles
19DIST_SUBDIR= openjdk7 19DIST_SUBDIR= openjdk7
20 20
21JAVA_NAME= openjdk8 21JAVA_NAME= openjdk8
22JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 22JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
23JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps keytool orbd \ 23JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps jstack keytool \
24 policytool rmid rmiregistry servertool tnameserv 24 orbd policytool rmid rmiregistry servertool tnameserv
25 25
26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts 26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
27 27
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29CONFIGURE_SCRIPT= common/autoconf/configure 29CONFIGURE_SCRIPT= common/autoconf/configure
30CONFIG_SHELL= bash 30CONFIG_SHELL= bash
31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub 31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess 32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
33CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub 33CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub
34CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess 34CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess
35USE_LANGUAGES= c c++ 35USE_LANGUAGES= c c++
36USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run 36USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run
37UNLIMIT_RESOURCES= datasize stacksize 37UNLIMIT_RESOURCES= datasize stacksize
cvs diff -r1.6 -r1.6.6.1 pkgsrc/lang/openjdk8/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/PLIST 2016/08/11 15:34:29 1.6
+++ pkgsrc/lang/openjdk8/PLIST 2017/04/01 18:07:19 1.6.6.1
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1@comment $NetBSD: PLIST,v 1.6 2016/08/11 15:34:29 abs Exp $ 1@comment $NetBSD: PLIST,v 1.6.6.1 2017/04/01 18:07:19 bsiegert Exp $
2bin/openjdk8-jar 2bin/openjdk8-jar
3bin/openjdk8-java 3bin/openjdk8-java
4bin/openjdk8-javac 4bin/openjdk8-javac
5bin/openjdk8-javadoc 5bin/openjdk8-javadoc
6bin/openjdk8-javah 6bin/openjdk8-javah
7bin/openjdk8-javap 7bin/openjdk8-javap
8bin/openjdk8-jcmd 8bin/openjdk8-jcmd
9bin/openjdk8-jps 9bin/openjdk8-jps
 10bin/openjdk8-jstack
10bin/openjdk8-keytool 11bin/openjdk8-keytool
11bin/openjdk8-orbd 12bin/openjdk8-orbd
12bin/openjdk8-policytool 13bin/openjdk8-policytool
13bin/openjdk8-rmid 14bin/openjdk8-rmid
14bin/openjdk8-rmiregistry 15bin/openjdk8-rmiregistry
15bin/openjdk8-servertool 16bin/openjdk8-servertool
16bin/openjdk8-tnameserv 17bin/openjdk8-tnameserv
17java/openjdk8/ASSEMBLY_EXCEPTION 18java/openjdk8/ASSEMBLY_EXCEPTION
18java/openjdk8/LICENSE 19java/openjdk8/LICENSE
19java/openjdk8/THIRD_PARTY_README 20java/openjdk8/THIRD_PARTY_README
20${PLIST.x11}java/openjdk8/bin/appletviewer 21${PLIST.x11}java/openjdk8/bin/appletviewer
21java/openjdk8/bin/extcheck 22java/openjdk8/bin/extcheck
22java/openjdk8/bin/idlj 23java/openjdk8/bin/idlj
cvs diff -r1.44 -r1.44.2.1 pkgsrc/lang/openjdk8/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/distinfo 2017/02/04 01:16:30 1.44
+++ pkgsrc/lang/openjdk8/distinfo 2017/04/01 18:07:19 1.44.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.44 2017/02/04 01:16:30 ryoon Exp $ 1$NetBSD: distinfo,v 1.44.2.1 2017/04/01 18:07:19 bsiegert Exp $
2 2
3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
5SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 5SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
6Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes 6Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
7SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 7SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
8RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee 8RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
9SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2 9SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
10Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes 10Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
11SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 11SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
12RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea 12RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d 13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes 14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
@@ -103,26 +103,27 @@ SHA1 (patch-hotspot_src_share_vm_opto_no @@ -103,26 +103,27 @@ SHA1 (patch-hotspot_src_share_vm_opto_no
103SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80 103SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
104SHA1 (patch-hotspot_src_share_vm_runtime_virtualspace.cpp) = b5d77a6b50ecbe6724c694d8e4bec67020b8e1d2 104SHA1 (patch-hotspot_src_share_vm_runtime_virtualspace.cpp) = b5d77a6b50ecbe6724c694d8e4bec67020b8e1d2
105SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9 105SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
106SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7 106SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
107SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7 107SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
108SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92 108SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92
109SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 109SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
110SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 110SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
111SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 111SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
112SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac 112SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac
113SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 15ed4c5d01b50ab63447a19883925ac975d8390f 113SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 15ed4c5d01b50ab63447a19883925ac975d8390f
114SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d 114SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
115SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 115SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
 116SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b
116SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606 117SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
117SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317 118SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
118SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50 119SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
119SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4 120SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
120SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21 121SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
121SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd 122SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
122SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9 123SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
123SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63 124SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
124SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675 125SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
125SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d 126SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
126SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209 127SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
127SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 4e4cd6b8aef0011edf176505624ef4f518eb6c7e 128SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 4e4cd6b8aef0011edf176505624ef4f518eb6c7e
128SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124 129SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
File Added: pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java
$NetBSD: patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java,v 1.1.2.2 2017/04/01 18:07:19 bsiegert Exp $

Fix https://www.illumos.org/issues/7227

--- jdk/src/share/classes/sun/security/jca/ProviderConfig.java.orig	2017-01-31 13:43:12.000000000 +0000
+++ jdk/src/share/classes/sun/security/jca/ProviderConfig.java
@@ -102,15 +102,14 @@ final class ProviderConfig {
         Boolean o = AccessController.doPrivileged(
                                 new PrivilegedAction<Boolean>() {
             public Boolean run() {
-                File file = new File("/usr/lib/libpkcs11.so");
-                if (file.exists() == false) {
-                    return Boolean.FALSE;
-                }
-                if ("false".equalsIgnoreCase(System.getProperty
+                if ("true".equalsIgnoreCase(System.getProperty
                         ("sun.security.pkcs11.enable-solaris"))) {
-                    return Boolean.FALSE;
+                    File file = new File("/usr/lib/libpkcs11.so");
+                    if (file.exists()) {
+                        return Boolean.TRUE;
+                    }
                 }
-                return Boolean.TRUE;
+                return Boolean.FALSE;
             }
         });
         if (o == Boolean.FALSE) {