Date: Thu, 4 Jul 2024 13:39:50 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: 4b1c3d68d312 - main - www/jetty10: Update to 10.0.21 Message-ID: <202407041339.464DdohO093909@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=4b1c3d68d3125268e8dda44c9c46bc7a9eb08f91 commit 4b1c3d68d3125268e8dda44c9c46bc7a9eb08f91 Author: Ryan Steinmetz <zi@FreeBSD.org> AuthorDate: 2024-07-04 13:39:40 +0000 Commit: Ryan Steinmetz <zi@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407041339.464DdohO093909>