git: 218b262b154f - main - security/zaproxy: Fix issues with latest version of gradle

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=218b262b154f6533172dd6a04c0aaff37f6f1613

commit 218b262b154f6533172dd6a04c0aaff37f6f1613
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-09-18 22:35:16 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-09-18 22:35:16 +0000

    security/zaproxy: Fix issues with latest version of gradle
    
    - Re-generate plugins and deps package with latest version of gradle
    - Fix issues in zap.sh [1]
    - Bump PORTREVISION
    Reported by:    Mateusz Kocielski <shm _at_ digitalsun.pl> [1]
---
 security/zaproxy/Makefile                          |  1 +
 security/zaproxy/distinfo                          | 10 +++++-----
 .../zaproxy/files/patch-zap-src-main-dist_zap.sh   | 23 +++++++++++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index f54e3c543250..7ec808e00fb5 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	zaproxy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.13.0
+PORTREVISION=	1
 CATEGORIES=	security java
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo
index 0e4dcfc0c9f1..0f7619532139 100644
--- a/security/zaproxy/distinfo
+++ b/security/zaproxy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1689211847
-SHA256 (zaproxy-2.13.0-deps.tar.gz) = f90f508c652b90d57da9d336b4f9ef6a58c726ea43ca25be96473b24576591c3
-SIZE (zaproxy-2.13.0-deps.tar.gz) = 327651575
-SHA256 (zaproxy-2.13.0-plugins.tar.gz) = d55d3580d0022a4e8ad66d10c76053c925755fd549c9372136bb754fe1c1f23d
-SIZE (zaproxy-2.13.0-plugins.tar.gz) = 213023713
+TIMESTAMP = 1695075246
+SHA256 (zaproxy-2.13.0-deps.tar.gz) = 0d5f6b81df4c5b4ca15fa6d93f304e601ed6cabbbc2c6f23bb011f5c7725a9c2
+SIZE (zaproxy-2.13.0-deps.tar.gz) = 322264036
+SHA256 (zaproxy-2.13.0-plugins.tar.gz) = 51bc71c13c9e4af87ef82d2a93d1671c7a5feade4d06539f0328827131402484
+SIZE (zaproxy-2.13.0-plugins.tar.gz) = 213024343
 SHA256 (zaproxy-zaproxy-v2.13.0_GH0.tar.gz) = c3df2d1ea80174955249b5c26208ec4019cf047633fe826a166b2e8b311a0092
 SIZE (zaproxy-zaproxy-v2.13.0_GH0.tar.gz) = 7473060
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 e42610bc36aa..7bcd12e8c3bc 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	2022-10-27 07:53:05.000000000 -0500
-+++ zap/src/main/dist/zap.sh	2022-10-31 18:52:02.376240000 -0500
+--- zap/src/main/dist/zap.sh	2023-07-11 09:00:57.000000000 -0500
++++ zap/src/main/dist/zap.sh	2023-09-18 17:22:08.753719000 -0500
 @@ -1,18 +1,7 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -39,17 +39,26 @@
  JAVA_MAJOR_VERSION=${JAVA_VERSION%%[.|-]*}
  JAVA_MINOR_VERSION=$(echo $JAVA_VERSION | awk -F\. '{ print $2 }')
  
-@@ -90,7 +79,7 @@
+@@ -90,21 +79,21 @@
    fi
  fi
  
 -ARGS=()
 +ARGS=""
  for var in "$@"; do
-   if [[ "$var" == -Xmx* ]]; then
+-  if [[ "$var" == -Xmx* ]]; then
++  if [ "$var" == -Xmx* ]; then
      # Overridden by the user
-@@ -104,7 +93,7 @@
-   elif [[ $var != -psn_* ]]; then
+     JMEM="$var"
+-  elif [[ $var == --jvmdebug* ]]; then
++  elif [ $var == --jvmdebug* ]; then
+ 	JAVADEBUGPORT=`echo "$var" | sed -e "s/--jvmdebug//g" | sed -e "s/=//g"`
+ 	if [ ! "$JAVADEBUGPORT" ]; then
+ 		JAVADEBUGPORT=1044
+ 	fi
+ 	JAVADEBUG="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=127.0.0.1:$JAVADEBUGPORT"
+-  elif [[ $var != -psn_* ]]; then
++  elif [ $var != -psn_* ]; then
      # Strip the automatic -psn_x_xxxxxxx argument that OS X automatically passes into apps, since
      # it freaks out ZAP
 -    ARGS+=("$var")
@@ -65,5 +74,5 @@
 +  %%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[@]}"
-+  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "zap-%%VERSION%%.jar" "${ARGS}"
++  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "zap-%%VERSION%%.jar" ${ARGS}
  fi