[pkgsrc/pkgsrc-2017Q1]: pkgsrc/lang/openjdk8 Pullup ticket #5228 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4a79cac1ac9
branches:  pkgsrc-2017Q1
changeset: 360205:c4a79cac1ac9
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Apr 01 18:07:19 2017 +0000

description:
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

diffstat:

 lang/openjdk8/Makefile                                                                 |   8 +-
 lang/openjdk8/PLIST                                                                    |   3 +-
 lang/openjdk8/distinfo                                                                 |   3 +-
 lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java |  28 ++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diffs (91 lines):

diff -r a8669bc52468 -r c4a79cac1ac9 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Sat Apr 01 14:59:21 2017 +0000
+++ b/lang/openjdk8/Makefile    Sat Apr 01 18:07:19 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2017/02/12 06:25:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.46.2.1 2017/04/01 18:07:19 bsiegert Exp $
 
 DISTNAME=      openjdk-1.8.121-20170131
 PKGNAME=       openjdk8-1.8.121
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.xz
@@ -20,8 +20,8 @@
 
 JAVA_NAME=     openjdk8
 JAVA_HOME=     ${PREFIX}/java/${JAVA_NAME}
-JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps keytool orbd \
-               policytool rmid rmiregistry servertool tnameserv
+JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps jstack keytool \
+               orbd policytool rmid rmiregistry servertool tnameserv
 
 BUILD_DEPENDS+=                mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
 
diff -r a8669bc52468 -r c4a79cac1ac9 lang/openjdk8/PLIST
--- a/lang/openjdk8/PLIST       Sat Apr 01 14:59:21 2017 +0000
+++ b/lang/openjdk8/PLIST       Sat Apr 01 18:07:19 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/08/11 15:34:29 abs Exp $
+@comment $NetBSD: PLIST,v 1.6.6.1 2017/04/01 18:07:19 bsiegert Exp $
 bin/openjdk8-jar
 bin/openjdk8-java
 bin/openjdk8-javac
@@ -7,6 +7,7 @@
 bin/openjdk8-javap
 bin/openjdk8-jcmd
 bin/openjdk8-jps
+bin/openjdk8-jstack
 bin/openjdk8-keytool
 bin/openjdk8-orbd
 bin/openjdk8-policytool
diff -r a8669bc52468 -r c4a79cac1ac9 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Sat Apr 01 14:59:21 2017 +0000
+++ b/lang/openjdk8/distinfo    Sat Apr 01 18:07:19 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2017/02/04 01:16:30 ryoon Exp $
+$NetBSD: distinfo,v 1.44.2.1 2017/04/01 18:07:19 bsiegert Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -113,6 +113,7 @@
 SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 15ed4c5d01b50ab63447a19883925ac975d8390f
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
+SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b
 SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
diff -r a8669bc52468 -r c4a79cac1ac9 lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java    Sat Apr 01 18:07:19 2017 +0000
@@ -0,0 +1,28 @@
+$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) {