From nobody Fri Feb 9 19:53:11 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TWkzr21VMz5BF5b; Fri, 9 Feb 2024 19:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TWkzr1NBdz4s5w; Fri, 9 Feb 2024 19:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707508392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5PQNEPFFKB4GPnlBBbcXgiQd1hJOeKB51CzHP3VBzQ=; b=b2zcg76kKCqo/o5LGHL29UlUaYUGqc9Iqj+B2Sm7lgJydD6/Pu7tG99VCBKpi4fSwqt9co EMTF22HRETEexuFAj88l95xzhcRTW3iRW3ptV7H4E8Qrn0R8HWWJW8GlDMtgf+EKoJK3Fh dci1hcFs6L8xOhJapswBCFuz86w6pKJ0O8ZeLwcDh925xWqta2XIieJ72x3UiryASiEUoE oLAC8Hu/lEhRgXG8ve6oBXN09PWKBrhgrJK/F8h/MCMN8LnnCoVSOJFedbL2SWp2nXbZP+ R1tX0CQ+seVf996sVnI1wndRtVIQQrVHBB/+5afxyXi2yCaNy7X3mbaeZFzb5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707508392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5PQNEPFFKB4GPnlBBbcXgiQd1hJOeKB51CzHP3VBzQ=; b=pscfB/+1xPpUqKurlZgwDFfYgr0DTCdsyrP/yOjuu2rWu1nI9oYaka17oYFNBjBcbcMSmW bIokDssszcuWZemNnx55I/uBiAjqM6axu2QYg9wLMZToBhW0prHaNDYF4+Zy0KZJeDpf96 rjIQ1G01qDFLfJFO0PHKc4RslklAX5nrSOy1juaSXXRpqwLr9XGf86sg4S2R7QeC4JEXDn W7kQZNskMSpTP1OaJBkV9FyhsBliCRzgmzBBEM38362iMVnA/HX6U4SoX6K9LSL5u8P5QH aWsLPF0vzPqwb0GbbkNELJYU22qNQ5UHkMGaHmq2SffS81inY4upgwOe2Bp01g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707508392; a=rsa-sha256; cv=none; b=QMfJjLySroKKpJmTm23oPXmw7zidyUVkmXNvS9SgdkGsN7URletah7xrDB0KKmH314pHz7 WvVDQvcb+NuMMMPLSvayLvexsu1bPrY8Dk5KeqcHcKDMUnFklYYPqm8oJm8kxG9QtLn/tG 3MtMNhhMYViQXhBwAXVqVMBZv5FMvK3rURaeIzC/rqXNWfvuoJER0xx/NJvO5iGIkq39PC aHzCVuez3bb99TQ2eshS33ku4V+b9xRJaRxrEI18YEg/gk/y/Dqq/18VKXkx8t9hP0qb5d R2wudmJ32cpBLaVxCmyL1H+Z3/QYNZ+kjXFox7+WVqawlXfyi8a/Q4bV4f7x0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TWkzr0QM8zmH2; Fri, 9 Feb 2024 19:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 419JrBDi071692; Fri, 9 Feb 2024 19:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419JrBx6071689; Fri, 9 Feb 2024 19:53:11 GMT (envelope-from git) Date: Fri, 9 Feb 2024 19:53:11 GMT Message-Id: <202402091953.419JrBx6071689@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Osipov Subject: git: d901bf5df9d2 - main - java/openjdk*: Allow users to specify an alternative cacerts file List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d901bf5df9d22af271582c28d9dc279a6794f3d0 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=d901bf5df9d22af271582c28d9dc279a6794f3d0 commit d901bf5df9d22af271582c28d9dc279a6794f3d0 Author: Michael Osipov AuthorDate: 2023-11-22 13:08:23 +0000 Commit: Michael Osipov CommitDate: 2024-02-09 19:52:07 +0000 java/openjdk*: Allow users to specify an alternative cacerts file Similar to certificate management with certctl(8) users can use custom enterprise CAs. These need to be assembled into a custom cacerts file. Therefore, an admin can install a custom truststore to an arbitrary location and have the OpenJDK port symlink to it by adding OPENJDK_SYMLINK_CACERTS to make.conf. E.g., OPENJDK_SYMLINK_CACERTS=/usr/local/etc/ssl/cacerts. PR: 229329 Approved by: jrm (mentor), otis (mentor), glewis Differential Revision: https://reviews.freebsd.org/D42720 --- java/openjdk11/Makefile | 7 +++++++ java/openjdk17/Makefile | 7 +++++++ java/openjdk21/Makefile | 7 +++++++ java/openjdk8/Makefile | 5 +++++ 4 files changed, 26 insertions(+) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 65dd031607ae..01bac3655923 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -1,6 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -192,6 +193,12 @@ post-patch: -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 +post-build: +.if defined(OPENJDK_SYMLINK_CACERTS) + @${RM} ${JDK_IMAGEDIR}/lib/security/cacerts + @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts +.endif + do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 0f9ff6cd2768..32cee2adfc7b 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -1,6 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -180,6 +181,12 @@ post-patch: -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 +post-build: +.if defined(OPENJDK_SYMLINK_CACERTS) + @${RM} ${JDK_IMAGEDIR}/lib/security/cacerts + @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts +.endif + do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile index f0dfc09f0d52..d02be6878d59 100644 --- a/java/openjdk21/Makefile +++ b/java/openjdk21/Makefile @@ -1,6 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -182,6 +183,12 @@ post-patch: -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 +post-build: +.if defined(OPENJDK_SYMLINK_CACERTS) + @${RM} ${JDK_IMAGEDIR}/lib/security/cacerts + @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts +.endif + do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 98a331ac61f4..95f003bd208d 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -1,5 +1,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -288,6 +289,10 @@ post-build: build.tools.tzdb.TzdbZoneRulesCompiler \ -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb .endif +.if defined(OPENJDK_SYMLINK_CACERTS) + @${RM} ${JRE_IMAGEDIR}/lib/security/cacerts + @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JRE_IMAGEDIR}/lib/security/cacerts +.endif post-build-TZUPDATE-on: @${RM} -r ${JRE_IMAGEDIR}/lib/zi