Skip to content

Commit

Permalink
security/zaproxy: Fix issues with latest version of gradle
Browse files Browse the repository at this point in the history
- 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]
  • Loading branch information
alonsobsd committed Sep 18, 2023
1 parent 28c5788 commit 218b262
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
1 change: 1 addition & 0 deletions security/zaproxy/Makefile
@@ -1,6 +1,7 @@
PORTNAME= zaproxy
DISTVERSIONPREFIX= v
DISTVERSION= 2.13.0
PORTREVISION= 1
CATEGORIES= security java

MAINTAINER= acm@FreeBSD.org
Expand Down
10 changes: 5 additions & 5 deletions 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
23 changes: 16 additions & 7 deletions 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
Expand Down Expand Up @@ -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")
Expand All @@ -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

0 comments on commit 218b262

Please sign in to comment.