From nobody Tue Oct 24 10:33:54 2023 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 4SF7hL5JFBz4xry0; Tue, 24 Oct 2023 10:33:54 +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 4SF7hL4qPTz4Gg6; Tue, 24 Oct 2023 10:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698143634; 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=vdLve6rj4uGOZnkEaQu1A7oNU6ylf1tVvneEpsHLXa8=; b=dBIOsW9hBCMfe6OexZDhXYvSbxWRdDX/+rtaKo+wSlrN8MDlxByZLtgSVNVrHnZx0B7hIM EktyQ+HeXgEX9kNSLIxLZdKNrHRK8eRw7JQM8pZfAU5k59LYE2TAbXQ2fLelr3cyjszQWB lam9FWVWDcTdbySqkyUPsq4HOPNLS46IxhEVR/+b6yxwcOjdgQKKWZnHRMtE8egp0qe0St MXe6CY+gX7x63qbB96n3KhlZH03hs51Sai2NW9ApEgY0jJhxfsmXL4tq9rHLDthUegJE/R IP5Z13yb/cTUjonCYZEcKJXPK3iN/XNT5p9F7jUErRQJ2p4NyUITZIvFEgIHXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698143634; a=rsa-sha256; cv=none; b=f8kj4V4Ja1fsGoozcfYeYDXX1X7gd1lYcm6g1Ga0+FN4Ys/QpgLEOidNdYQY0HXg2AaPLc 4prj4Ubr2dEJiFZ4AipqDyzXI+ybMIlFp8EjjghHYrNhWkxek1WlV7Rbqo4nV7cnYXddRY MqPKP5pA6X0SdbtkZTij74LNkAII3yDs5D9/accyiCD3PeDxelz08LTyiz7d6Tj4xgItzd b84H8oIoKuSW4qYjVYlrAavGbhZ09mOXLxWThNSX7lLxcfLrZ86sQgl0pQGArBTYZ98F// Oa6oWMEBDzbnTJALQ/YoylXlYD3GRS7ioWmObpDtvRGFYlYeu5q+I9GbFj5gaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698143634; 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=vdLve6rj4uGOZnkEaQu1A7oNU6ylf1tVvneEpsHLXa8=; b=TlhgXE1YTQjzNO0gkvEsgAkYbvOgFzKim41C9NLL+K7pCJzzfpJ1AltiFowGCnFHIpThyQ 3x0ih4xFNLEHvQQf1OvQsCec9PpI+7Xms4P7G48YZMyGOG9iTvV9+kUqBMDqmnKS9tDqUk Scq/2CGzVvmD+PKjOfnsc6oCK05hJah5tq5l4HdKCaAJQQdtEeVy9kvi/9fqeFNiIGEBEw U6J4G5CuhQg07qOcoH26pywvJiWcVjF9GlIF1nkZG28/3i+KFi0kB1meiUxct0UrFSADB7 TFL84uJCqdFfHod7m70UeZtZNuwMQpaLaNCRC98Mqur2EhoRnAxl7y/zAW1JuQ== 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 4SF7hL3kGhz4Zj; Tue, 24 Oct 2023 10:33:54 +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 39OAXsGj087398; Tue, 24 Oct 2023 10:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OAXsN0087395; Tue, 24 Oct 2023 10:33:54 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:33:54 GMT Message-Id: <202310241033.39OAXsN0087395@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: 569926974bfd - 2023Q4 - www/tomcat{85,9,101}: adjust rc.d script to support Java versions 20+ 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 569926974bfd179c1806afbe7794aa6d3a73e255 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=569926974bfd179c1806afbe7794aa6d3a73e255 commit 569926974bfd179c1806afbe7794aa6d3a73e255 Author: Vladimir Druzenko AuthorDate: 2023-10-24 10:28:14 +0000 Commit: Vladimir Druzenko CommitDate: 2023-10-24 10:33:46 +0000 www/tomcat{85,9,101}: adjust rc.d script to support Java versions 20+ Approved by: arrowd (mentor, implicit) MFH: 2023Q4 (cherry picked from commit 2fdb6fb459089fdb15101c5974b3fa45baef1775) --- www/tomcat101/files/tomcat101.in | 2 +- www/tomcat85/files/tomcat85.in | 2 +- www/tomcat9/files/tomcat9.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in index f6d5e2a62086..e83791d09bcd 100644 --- a/www/tomcat101/files/tomcat101.in +++ b/www/tomcat101/files/tomcat101.in @@ -111,7 +111,7 @@ extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` case "${_tomcat_java_version}" in - 9* | 1[0-9]* ) + 9* | [1-2][0-9]* ) _tomcat_endorsed_dirs_option= ;; *) diff --git a/www/tomcat85/files/tomcat85.in b/www/tomcat85/files/tomcat85.in index 800b32067024..e627d7a05e23 100644 --- a/www/tomcat85/files/tomcat85.in +++ b/www/tomcat85/files/tomcat85.in @@ -111,7 +111,7 @@ extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` case "${_tomcat_java_version}" in - 9* | 1[0-9]* ) + 9* | [1-2][0-9]* ) _tomcat_endorsed_dirs_option= ;; *) diff --git a/www/tomcat9/files/tomcat9.in b/www/tomcat9/files/tomcat9.in index 2ba67023889f..36b33fa6a628 100644 --- a/www/tomcat9/files/tomcat9.in +++ b/www/tomcat9/files/tomcat9.in @@ -111,7 +111,7 @@ extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` case "${_tomcat_java_version}" in - 9* | 1[0-9]* ) + 9* | [1-2][0-9]* ) _tomcat_endorsed_dirs_option= ;; *)