From nobody Tue May 06 13:29:26 2025 X-Original-To: dev-commits-ports-all@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 4ZsK4Q6T4xz5tptF; Tue, 06 May 2025 13:29:26 +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 4ZsK4Q5sHYz3nbs; Tue, 06 May 2025 13:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746538166; 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=xy9Pik0Cm/zTUWrQC7yAQTjOidSfYcjQ7A+nNV3E2LU=; b=owimF/ZBcm7y5t2LrZ+jVD9StwunUjcpEpNgF2BbqaDZbUj45/u7X7RZ7MiddWvS7nHCGH /h5LPg/WZrEDrJSwh1jzp3WaJQven5BGodyPTbxPE9fPlHAY9OPbq5HIjZA6tCkCF2T26I z+b0M1O4BTXFZo5VQ9FmpjuW2eBKpiP1+1VlaqnC3gxGRgQ1gh6JP1FrFAKx/w279VZqLK dlRTU0w/O0tiFDaY+MSX1KITYLOYc1s7UcX4LhRj/ioWGc6yvS249ZPEJukZGVEP/h53lw 6H4wF9x3mJysOfrTCfwLDy0QpKbU2lrwIQd4qlTeNgiD4pYCyOYXZ43H84a4Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746538166; 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=xy9Pik0Cm/zTUWrQC7yAQTjOidSfYcjQ7A+nNV3E2LU=; b=fdjY/OJMVKuqO1lR1lKOqY6bHhSaYERVxx1hVpIT4CrYXCE7DMEiVezFbRjAfHeBFbS9KL RNesDH6NXtkZVIA85lKOkhazoNmsw9ECBNtaIXygkm3m37olau38rpGNo2IKiAFAH7/ENk 1s/caS68P3jCq7OaRL7F2PJCiMIh3g45DB2KpdqxeeRUFkm2G7tKWBOIonctXw2YhJ1v7P WBE+KYcKuhWYBKF10zbSyfg0pVprGJI1Vra4/VlTqKwHsGxyeu1leYwxDtgc6zb/Fqlzvs uCX5ySTZhzvtvT5UvCWRcnFu7ACV6Kk9pE3uVA8kf3P3+fY4FTkCfWylaZYxSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746538166; a=rsa-sha256; cv=none; b=rNRGW/JdKzZGRQhWvUvYmI0vYXNz/TmorPlCLLWQ37eaAoWKhX5U2Q2Xx8jEyowBDjk0ty lgask7w7eW7fCq57ITY5rmLdAF9TmnVCJkitrejNRkrzVzC8j1Fgws0woh5CGsdlwAuGBb MY3luYnrT+melPC5wGrRhI4nOsCnJiYXTuhp4o1cpDkzXD064f2lc03bfZBfqq+9f6Ol3Q u0uAZwaCud4iJuIXQSRe4TAXcuhZNADk+zE+b7x6khRPXV8QCguyzDAKX1hlF1OSRCKCbF NphnVbVgbWHxcMVxJR0q0VqlthW9C2GpxMet6n4kSmnU9BLUzBmFf+oq1vp/9A== 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 4ZsK4Q5LKpz12Dp; Tue, 06 May 2025 13:29:26 +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 546DTQhZ057972; Tue, 6 May 2025 13:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546DTQcH057969; Tue, 6 May 2025 13:29:26 GMT (envelope-from git) Date: Tue, 6 May 2025 13:29:26 GMT Message-Id: <202505061329.546DTQcH057969@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 67049167cf28 - main - www/tomee: Add Java 9+ specific start-up parameters, improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 67049167cf285f79a5a8b0df1b31d11dade886a5 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=67049167cf285f79a5a8b0df1b31d11dade886a5 commit 67049167cf285f79a5a8b0df1b31d11dade886a5 Author: Lars Herschke AuthorDate: 2025-05-06 13:19:16 +0000 Commit: Vladimir Druzenko CommitDate: 2025-05-06 13:28:11 +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 --- 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'"