From nobody Wed Jan 17 14:02:40 2024 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 4TFSJ13KGdz57tBK; Wed, 17 Jan 2024 14:02:41 +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 4TFSJ12KDPz3wsL; Wed, 17 Jan 2024 14:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705500161; 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=90ok4djB5T4GsGeU1HRcsnxOWNGxNJMHh9RGnHccYdc=; b=qVimFRw9JhOeSm2tNRW+phlKg0KiUwk9p58yJPCM4KlX2CHlCtZRxZDZ64vgTWbGZNQrM/ 86/Wt7FGywK/PuWQWoQIaPOI+sZHDRB10kbN/vtAptigRFFoocEv6m7ckbD1Ev4QRoV2y5 RIYPVnigaM/8TjNVhhsKkXvqih8mPoYzpMoqhVtfvkN4jGzG9a5FfXV4XIKDJkWsm6EeoT a/1q3qKt03r+xvBWyNnZO3blq60r8NxIH55lQ2DLxrKI7D0Wb3mCjbexnmoe28QVdAUAZR X7d2oTT67mSqoCN4E+bj1vpVQ59kZE5zXa37LzH9g8UJkeLvhXOd/dd/3o6CEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705500161; 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=90ok4djB5T4GsGeU1HRcsnxOWNGxNJMHh9RGnHccYdc=; b=QAbvRT/de6u4sZFpoAbNav7ld4r+kO+rkT1j/s+bZVz1HOKFuItaEBoJvLgUvrOVWBWW4i eDL9DlSHweaSVNpClP+xLH2Vbjj50R99Wa6/0cj+e4Ij9dqfp5lPNp3TZ5jxp3bmT8xcsG 2WJv2ZOIn0CXwdbPlCNtUePhZF/byKIQSaqVc3ClzQI79tQp1oy+vI/2zJyyHNd0IPtq9Z HInKU55fJj2414nRkmIwgC0ULei+p5SzGoFUge/ZqWoKE5y5GPrDyxH2LQoA3y2GjXGBh+ zgorqR79dMmVERxK/ZTWblAlvWCludRBWrrHS1OFLpn7x6Gf0gcx0fwAz+XT4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705500161; a=rsa-sha256; cv=none; b=UExuY/wYrG9aEgipr0dgStuhw0f4xjc1to1qI292T1UVJ4/+ogyHU8OUg98oIr/+JJWtfj PMFp2P38Pu2kpscwyCZgPwc9QAutUF1+jSPHqhZnrAZmm5KITJ7LLoGPoWf242Uhh1rCF9 f/16F1ce7eKamLx4aZ/Bj8FUAL8lPR2fx38ZT975PbLMrIhVFPKgd5ng5V0+3pqpIMZxmK 4+96ZClu9EN2pldaHJcyAFCFBgsZtAhl1XxYZ3F4LuSJtFTziP8ueRkWj+NGuovhFyGutr lRkFGXFDGyzL7BlIC1Q0RS/Poch8HBYD7y+DsZZYl/B7SxOhU+cORLgasqQlQw== 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 4TFSJ10tY1zQWP; Wed, 17 Jan 2024 14:02:41 +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 40HE2e5J024191; Wed, 17 Jan 2024 14:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40HE2exA024188; Wed, 17 Jan 2024 14:02:40 GMT (envelope-from git) Date: Wed, 17 Jan 2024 14:02:40 GMT Message-Id: <202401171402.40HE2exA024188@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: 88104db310cc - main - www/jetty10: Update to 10.0.19 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88104db310cc5b54fb87a1e33546131189e603a3 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=88104db310cc5b54fb87a1e33546131189e603a3 commit 88104db310cc5b54fb87a1e33546131189e603a3 Author: Ryan Steinmetz AuthorDate: 2024-01-17 14:00:45 +0000 Commit: Ryan Steinmetz CommitDate: 2024-01-17 14:00:45 +0000 www/jetty10: Update to 10.0.19 --- www/jetty10/Makefile | 2 +- www/jetty10/distinfo | 6 +++--- www/jetty10/files/patch-bin_jetty.sh | 13 +++++++++++-- www/jetty10/pkg-plist | 14 +++++++------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/www/jetty10/Makefile b/www/jetty10/Makefile index de1d81eec33b..42a8fc264adb 100644 --- a/www/jetty10/Makefile +++ b/www/jetty10/Makefile @@ -1,5 +1,5 @@ PORTNAME= jetty -PORTVERSION= 10.0.16 +PORTVERSION= 10.0.19 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 5f97ed1b5716..0035069508ee 100644 --- a/www/jetty10/distinfo +++ b/www/jetty10/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695045957 -SHA256 (jetty-home-10.0.16.tar.gz) = dd56e9329437e6d195113ac08c98e5f53828d7f5025a751a2a7e9baa9b86add7 -SIZE (jetty-home-10.0.16.tar.gz) = 11006912 +TIMESTAMP = 1705348498 +SHA256 (jetty-home-10.0.19.tar.gz) = cfabf78cc7ff7fcd36977ad40e8b9fef4810409fb45e9aea6a53ffd5a3734ce0 +SIZE (jetty-home-10.0.19.tar.gz) = 11075042 diff --git a/www/jetty10/files/patch-bin_jetty.sh b/www/jetty10/files/patch-bin_jetty.sh index 897d33be6586..18ddd6ed6b20 100644 --- a/www/jetty10/files/patch-bin_jetty.sh +++ b/www/jetty10/files/patch-bin_jetty.sh @@ -1,6 +1,6 @@ ---- bin/jetty.sh.orig 2016-03-19 21:43:53 UTC +--- bin/jetty.sh.orig 2024-01-15 19:55:56 UTC +++ bin/jetty.sh -@@ -166,7 +166,7 @@ then +@@ -313,7 +313,7 @@ then ETC=$HOME/etc fi @@ -9,3 +9,12 @@ 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 e853899f3b26..4a8b04ed3118 100644 --- a/www/jetty10/pkg-plist +++ b/www/jetty10/pkg-plist @@ -88,15 +88,15 @@ %%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.5.jar -%%APP_NAME%%/lib/annotations/asm-analysis-9.5.jar -%%APP_NAME%%/lib/annotations/asm-commons-9.5.jar -%%APP_NAME%%/lib/annotations/asm-tree-9.5.jar +%%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/jakarta.annotation-api-1.3.5.jar -%%APP_NAME%%/lib/apache-jsp/org.eclipse.jdt.ecj-3.26.0.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 -%%APP_NAME%%/lib/apache-jsp/org.mortbay.jasper.apache-el-9.0.52.jar -%%APP_NAME%%/lib/apache-jsp/org.mortbay.jasper.apache-jsp-9.0.52.jar +%%APP_NAME%%/lib/apache-jsp/org.mortbay.jasper.apache-el-9.0.83.1.jar +%%APP_NAME%%/lib/apache-jsp/org.mortbay.jasper.apache-jsp-9.0.83.1.jar %%APP_NAME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar %%APP_NAME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar %%APP_NAME%%/lib/fcgi/fcgi-client-%%PORTVERSION%%.jar