security/zaproxy: update to 2.12.0

ChangeLog at:	https://www.zaproxy.org/docs/desktop/releases/2.12.0/

4 files changed, 71 insertions, 83 deletions

diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index aa654e22c42e..a972cbe90029 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zaproxy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.11.1
+DISTVERSION=	2.12.0
 CATEGORIES=	security java
 
 MAINTAINER=	acm@FreeBSD.org
@@ -9,8 +9,6 @@ WWW=		https://www.zaproxy.org/
 
 LICENSE=	APACHE20
 
-BROKEN=		does not build: could not resolve plugin artifact 'org.gradle.kotlin.kotlin-dsl:...'
-
 BUILD_DEPENDS=	gradle:devel/gradle
 
 USES=		gettext-runtime
@@ -57,7 +55,6 @@ post-extract: # need a separate extract step because the cache is in /tmp, and n
 	@cd ${DEPS_CACHE_DIR} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}
 
 post-patch:
-	@${ECHO} "" > ${WRKSRC}/zap/src/main/add-ons.txt
 	@${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \
 		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|g' \
 		-e 's|%%VERSION%%|${DISTVERSION}|g' ${WRKSRC}/zap/src/main/dist/zap.sh
@@ -66,7 +63,7 @@ post-patch:
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
 		--gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \
-		${GRADLE_ARGS} --build-cache :zap:distCore
+		${GRADLE_ARGS} --build-cache :zap:distCore --exclude-task :zap:downloadMainAddOns
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/zap/build/distFiles/zap.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo
index bbbd6073b8e8..eb03a80126a5 100644
--- a/security/zaproxy/distinfo
+++ b/security/zaproxy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1639240210
-SHA256 (zaproxy-2.11.1-deps.tar.gz) = 8117e54403dca3f1729ec8eaa73a8bbb314480da41da5ceaa10ec747778a1422
-SIZE (zaproxy-2.11.1-deps.tar.gz) = 366396319
-SHA256 (zaproxy-2.11.1-plugins.tar.gz) = 65d3a98e6dc422fce23940c6dc832485410e5c464681ae2d9ed69dcbb09b1b55
-SIZE (zaproxy-2.11.1-plugins.tar.gz) = 176924188
-SHA256 (zaproxy-zaproxy-v2.11.1_GH0.tar.gz) = e7a4d253921dc309ca2f88a0ad8a5274550a7181321cdb3033c553ae01a53ca5
-SIZE (zaproxy-zaproxy-v2.11.1_GH0.tar.gz) = 7310553
+TIMESTAMP = 1667261004
+SHA256 (zaproxy-2.12.0-deps.tar.gz) = 7a7e4839a25f883f91bcabfe836b022819947af6f39be6c6dd9bd4e27fd17704
+SIZE (zaproxy-2.12.0-deps.tar.gz) = 374388136
+SHA256 (zaproxy-2.12.0-plugins.tar.gz) = 2d6dc11846aa82df4f2452da91280b45a1266ea2149a58442c4005a346c1d1e2
+SIZE (zaproxy-2.12.0-plugins.tar.gz) = 256334454
+SHA256 (zaproxy-zaproxy-v2.12.0_GH0.tar.gz) = caae3ad419d9ea6f327cc4d3a4450748aba9dedc0377d052381c352ec7976fac
+SIZE (zaproxy-zaproxy-v2.12.0_GH0.tar.gz) = 7442143
diff --git a/security/zaproxy/files/patch-zap-src-main-dist_zap.sh b/security/zaproxy/files/patch-zap-src-main-dist_zap.sh
index 904a7265be0c..e42610bc36aa 100644
--- a/security/zaproxy/files/patch-zap-src-main-dist_zap.sh
+++ b/security/zaproxy/files/patch-zap-src-main-dist_zap.sh
@@ -1,5 +1,5 @@
---- zap/src/main/dist/zap.sh	2021-11-30 18:35:48.784116000 -0500
-+++ zap/src/main/dist/zap.sh	2021-11-30 21:18:02.116764000 -0500
+--- zap/src/main/dist/zap.sh	2022-10-27 07:53:05.000000000 -0500
++++ zap/src/main/dist/zap.sh	2022-10-31 18:52:02.376240000 -0500
 @@ -1,18 +1,7 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -32,14 +32,14 @@
  if [ "`echo ${JAVA_OUTPUT} | grep "continuing with system-provided Java"`" ] ; then
 @@ -43,7 +32,7 @@
  
- DEFAULTJAVAGC="-XX:+UseG1GC"
+ DEFAULTJAVAGC=""
  
 -JAVA_VERSION=$(java -version 2>&1 | awk -F\" '/version/ { print $2 }')
 +JAVA_VERSION=$(%%JAVA_HOME%%/bin/java -version 2>&1 | awk -F\" '/version/ { print $2 }')
  JAVA_MAJOR_VERSION=${JAVA_VERSION%%[.|-]*}
  JAVA_MINOR_VERSION=$(echo $JAVA_VERSION | awk -F\. '{ print $2 }')
  
-@@ -94,7 +83,7 @@
+@@ -90,7 +79,7 @@
    fi
  fi
  
@@ -48,7 +48,7 @@
  for var in "$@"; do
    if [[ "$var" == -Xmx* ]]; then
      # Overridden by the user
-@@ -108,7 +97,7 @@
+@@ -104,7 +93,7 @@
    elif [[ $var != -psn_* ]]; then
      # Strip the automatic -psn_x_xxxxxxx argument that OS X automatically passes into apps, since
      # it freaks out ZAP
@@ -57,15 +57,13 @@
    fi
  done
  
-@@ -125,7 +114,7 @@
+@@ -121,7 +110,7 @@
  # Start ZAP; it's likely that -Xdock:icon would be ignored on other platforms, but this is known to work
  if [ "$OS" = "Darwin" ]; then
    # It's likely that -Xdock:icon would be ignored on other platforms, but this is known to work
--  exec java ${JMEM} ${JAVAGC} -Xdock:icon="../Resources/ZAP.icns" -jar "${BASEDIR}/@zapJar@" "${ARGS[@]}"
+-  exec java ${JMEM} ${JAVAGC} ${JAVADEBUG} -Xdock:icon="../Resources/ZAP.icns" -jar "${BASEDIR}/@zapJar@" "${ARGS[@]}"
 +  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} -Xdock:icon="../Resources/ZAP.icns" -jar "${BASEDIR}/zap-2.11.0.jar" "${ARGS[@]}"
  else
 -  exec java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "${BASEDIR}/@zapJar@" "${ARGS[@]}"
--fi
-\ No newline at end of file
 +  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "zap-%%VERSION%%.jar" "${ARGS}"
-+fi
+ fi
diff --git a/security/zaproxy/pkg-plist b/security/zaproxy/pkg-plist
index 3e7d3064b896..9873e596079b 100644
--- a/security/zaproxy/pkg-plist
+++ b/security/zaproxy/pkg-plist
@@ -50,6 +50,7 @@ bin/zaproxy
 %%JAVAJARDIR%%/zaproxy/lang/Messages_vi_VN.properties
 %%JAVAJARDIR%%/zaproxy/lang/Messages_yo_NG.properties
 %%JAVAJARDIR%%/zaproxy/lang/Messages_zh_CN.properties
+%%JAVAJARDIR%%/zaproxy/lang/Messages_zh_TW.properties
 %%JAVAJARDIR%%/zaproxy/lang/vulnerabilities.xml
 %%JAVAJARDIR%%/zaproxy/lang/vulnerabilities_ar_SA.xml
 %%JAVAJARDIR%%/zaproxy/lang/vulnerabilities_az_AZ.xml
@@ -94,28 +95,22 @@ bin/zaproxy
 %%JAVAJARDIR%%/zaproxy/lang/vulnerabilities_vi_VN.xml
 %%JAVAJARDIR%%/zaproxy/lang/vulnerabilities_yo_NG.xml
 %%JAVAJARDIR%%/zaproxy/lang/vulnerabilities_zh_CN.xml
-%%JAVAJARDIR%%/zaproxy/lib/bcmail-jdk15on-1.68.jar
-%%JAVAJARDIR%%/zaproxy/lib/bcpkix-jdk15on-1.68.jar
-%%JAVAJARDIR%%/zaproxy/lib/bcprov-jdk15on-1.68.jar
+%%JAVAJARDIR%%/zaproxy/lang/vulnerabilities_zh_TW.xml
 %%JAVAJARDIR%%/zaproxy/lib/commons-beanutils-1.9.4.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-codec-1.15.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-collections-3.2.2.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-configuration-1.10.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-csv-1.8.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-digester-2.1.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-csv-1.9.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-httpclient-3.1.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-io-2.11.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-jxpath-1.3.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-lang-2.6.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-lang3-3.12.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/commons-logging-1.2.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-text-1.9.jar
-%%JAVAJARDIR%%/zaproxy/lib/commons-validator-1.7.jar
+%%JAVAJARDIR%%/zaproxy/lib/commons-text-1.10.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/ezmorph-1.0.6.jar
-%%JAVAJARDIR%%/zaproxy/lib/flatlaf-1.6.jar
+%%JAVAJARDIR%%/zaproxy/lib/flatlaf-2.6.jar
 %%JAVAJARDIR%%/zaproxy/lib/harlib-1.1.3.jar
-%%JAVAJARDIR%%/zaproxy/lib/hsqldb-2.5.2.jar
-%%JAVAJARDIR%%/zaproxy/lib/ice4j-3.0-24-g34c2ce5.jar
+%%JAVAJARDIR%%/zaproxy/lib/hsqldb-2.7.1.jar
 %%JAVAJARDIR%%/zaproxy/lib/jackson-core-asl-1.9.13.jar
 %%JAVAJARDIR%%/zaproxy/lib/java-semver-0.9.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/javahelp-2.0.05.jar
@@ -123,13 +118,12 @@ bin/zaproxy
 %%JAVAJARDIR%%/zaproxy/lib/jfreechart-1.5.3.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.15.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/log4j-api-2.15.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/log4j-core-2.15.0.jar
-%%JAVAJARDIR%%/zaproxy/lib/rsyntaxtextarea-3.1.3.jar
-%%JAVAJARDIR%%/zaproxy/lib/sqlite-jdbc-3.36.0.1.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-1.2-api-2.19.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-api-2.19.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/log4j-core-2.19.0.jar
+%%JAVAJARDIR%%/zaproxy/lib/rsyntaxtextarea-3.3.0.jar
 %%JAVAJARDIR%%/zaproxy/lib/swingx-all-1.6.5-1.jar
-%%JAVAJARDIR%%/zaproxy/lib/xom-1.3.7.jar
+%%JAVAJARDIR%%/zaproxy/lib/xom-1.3.8.jar
 %%JAVAJARDIR%%/zaproxy/license/ApacheLicense-2.0.txt
 %%JAVAJARDIR%%/zaproxy/license/COPYING
 %%JAVAJARDIR%%/zaproxy/license/OFL.txt
@@ -141,48 +135,49 @@ 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-13.zap
-%%JAVAJARDIR%%/zaproxy/plugin/ascanrules-release-43.zap
-%%JAVAJARDIR%%/zaproxy/plugin/automation-alpha-0.9.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/bruteforce-beta-11.zap
-%%JAVAJARDIR%%/zaproxy/plugin/callhome-alpha-0.0.3.zap
-%%JAVAJARDIR%%/zaproxy/plugin/commonlib-release-1.6.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/diff-beta-11.zap
+%%JAVAJARDIR%%/zaproxy/plugin/alertFilters-release-14.zap
+%%JAVAJARDIR%%/zaproxy/plugin/ascanrules-release-49.zap
+%%JAVAJARDIR%%/zaproxy/plugin/automation-beta-0.19.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/bruteforce-beta-12.zap
+%%JAVAJARDIR%%/zaproxy/plugin/callhome-release-0.5.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/commonlib-release-1.11.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/database-alpha-0.1.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/diff-beta-12.zap
 %%JAVAJARDIR%%/zaproxy/plugin/directorylistv1-release-5.zap
-%%JAVAJARDIR%%/zaproxy/plugin/domxss-beta-12.zap
-%%JAVAJARDIR%%/zaproxy/plugin/encoder-beta-0.6.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/formhandler-beta-4.zap
-%%JAVAJARDIR%%/zaproxy/plugin/fuzz-beta-13.5.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/gettingStarted-release-13.zap
-%%JAVAJARDIR%%/zaproxy/plugin/graaljs-alpha-0.2.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/graphql-alpha-0.7.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/help-release-14.zap
-%%JAVAJARDIR%%/zaproxy/plugin/hud-beta-0.13.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/importurls-beta-8.zap
-%%JAVAJARDIR%%/zaproxy/plugin/invoke-beta-11.zap
-%%JAVAJARDIR%%/zaproxy/plugin/network-alpha-0.0.1.zap
-%%JAVAJARDIR%%/zaproxy/plugin/oast-alpha-0.6.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/onlineMenu-release-9.zap
-%%JAVAJARDIR%%/zaproxy/plugin/openapi-beta-24.zap
-%%JAVAJARDIR%%/zaproxy/plugin/pscanrules-release-37.zap
-%%JAVAJARDIR%%/zaproxy/plugin/quickstart-release-32.zap
-%%JAVAJARDIR%%/zaproxy/plugin/replacer-beta-9.zap
-%%JAVAJARDIR%%/zaproxy/plugin/reports-release-0.10.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/retest-alpha-0.2.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/retire-release-0.9.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/reveal-release-4.zap
-%%JAVAJARDIR%%/zaproxy/plugin/saverawmessage-release-6.zap
-%%JAVAJARDIR%%/zaproxy/plugin/savexmlmessage-alpha-0.2.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/scripts-beta-29.zap
-%%JAVAJARDIR%%/zaproxy/plugin/selenium-release-15.5.1.zap
-%%JAVAJARDIR%%/zaproxy/plugin/soap-alpha-12.zap
-%%JAVAJARDIR%%/zaproxy/plugin/spiderAjax-release-23.7.0.zap
-%%JAVAJARDIR%%/zaproxy/plugin/tips-beta-9.zap
-%%JAVAJARDIR%%/zaproxy/plugin/webdriverlinux-release-33.zap
-%%JAVAJARDIR%%/zaproxy/plugin/webdrivermacos-release-33.zap
-%%JAVAJARDIR%%/zaproxy/plugin/webdriverwindows-release-33.zap
-%%JAVAJARDIR%%/zaproxy/plugin/websocket-release-24.zap
-%%JAVAJARDIR%%/zaproxy/plugin/zest-beta-35.zap
+%%JAVAJARDIR%%/zaproxy/plugin/domxss-release-14.zap
+%%JAVAJARDIR%%/zaproxy/plugin/encoder-beta-0.7.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/exim-beta-0.3.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/formhandler-beta-6.1.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/fuzz-beta-13.8.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/gettingStarted-release-14.zap
+%%JAVAJARDIR%%/zaproxy/plugin/graaljs-alpha-0.3.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/graphql-alpha-0.11.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/help-release-15.zap
+%%JAVAJARDIR%%/zaproxy/plugin/hud-beta-0.15.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/invoke-beta-12.zap
+%%JAVAJARDIR%%/zaproxy/plugin/network-beta-0.3.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/oast-beta-0.13.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/onlineMenu-release-10.zap
+%%JAVAJARDIR%%/zaproxy/plugin/openapi-beta-29.zap
+%%JAVAJARDIR%%/zaproxy/plugin/pscanrules-release-44.zap
+%%JAVAJARDIR%%/zaproxy/plugin/quickstart-release-35.zap
+%%JAVAJARDIR%%/zaproxy/plugin/replacer-release-11.zap
+%%JAVAJARDIR%%/zaproxy/plugin/reports-release-0.16.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/requester-beta-7.0.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/retest-alpha-0.4.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/retire-release-0.16.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/reveal-release-5.zap
+%%JAVAJARDIR%%/zaproxy/plugin/scripts-release-33.zap
+%%JAVAJARDIR%%/zaproxy/plugin/selenium-release-15.11.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/soap-beta-15.zap
+%%JAVAJARDIR%%/zaproxy/plugin/spider-release-0.1.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/spiderAjax-release-23.10.0.zap
+%%JAVAJARDIR%%/zaproxy/plugin/tips-beta-10.zap
+%%JAVAJARDIR%%/zaproxy/plugin/webdriverlinux-release-46.zap
+%%JAVAJARDIR%%/zaproxy/plugin/webdrivermacos-release-47.zap
+%%JAVAJARDIR%%/zaproxy/plugin/webdriverwindows-release-46.zap
+%%JAVAJARDIR%%/zaproxy/plugin/websocket-release-27.zap
+%%JAVAJARDIR%%/zaproxy/plugin/zest-beta-37.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
@@ -201,10 +196,8 @@ bin/zaproxy
 %%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/xml/common-user-agents.txt
 %%JAVAJARDIR%%/zaproxy/xml/config.xml
 %%JAVAJARDIR%%/zaproxy/xml/drivers.dtd
-%%JAVAJARDIR%%/zaproxy/xml/drivers.xml
 %%JAVAJARDIR%%/zaproxy/xml/reportCompare.xsl
-%%JAVAJARDIR%%/zaproxy/zap-2.11.1.jar
+%%JAVAJARDIR%%/zaproxy/zap-2.12.0.jar
 share/pixmaps/zaproxy.png