From nobody Tue May 06 13:35:16 2025 X-Original-To: dev-commits-ports-branches@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 4ZsKC84w4tz5tpvd; Tue, 06 May 2025 13:35:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsKC84JFQz3qKK; Tue, 06 May 2025 13:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746538516; 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=eIqi7WNETbtf7zIu5pJpTxrxDd20m+kConoGTwYuaek=; b=auMZB53/tOvaP7p7j1Cp0rQD6oA/adl66zMT9DB8tbn+htuiLw0vnbyZ18xMYMcIU3ZxCh m41ViLa1zOswQKKpWY1d4x12r8lQkutz552ce1WHwsQdoV7FN99q006wuwVwjZnU/ry3WS WlzrBObuS9obcQmeM3OG5ChFii8MauDQiwLaGcoLOHv35Y4ADnC1Hj5+GTe4NR+ZgS5qRs NI39aVIg50q5XchUFXDR8i4uxsxhG22C4fP0RJDZ8KYnurQAq70aHV3XTMebBguV1ZtOdC Je9Ef/DP7Q1y9ciZ5tn1I9rTiEKK+m3G78gODrK7eFHZJrKgzekh3rXoEFSCIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746538516; 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=eIqi7WNETbtf7zIu5pJpTxrxDd20m+kConoGTwYuaek=; b=Ekh/REGuMrj+bGIBfZ94qLEOIDEvkiSbvJ6KuD8V9G4/UNilYEMgk5KFGS3iFuVrqVIdEf EWpARK2rVNp+iLBWYm8pS1be2j5gOycdlM8+JOn9Tpd2pwUB4wDymi8dpVfmXrINw125fS A04M4Dy9RafUr0f8tECJ0FUnS/Frn7iNi+D7/Q9Az1efAv2sA0QWQ8y34Ixsu6Fng6R3/r YxJEg6ahGbpDrhFmLubUgq5lUjWh0oYvWNvVvFX11euap79oY5zu0XJR6VLAOBEJFj1ki8 qcqBLO7eMDrMHXNHpj4jB2wur2rPEctSfbOo3MCm2PGzPw/LUaf2pU6QgqoBFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746538516; a=rsa-sha256; cv=none; b=RUWXkcc9afeomtQNP2FcZwU5I/NzKOr9hs/ui64ULADMk7F+wS6n5kseagRGUeI1rwS6YQ HQyYiNQ7LVEhzkuZk2+APnoFDFJF3uJfOUUtxVk6IkSqWPMY11OB+p2CxCWGkMzTO0M5XW C0JexuBX39xHV9u++rr8Qt9eYClH6E48INMVdhgYgSBibUKA7lYE2UiaVS1cBBbywUXa7D HACigRZYEyku6j7jkeAbl9wAzo2CAfCnqdDKpjHxjwQ7s1rH2bQaysx0He1xXqmYAGZThT 2+LD31foqkStWKEFssPGlV77bwame9UoNmrHbgNdxmF2WibasDqcj7+D+TVSSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZsKC83k3wz11jy; Tue, 06 May 2025 13:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546DZGg0075794; Tue, 6 May 2025 13:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546DZG2I075791; Tue, 6 May 2025 13:35:16 GMT (envelope-from git) Date: Tue, 6 May 2025 13:35:16 GMT Message-Id: <202505061335.546DZG2I075791@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 7ebfe61f394a - 2025Q2 - www/tomee: Add Java 9+ specific start-up parameters, improve port List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q2 X-Git-Reftype: branch X-Git-Commit: 7ebfe61f394af3921d78ebea6de35b39431b5972 Auto-Submitted: auto-generated The branch 2025Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ebfe61f394af3921d78ebea6de35b39431b5972 commit 7ebfe61f394af3921d78ebea6de35b39431b5972 Author: Lars Herschke AuthorDate: 2025-05-06 13:19:16 +0000 Commit: Vladimir Druzenko CommitDate: 2025-05-06 13:34:57 +0000 www/tomee: Add Java 9+ specific start-up parameters, improve port Fix typo in rc script. Fix DOS line endings in configs. Add Java 9+ specific start-up parameters. PR: 286475 MFH: 2025Q2 (cherry picked from commit 67049167cf285f79a5a8b0df1b31d11dade886a5) --- www/tomee/Makefile | 7 ++++++- www/tomee/files/tomee.in | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/www/tomee/Makefile b/www/tomee/Makefile index a27633495d69..a5c906758dff 100644 --- a/www/tomee/Makefile +++ b/www/tomee/Makefile @@ -1,5 +1,6 @@ PORTNAME= tomee DISTVERSION= 8.0.16 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${DISTVERSION}/ DISTNAME= apache-${PORTNAME}-${DISTVERSION}-webprofile @@ -12,8 +13,12 @@ LICENSE= APACHE20 RUN_DEPENDS= jsvc:devel/apache-commons-daemon -USES= cpe java +USES= cpe dos2unix java CPE_VENDOR= apache +DOS2UNIX_FILES= ${TOMEE_CONF_FILES} catalina.policy.original \ + server.xml.original tomcat-users.xml.original \ + tomcat-users.xsd +DOS2UNIX_WRKSRC= ${WRKSRC}/conf USE_RC_SUBR= ${PKGBASE} EXTRACT_AFTER_ARGS= --exclude *.bat \ diff --git a/www/tomee/files/tomee.in b/www/tomee/files/tomee.in index ebc26f0476a1..2947d1acedc8 100644 --- a/www/tomee/files/tomee.in +++ b/www/tomee/files/tomee.in @@ -85,7 +85,7 @@ eval "${rcvar}=\${${rcvar}:-'NO'}" eval "_tomee_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}" eval "_tomee_catalina_user=\${${name}_catalina_user:-'%%TOMEE_USER%%'}" eval "_tomee_catalina_home=\${${name}_catalina_home:-'%%TOMEE_HOME%%'}" -eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}" +eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomee_catalina_home}'}" eval "_tomee_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomee_catalina_base}/temp'}" eval "_tomee_stdout=\${${name}_stdout:-'${_tomee_catalina_base}/logs/catalina.out'}" eval "_tomee_stderr=\${${name}_stderr:-'&1'}" @@ -104,10 +104,24 @@ required_dirs="${_tomee_catalina_tmpdir}" extra_commands="reload" _tomee_java_version=`${_tomee_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` +_tomee_java9_opts="\ + --add-opens=java.base/java.io=ALL-UNNAMED \ + --add-opens=java.base/java.lang=ALL-UNNAMED \ + --add-opens=java.base/java.net=ALL-UNNAMED \ + --add-opens=java.base/java.util=ALL-UNNAMED \ + --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \ + --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \ + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +_tomee_java17_opts="--enable-native-access=ALL-UNNAMED" case "${_tomee_java_version}" in - 9* | [1-2][0-9]* ) + 1[7-9]* | [2-9][0-9]* ) _tomee_endorsed_dirs_option= + _tomee_java_opts="${_tomee_java_opts} ${_tomee_java9_opts} ${_tomee_java17_opts}" + ;; + 9* | 1[0-6]* ) + _tomee_endorsed_dirs_option= + _tomee_java_opts="${_tomee_java_opts} ${_tomee_java9_opts}" ;; *) _tomee_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomee_catalina_home}/endorsed'"