From nobody Thu Jul 4 13:39:50 2024 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 4WFHnf2h16z5Q8v8; Thu, 04 Jul 2024 13:39:50 +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 4WFHnf1rV8z4VLp; Thu, 4 Jul 2024 13:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720100390; 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=e58whQLXLgvE1YRssI3OCVjDbCl0V+r4+/eTlKv5GQQ=; b=rG/u0yv+hSHxDIa18sPLmvbmfYh4GXOzo7bwUc+dIvYOUdpPkvBq9eIDmtVHTOF4E4uHH3 rqlG9bWY4EcnrDlJyUzurP4kUdzsbxNqjlQARjS090C5JHB9Ix0OD3HgmGQc1Z0yJbx2lI pTlnEjUOusNKJG90ShZqOf2cYexJdhneDudJ6SjHJ6Hga4sjNt/Tj3ebPK6HVj05xiXZfe jm9kl5aUJulauGnUDNtUw11en26yPh2D0Pr+dpjsrTAK33W3AzTb24epdieTEFU0I4hDw5 LWWZ7QRYWw4Aq3lK7Hs9d9spwLVziSJT8KkXHTAV2IG0Lc5zUW3yivmTpw/d0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720100390; a=rsa-sha256; cv=none; b=emmh8v9qh9TM/3bmsX0nb9KIT1t0H8aFgX7Aus27KkVMZYOMQqCEeqm5bJd2XK21RDtWhr JkYc64BvTOnbvdW3bsV3llqbGgBaHKJp8K0Qk70+IOh/ef+g8xUimjdid3qLLrz+4FAdG3 IIi8tcrE020PCQSlGQKesEP8wu+d0O/Y2CIHwDQ1ks+xX2sNI9Jq3+IqGBXxiaGYNAsAni K2W2J1oeVeKAdQ9oqvNkLeI4Lp1YEqRWp0kedQxW8MzPuVKYi7n/DLztqFvh4CjTCR9Yr4 HGnZ2TEtRvVv5bdQ8cCqYlyW+aELOx7JUx/ZC79kIv4f4P71wqcTmLFL0uiygA== 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=1720100390; 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=e58whQLXLgvE1YRssI3OCVjDbCl0V+r4+/eTlKv5GQQ=; b=op/Kygu0QFBeL8PISX2vvPDEXyEj+yjd8MOvmFD9Eb+hcn6s5IE0m++KHDB7GYddqCgmkr qbVVM17WI0D3zmX3th5XR1YK84+i2DVgUht+/P8ipQOavWATjZvGhyFQmnLm4y5tuJnfwl tv9jwvKt/FgmuI+BSyyKA1BAuG2CwhBa1rEy80aAzDSc6raVRsqqPFqwsw+yvfPY6S7uob Qn1KViwmIqEBoaRwxdeB7wGgbwV+zTcaoM43Nm9wjNaTXTzexNiUVREuMhjNpUDPCilWC5 i2PK5X8SN7k0fheYajFtESqNzM8cZv/8plejZPNHztxSCHB4QCycbhwzKcRbsg== 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 4WFHnf1RXDzFr8; Thu, 4 Jul 2024 13:39:50 +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 464Ddokg093912; Thu, 4 Jul 2024 13:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464DdohO093909; Thu, 4 Jul 2024 13:39:50 GMT (envelope-from git) Date: Thu, 4 Jul 2024 13:39:50 GMT Message-Id: <202407041339.464DdohO093909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 4b1c3d68d312 - main - www/jetty10: Update to 10.0.21 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b1c3d68d3125268e8dda44c9c46bc7a9eb08f91 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b1c3d68d3125268e8dda44c9c46bc7a9eb08f91 commit 4b1c3d68d3125268e8dda44c9c46bc7a9eb08f91 Author: Ryan Steinmetz AuthorDate: 2024-07-04 13:39:40 +0000 Commit: Ryan Steinmetz CommitDate: 2024-07-04 13:39:40 +0000 www/jetty10: Update to 10.0.21 --- www/jetty10/Makefile | 2 +- www/jetty10/distinfo | 6 +++--- www/jetty10/files/patch-bin_jetty.sh | 13 ++----------- www/jetty10/pkg-plist | 10 +++++----- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/www/jetty10/Makefile b/www/jetty10/Makefile index 42a8fc264adb..15e3c66c93b7 100644 --- a/www/jetty10/Makefile +++ b/www/jetty10/Makefile @@ -1,5 +1,5 @@ PORTNAME= jetty -PORTVERSION= 10.0.19 +PORTVERSION= 10.0.21 CATEGORIES= www java MASTER_SITES= https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${PORTVERSION}/ PKGNAMESUFFIX= 10 diff --git a/www/jetty10/distinfo b/www/jetty10/distinfo index 0035069508ee..e4154695d26d 100644 --- a/www/jetty10/distinfo +++ b/www/jetty10/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705348498 -SHA256 (jetty-home-10.0.19.tar.gz) = cfabf78cc7ff7fcd36977ad40e8b9fef4810409fb45e9aea6a53ffd5a3734ce0 -SIZE (jetty-home-10.0.19.tar.gz) = 11075042 +TIMESTAMP = 1720099689 +SHA256 (jetty-home-10.0.21.tar.gz) = 841d3df9c28cc80e3b203a2d2aa75766eaeed4b776274180b6cf4b1e0d053960 +SIZE (jetty-home-10.0.21.tar.gz) = 11062835 diff --git a/www/jetty10/files/patch-bin_jetty.sh b/www/jetty10/files/patch-bin_jetty.sh index 18ddd6ed6b20..c1fd36ff2e07 100644 --- a/www/jetty10/files/patch-bin_jetty.sh +++ b/www/jetty10/files/patch-bin_jetty.sh @@ -1,20 +1,11 @@ ---- bin/jetty.sh.orig 2024-01-15 19:55:56 UTC +--- bin/jetty.sh.orig 2024-07-04 13:34:53 UTC +++ bin/jetty.sh @@ -313,7 +313,7 @@ then ETC=$HOME/etc fi -for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc; do -+for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc /usr/local/etc/${NAME}/${NAME}{,9}; do ++for CONFIG in {/etc,~/etc}/default/${NAME}{,9} /usr/local/etc/${NAME}/${NAME}{,9} $HOME/.${NAME}rc; do if [ -f "$CONFIG" ] ; then readConfig "$CONFIG" fi -@@ -459,7 +459,7 @@ then - (( DEBUG )) && echo "$JETTY_CONF: (begin read) JETTY_ARGS.length=${#JETTY_ARGS[@]}" - while read -r CONF - do -- if expr "$CONF" : '#' >/dev/null ; then -+ if expr -- "$CONF" : '#' >/dev/null ; then - continue - fi - diff --git a/www/jetty10/pkg-plist b/www/jetty10/pkg-plist index 4a8b04ed3118..51018dfa82a5 100644 --- a/www/jetty10/pkg-plist +++ b/www/jetty10/pkg-plist @@ -88,10 +88,10 @@ %%APP_NAME%%/etc/sessions/session-data-cache/xmemcached.xml %%APP_NAME%%/etc/webdefault.xml %%APP_NAME%%/etc/well-known.xml -%%APP_NAME%%/lib/annotations/asm-9.6.jar -%%APP_NAME%%/lib/annotations/asm-analysis-9.6.jar -%%APP_NAME%%/lib/annotations/asm-commons-9.6.jar -%%APP_NAME%%/lib/annotations/asm-tree-9.6.jar +%%APP_NAME%%/lib/annotations/asm-9.7.jar +%%APP_NAME%%/lib/annotations/asm-analysis-9.7.jar +%%APP_NAME%%/lib/annotations/asm-commons-9.7.jar +%%APP_NAME%%/lib/annotations/asm-tree-9.7.jar %%APP_NAME%%/lib/annotations/jakarta.annotation-api-1.3.5.jar %%APP_NAME%%/lib/apache-jsp/org.eclipse.jdt.ecj-3.33.0.jar %%APP_NAME%%/lib/apache-jsp/org.eclipse.%%APP_NAME%%.apache-jsp-%%PORTVERSION%%.jar @@ -153,7 +153,7 @@ %%APP_NAME%%/lib/%%APP_NAME%%-webapp-%%PORTVERSION%%.jar %%APP_NAME%%/lib/%%APP_NAME%%-xml-%%PORTVERSION%%.jar %%APP_NAME%%/lib/logging/%%APP_NAME%%-slf4j-impl-%%PORTVERSION%%.jar -%%APP_NAME%%/lib/logging/slf4j-api-2.0.5.jar +%%APP_NAME%%/lib/logging/slf4j-api-2.0.9.jar %%APP_NAME%%/lib/setuid/%%APP_NAME%%-setuid-java-1.0.4.jar %%APP_NAME%%/lib/websocket/%%APP_NAME%%-javax-websocket-api-1.1.2.jar %%APP_NAME%%/lib/websocket/websocket-core-client-%%PORTVERSION%%.jar