git: 833cabce4976 - main - security/zaproxy: Update to 2.16.0

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Mon, 20 Jan 2025 06:21:06 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=833cabce4976a22a0367d2246c417f7499e1ecc1

commit 833cabce4976a22a0367d2246c417f7499e1ecc1
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-01-20 06:14:10 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-01-20 06:14:10 +0000

    security/zaproxy: Update to 2.16.0
    
    - Update java dependecy to 17
    - Add pkg-message with some entries about selenium, web browsers and
      py-zaproxy
    
    ChangeLog at:   https://www.zaproxy.org/docs/desktop/releases/2.16.0/
---
 security/zaproxy/Makefile             |   8 +-
 security/zaproxy/distinfo             |  14 ++--
 security/zaproxy/files/pkg-message.in |  37 +++++++++
 security/zaproxy/pkg-plist            | 144 +++++++++++++++-------------------
 4 files changed, 113 insertions(+), 90 deletions(-)

diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index d978e1f1919b..eeb7640a5f82 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	zaproxy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.14.0
-PORTREVISION=	1
+DISTVERSION=	2.16.0
 CATEGORIES=	security java
 
 MAINTAINER=	acm@FreeBSD.org
@@ -14,7 +13,7 @@ BUILD_DEPENDS=	gradle:devel/gradle
 
 USES=		gettext-runtime java
 USE_GITHUB=	yes
-JAVA_VERSION=	11
+JAVA_VERSION=	17
 
 NO_ARCH=	yes
 
@@ -37,6 +36,7 @@ EXCLUDE_TASK=	--exclude-task :zap:downloadMainAddOns
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+SUB_FILES=	pkg-message
 
 .if (${DEV_UPDATE_MODE} == "yes")
 EXCLUDE_TASK=	#
@@ -67,7 +67,7 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/zap/build/distFiles/zap.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	cd ${WRKSRC}/zap/build/distFiles/ && ${COPYTREE_SHARE} "db lang lib license plugin README scripts xml zap-${DISTVERSION}.jar" ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
+	cd ${WRKSRC}/zap/build/distFiles/ && ${COPYTREE_SHARE} "db lang lib license plugin README xml zap-${DISTVERSION}.jar" ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 	cd ${WRKDIR}/mainAddOns && ${COPYTREE_SHARE} ./ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugin
 	${INSTALL_DATA} ${WRKSRC}/zap/src/main/resources/resource/zap64x64.png ${STAGEDIR}${PREFIX}/share/pixmaps/zaproxy.png
 
diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo
index 1205a06c49d7..c359e09feab6 100644
--- a/security/zaproxy/distinfo
+++ b/security/zaproxy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1711238273
-SHA256 (zaproxy-2.14.0-deps.tar.gz) = 961ed29f92d165bd06ed8b54821760fbf339069f80a6e26d3c9d77ea3fa0f2d2
-SIZE (zaproxy-2.14.0-deps.tar.gz) = 369588532
-SHA256 (zaproxy-2.14.0-plugins.tar.gz) = 93d2f25beecd882ea8af173665372faab82c0b8c1e0389e3dbededc2909e3517
-SIZE (zaproxy-2.14.0-plugins.tar.gz) = 232482946
-SHA256 (zaproxy-zaproxy-v2.14.0_GH0.tar.gz) = e775b827f2c1aa8ed93dae5c2677399fedbe8c64cbdd21e0122c3799706ca0ea
-SIZE (zaproxy-zaproxy-v2.14.0_GH0.tar.gz) = 5541732
+TIMESTAMP = 1737348690
+SHA256 (zaproxy-2.16.0-deps.tar.gz) = 6e8fdcfda3dbd6519da2289d94627b9c23424f9e785a0daa63370f60733567bf
+SIZE (zaproxy-2.16.0-deps.tar.gz) = 372707670
+SHA256 (zaproxy-2.16.0-plugins.tar.gz) = 3cc459c3dd8cd8607c9daad382a7d927aa738317a2e101bf1e010d5a479636c2
+SIZE (zaproxy-2.16.0-plugins.tar.gz) = 256047886
+SHA256 (zaproxy-zaproxy-v2.16.0_GH0.tar.gz) = 1266d3fb657743293cca7b353d6acbae313d07d03e2d22daedc48849baa9a5b5
+SIZE (zaproxy-zaproxy-v2.16.0_GH0.tar.gz) = 5581869
diff --git a/security/zaproxy/files/pkg-message.in b/security/zaproxy/files/pkg-message.in
new file mode 100644
index 000000000000..aadef5a8cbff
--- /dev/null
+++ b/security/zaproxy/files/pkg-message.in
@@ -0,0 +1,37 @@
+[
+{ type: install
+  message: <<EOM
+ZAP port was installed
+
+1) You must install Chrome based browser or Firefox based browser for be used
+  in some tasks.
+
+  # pkg install chromium firefox geckodriver
+
+2) ZAP includes linux webdrivers for Chrome and Firefox but these don't work
+   on FreeBSD.
+
+   You must change some paths from Tools/Options/Selenium/Webdrivers:
+
+   Chromedriver to /usr/local/bin/chromedriver
+   Geckodriver to /usr/local/bin/geckodriver
+
+   Also, you must change Chrome and Firefox based web browser binary path files:
+
+   Chrome binary to /usr/local/bin/chrome
+   Firefox binary to /usr/local/bin/firefox
+
+3) If you want to use some python scripts to use ZAP from command line or from
+   another applications, look at the following urls:
+
+   https://github.com/zaproxy/zaproxy/blob/main/docker/zap-baseline.py
+   https://github.com/zaproxy/community-scripts/tree/main/other/api/mass-baseline
+   https://github.com/zaproxy/zap-api-python/tree/main/src/examples
+
+   These scripts use ZAP Python API. Install it from security/py-zaproxy
+
+4) Enjoy it
+EOM
+}
+]
+
diff --git a/security/zaproxy/pkg-plist b/security/zaproxy/pkg-plist
index dc5724808df8..cf0bd81ae3c8 100644
--- a/security/zaproxy/pkg-plist
+++ b/security/zaproxy/pkg-plist
@@ -52,32 +52,32 @@ bin/zaproxy
 %%JAVAJARDIR%%/zaproxy/lang/Messages_zh_CN.properties
 %%JAVAJARDIR%%/zaproxy/lang/Messages_zh_TW.properties
 %%JAVAJARDIR%%/zaproxy/lib/commons-beanutils-1.9.4.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-codec-1.16.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-codec-1.17.1.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-collections-3.2.2.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-configuration-1.10.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-csv-1.10.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-csv-1.12.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-httpclient-3.1.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-io-2.13.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-io-2.18.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-lang-2.6.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-lang3-3.13.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-logging-1.2.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-text-1.10.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-lang3-3.17.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-logging-1.3.4.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-text-1.12.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/ezmorph-1.0.6.jar
-%%JAVAJARDIR%%/zaproxy/lib/flatlaf-3.2.1.jar
+%%JAVAJARDIR%%/zaproxy/lib/flatlaf-3.5.4.jar
 %%JAVAJARDIR%%/zaproxy/lib/harlib-1.1.3.jar
-%%JAVAJARDIR%%/zaproxy/lib/hsqldb-2.7.2.jar
+%%JAVAJARDIR%%/zaproxy/lib/hsqldb-2.7.4.jar
 %%JAVAJARDIR%%/zaproxy/lib/jackson-core-asl-1.9.13.jar
-%%JAVAJARDIR%%/zaproxy/lib/java-semver-0.9.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/java-semver-0.10.2.jar
 %%JAVAJARDIR%%/zaproxy/lib/javahelp-2.0.05.jar
 %%JAVAJARDIR%%/zaproxy/lib/jericho-html-3.4.jar
-%%JAVAJARDIR%%/zaproxy/lib/jfreechart-1.5.4.jar
+%%JAVAJARDIR%%/zaproxy/lib/jfreechart-1.5.5.jar
 %%JAVAJARDIR%%/zaproxy/lib/jgrapht-core-0.9.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/json-lib-2.4-jdk15.jar
-%%JAVAJARDIR%%/zaproxy/lib/log4j-1.2-api-2.20.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/log4j-api-2.20.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/log4j-core-2.20.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/log4j-jul-2.20.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/rsyntaxtextarea-3.3.4.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-1.2-api-2.24.2.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-api-2.24.2.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-core-2.24.2.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-jul-2.24.2.jar
+%%JAVAJARDIR%%/zaproxy/lib/rsyntaxtextarea-3.5.3.jar
 %%JAVAJARDIR%%/zaproxy/lib/swingx-all-1.6.5-1.jar
 %%JAVAJARDIR%%/zaproxy/lib/xom-1.3.9.jar
 %%JAVAJARDIR%%/zaproxy/license/ApacheLicense-2.0.txt
@@ -91,71 +91,57 @@ bin/zaproxy
 %%JAVAJARDIR%%/zaproxy/license/hypersonic_lic.txt
 %%JAVAJARDIR%%/zaproxy/license/lgpl-3.0.txt
 %%JAVAJARDIR%%/zaproxy/plugin/Readme.txt
-%%JAVAJARDIR%%/zaproxy/plugin/alertFilters-release-18.zap
-%%JAVAJARDIR%%/zaproxy/plugin/ascanrules-release-58.zap
-%%JAVAJARDIR%%/zaproxy/plugin/authhelper-beta-0.10.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/automation-beta-0.33.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/bruteforce-beta-15.zap
-%%JAVAJARDIR%%/zaproxy/plugin/callhome-release-0.8.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/commonlib-release-1.18.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/database-alpha-0.3.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/diff-beta-14.zap
-%%JAVAJARDIR%%/zaproxy/plugin/directorylistv1-release-7.zap
-%%JAVAJARDIR%%/zaproxy/plugin/domxss-release-18.zap
-%%JAVAJARDIR%%/zaproxy/plugin/encoder-release-1.4.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/exim-beta-0.7.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/formhandler-beta-6.5.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/fuzz-beta-13.12.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/gettingStarted-release-16.zap
-%%JAVAJARDIR%%/zaproxy/plugin/graaljs-alpha-0.5.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/graphql-alpha-0.20.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/help-release-17.zap
-%%JAVAJARDIR%%/zaproxy/plugin/hud-beta-0.18.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/invoke-beta-14.zap
-%%JAVAJARDIR%%/zaproxy/plugin/network-beta-0.12.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/oast-beta-0.17.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/onlineMenu-release-12.zap
-%%JAVAJARDIR%%/zaproxy/plugin/openapi-beta-37.zap
-%%JAVAJARDIR%%/zaproxy/plugin/postman-alpha-0.2.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/pscanrules-release-52.zap
-%%JAVAJARDIR%%/zaproxy/plugin/quickstart-release-43.zap
-%%JAVAJARDIR%%/zaproxy/plugin/replacer-release-15.zap
-%%JAVAJARDIR%%/zaproxy/plugin/reports-release-0.26.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/requester-beta-7.4.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/retest-alpha-0.8.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/retire-release-0.26.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/reveal-release-7.zap
-%%JAVAJARDIR%%/zaproxy/plugin/scripts-release-42.zap
-%%JAVAJARDIR%%/zaproxy/plugin/selenium-release-15.15.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/soap-beta-20.zap
-%%JAVAJARDIR%%/zaproxy/plugin/spider-release-0.7.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/spiderAjax-release-23.17.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/tips-beta-12.zap
-%%JAVAJARDIR%%/zaproxy/plugin/webdriverlinux-release-64.zap
-%%JAVAJARDIR%%/zaproxy/plugin/webdrivermacos-release-64.zap
-%%JAVAJARDIR%%/zaproxy/plugin/webdriverwindows-release-64.zap
-%%JAVAJARDIR%%/zaproxy/plugin/websocket-release-30.zap
-%%JAVAJARDIR%%/zaproxy/plugin/zest-beta-42.zap
-%%JAVAJARDIR%%/zaproxy/scripts/templates/active/Active default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/authentication/Authentication default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/authentication/BodgeIt Store Authentication.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/authentication/Simple Form-Based Authentication.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/authentication/Wordpress Authentication.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/httpsender/AddZapHeader.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/httpsender/HttpSender default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/passive/Passive default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/proxy/Proxy default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/session/Juice Shop Session Management.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/session/Session Management default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/standalone/Loop through history table.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/standalone/Standalone default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/standalone/Traverse sites tree.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/targeted/Find HTML comments.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/targeted/Targeted default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/variant/Input Vector default template.js
-%%JAVAJARDIR%%/zaproxy/scripts/templates/variant/Site modifying JSON example.js
+%%JAVAJARDIR%%/zaproxy/plugin/alertFilters-release-23.zap
+%%JAVAJARDIR%%/zaproxy/plugin/ascanrules-release-70.zap
+%%JAVAJARDIR%%/zaproxy/plugin/authhelper-beta-0.17.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/automation-beta-0.44.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/bruteforce-beta-17.zap
+%%JAVAJARDIR%%/zaproxy/plugin/callhome-release-0.14.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/client-alpha-0.10.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/commonlib-release-1.30.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/database-alpha-0.7.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/diff-beta-17.zap
+%%JAVAJARDIR%%/zaproxy/plugin/directorylistv1-release-9.zap
+%%JAVAJARDIR%%/zaproxy/plugin/domxss-release-21.zap
+%%JAVAJARDIR%%/zaproxy/plugin/encoder-release-1.6.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/exim-beta-0.13.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/formhandler-beta-6.7.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/fuzz-beta-13.15.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/gettingStarted-release-19.zap
+%%JAVAJARDIR%%/zaproxy/plugin/graaljs-alpha-0.9.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/graphql-alpha-0.26.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/help-release-19.zap
+%%JAVAJARDIR%%/zaproxy/plugin/hud-beta-0.19.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/invoke-beta-16.zap
+%%JAVAJARDIR%%/zaproxy/plugin/network-beta-0.20.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/oast-beta-0.21.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/onlineMenu-release-14.zap
+%%JAVAJARDIR%%/zaproxy/plugin/openapi-beta-44.zap
+%%JAVAJARDIR%%/zaproxy/plugin/postman-alpha-0.5.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/pscan-alpha-0.1.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/pscanrules-release-62.zap
+%%JAVAJARDIR%%/zaproxy/plugin/quickstart-release-51.zap
+%%JAVAJARDIR%%/zaproxy/plugin/replacer-release-20.zap
+%%JAVAJARDIR%%/zaproxy/plugin/reports-release-0.35.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/requester-beta-7.8.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/retest-alpha-0.11.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/retire-release-0.44.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/reveal-release-9.zap
+%%JAVAJARDIR%%/zaproxy/plugin/scanpolicies-alpha-0.2.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/scripts-release-45.8.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/selenium-release-15.32.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/sequence-beta-8.zap
+%%JAVAJARDIR%%/zaproxy/plugin/soap-beta-24.zap
+%%JAVAJARDIR%%/zaproxy/plugin/spider-release-0.13.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/spiderAjax-release-23.22.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/tips-beta-14.zap
+%%JAVAJARDIR%%/zaproxy/plugin/webdriverlinux-release-119.zap
+%%JAVAJARDIR%%/zaproxy/plugin/webdrivermacos-release-119.zap
+%%JAVAJARDIR%%/zaproxy/plugin/webdriverwindows-release-119.zap
+%%JAVAJARDIR%%/zaproxy/plugin/websocket-release-32.zap
+%%JAVAJARDIR%%/zaproxy/plugin/zest-beta-48.0.0.zap
 %%JAVAJARDIR%%/zaproxy/xml/config.xml
 %%JAVAJARDIR%%/zaproxy/xml/drivers.dtd
 %%JAVAJARDIR%%/zaproxy/xml/reportCompare.xsl
-%%JAVAJARDIR%%/zaproxy/zap-2.14.0.jar
+%%JAVAJARDIR%%/zaproxy/zap-2.16.0.jar
 share/pixmaps/zaproxy.png