Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Jan 2024 14:02:40 GMT
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 88104db310cc - main - www/jetty10: Update to 10.0.19
Message-ID:  <202401171402.40HE2exA024188@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=88104db310cc5b54fb87a1e33546131189e603a3

commit 88104db310cc5b54fb87a1e33546131189e603a3
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2024-01-17 14:00:45 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401171402.40HE2exA024188>