From cdb97532e3bd11a7a6b15b4c660b5d8c52675323 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Apr 2025 16:09:02 -0700 Subject: [PATCH] openjdk8: use p11-kit directly instead of make-ca --- srcpkgs/openjdk8/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 3f01bd94941..09e24b3eb01 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -31,7 +31,7 @@ configure_args=" make_build_args="images $(vopt_if docs docs) COMPILER_WARNINGS_FATAL=false GIT=true" make_install_args="GIT=true" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates - zlib-devel make-ca which" + zlib-devel p11-kit which" makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel" @@ -154,10 +154,7 @@ post_install() { done 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