Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id AB5437A289 for ; Thu, 30 Mar 2017 12:57:12 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5439A855C0; Thu, 30 Mar 2017 12:57:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D8DD48557C for ; Thu, 30 Mar 2017 12:57:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 4KYDNN8Y7LGP for ; Thu, 30 Mar 2017 12:57:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3874984CDE for ; Thu, 30 Mar 2017 12:57:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2EF9DFBE4; Thu, 30 Mar 2017 12:57:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149087863165240" MIME-Version: 1.0 Date: Thu, 30 Mar 2017 12:57:11 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/openjdk8 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170330125711.2EF9DFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_149087863165240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/openjdk8/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149087863165240 Content-Disposition: inline Content-Length: 3106 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/openjdk8/distinfo diff -u pkgsrc/lang/openjdk8/distinfo:1.44 pkgsrc/lang/openjdk8/distinfo:1.45 --- pkgsrc/lang/openjdk8/distinfo:1.44 Sat Feb 4 01:16:30 2017 +++ pkgsrc/lang/openjdk8/distinfo Thu Mar 30 12:57:10 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2017/02/04 01:16:30 ryoon Exp $ +$NetBSD: distinfo,v 1.45 2017/03/30 12:57:10 jperkin 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_Awt2dLibraries. 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 Added files: Index: pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java:1.1 --- /dev/null Thu Mar 30 12:57:11 2017 +++ pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java Thu Mar 30 12:57:11 2017 @@ -0,0 +1,28 @@ +$NetBSD: patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java,v 1.1 2017/03/30 12:57:11 jperkin 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() { + 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) { --_----------=_149087863165240--