From nobody Tue Oct 24 10:30:23 2023 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 4SF7cH4rHdz4xrVl; Tue, 24 Oct 2023 10:30:23 +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 4SF7cH4PXlz4GV3; Tue, 24 Oct 2023 10:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698143423; 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=PShAKfpu552RSzeXLM/lHXP4xjVynN/6iMO0FWjDgL4=; b=L7qjjxgUTLEv/WmbgIiX/0MqayZt8FrNqXuqW4o38RVAdgRaUTeVFfAJtr/60rW/nq6BQW lQIHKw9yAi6kTYM8pxMuC3sqqpiJNYmeY1/dvA1szz7d7iYEVX7NFAFwxN/jaNUN0jBJxl 3nkqhdDxaGcmDXa/zUkZYvKUJb2kHsh6Mnz/oDCUucmKykSpY9WmDYuDAtcnamUJTmm0L8 ghjUNAgwtaLSnDlFxXtk9TpseO79pt/ZYoBvlUj+IVHkiI0WdiWp6MrYlhHra0pZxMttGr hjBAlduq4iDBKaScWhA1Wm/i/bZ22mTdYfStap2FQLaohKKir4RpxbdPrPkEyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698143423; a=rsa-sha256; cv=none; b=MjKc/BQQMo6qyRJO5jwuJN7vVf906NmxV6mpv7AfNQVwKs3tpkU2R4m9t6vys5D9E81vJm 34gccAGxx57z3vmXRteZzNF5yW12w/ygB8MK+s4fToUjf5a813OiwAa3mwvb+MRZUCyZX7 fNFcGrsjcpJPqWtV/MEzJ+TzqvOJuoCIGoEMrPJ8DSuecJgH3j0CRzZj0MEbqTUuJQK+xh sgx0A43Uw9G9iFqWqjj8MweQhzH//vKbX7I8tlJEr/i7/4CbJCS2M/rE2MezraLyBo3ErJ CuJfQxL6NLqHX/DIMyI9kT4/CwbfMVaUDFwaqTKhZlpH3dHvCb6iMXYe52cg8w== 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=1698143423; 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=PShAKfpu552RSzeXLM/lHXP4xjVynN/6iMO0FWjDgL4=; b=VomkuyQheIZckCkAXq4n5yli9mDic3SFh0YeonK2eCkhjnCuiTA7N/qnR6RSGeXZ3LNCNx wf61jwotUnTqnU7jLECkUPt8YPsVCDp2SxKe5ft21+/9oSrz+lGSksUsxCXOyuYTPVf/e0 6oUITmtRRa0rT9N6EReWUn6M15iGSG9T33LMdQqBoo/L+j85ESSC74xp+/e6dYLyBeIRG0 y4pbl3ExSlUsK4ok01+VUjcGLUP5YskiP4xbVXaMC+UrHER0o9UimbodS8U4YiBn+3AAt2 nGFTaI3AWfGIdUdyDnOy/MarhXRvfV2iXvgUSOi1NyJ4FTi9rXdrtypg+smGjQ== 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 4SF7cH3Sbvz4NT; Tue, 24 Oct 2023 10:30:23 +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 39OAUNN6080401; Tue, 24 Oct 2023 10:30:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OAUNhL080398; Tue, 24 Oct 2023 10:30:23 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:30:23 GMT Message-Id: <202310241030.39OAUNhL080398@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: 2fdb6fb45908 - main - www/tomcat{85,9,101}: adjust rc.d script to support Java versions 20+ 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fdb6fb459089fdb15101c5974b3fa45baef1775 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2fdb6fb459089fdb15101c5974b3fa45baef1775 commit 2fdb6fb459089fdb15101c5974b3fa45baef1775 Author: Vladimir Druzenko AuthorDate: 2023-10-24 10:28:14 +0000 Commit: Vladimir Druzenko CommitDate: 2023-10-24 10:30:03 +0000 www/tomcat{85,9,101}: adjust rc.d script to support Java versions 20+ Approved by: arrowd (mentor, implicit) MFH: 2023Q4 --- 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= ;; *)