diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2022-10-31 20:30:32 -0500 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2022-10-31 20:34:21 -0500 |
| commit | dc6244ca91e8ad06a58d90c121f6466adfd8c4f0 (patch) | |
| tree | e5b4d62f91e639f5cc67402770f01196cb7c6645 /security/zaproxy/files/patch-zap-src-main-dist_zap.sh | |
| parent | math/octave-forge-csg-toolkit: Use smarter method to set CXXFLAGS. (diff) | |
security/zaproxy: update to 2.12.0
ChangeLog at: https://www.zaproxy.org/docs/desktop/releases/2.12.0/
Diffstat (limited to 'security/zaproxy/files/patch-zap-src-main-dist_zap.sh')
| -rw-r--r-- | security/zaproxy/files/patch-zap-src-main-dist_zap.sh | 18 |
1 files changed, 8 insertions, 10 deletions
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 |