From 464ee026a899f0cbaacbe5fcff739cec567603b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 9 Apr 2025 10:47:03 +0700 Subject: [PATCH] openjdk21: use system ca-certs --- srcpkgs/openjdk21/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openjdk21/template b/srcpkgs/openjdk21/template index fc7f08bd50a..f44e4f6c2a0 100644 --- a/srcpkgs/openjdk21/template +++ b/srcpkgs/openjdk21/template @@ -1,7 +1,7 @@ # Template file for 'openjdk21' pkgname=openjdk21 version=21.0.7+2 -revision=1 +revision=2 _gtest_ver=1.13.0 _java_ver="${version%%.*}" _jdk_update="${version#*+}" @@ -32,7 +32,7 @@ make_build_args="images static-libs-image $(vopt_if docs docs)" make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\"" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates - openssl zlib-devel which p11-kit" + openssl zlib-devel which" 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" @@ -123,7 +123,7 @@ post_install() { mv ${DESTDIR}/usr/lib/jvm/openjdk-${_base_version} ${DESTDIR}/$_jdk_home vcopy build/*-release/images/static-libs/lib $_jdk_home vmkdir $_jdk_home/lib/security - trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts" + ln -fs /etc/ssl/certs/java/cacerts "${DESTDIR}/${_jdk_home}/lib/security" } subpackages="openjdk21-static-libs openjdk21-src openjdk21-jre openjdk21-doc openjdk21-jmods"