From 442bebb3474f8a28360575c4a3fe596f43a407fc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Apr 2025 18:18:19 -0700 Subject: [PATCH] openjdk11: use p11-kit directly instead of make-ca --- srcpkgs/openjdk11/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 494da5d6fca..e7d2b2af87b 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -28,7 +28,7 @@ configure_args=" make_build_args="images static-libs-image $(vopt_if docs docs)" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates - openssl zlib-devel which make-ca" + openssl zlib-devel which p11-kit" makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" @@ -113,11 +113,10 @@ do_configure() { do_install() { vmkdir $_jdk_home vcopy build/*-normal-*-release/images/jdk/* $_jdk_home + vmkdir $_jdk_home/lib/security - make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool - mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/ - chmod -R ugo+rw ./ca - rm -Rf ./ca + trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts" + vlicense ASSEMBLY_EXCEPTION vlicense LICENSE }