From nobody Mon Sep 18 22:38:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqKSm22pyz4ts4H; Mon, 18 Sep 2023 22:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqKSm1PCfz3MSr; Mon, 18 Sep 2023 22:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695076696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+PVJ15yIJat1RmMiHdf30tfepOUPkn656q2hmATfjw=; b=bUm5/ZnoJWalsCQz1kFrUnnvP2AnmrgfNVo1CAdIfYOwBNEgtzowmU4Ko1bRs9bZchk84k MLwFl1iv/sKTI0/CjBcW/0ocxp3C9BjzQDSVnsD3bv3Hdo2ZUCGTf0xGmJ3qx+d27w67QQ /o3NR9WT96jl1DjhgYAwV99w5w0RwDRsIdXQlRVyeE4Sikj85LXGPMckZCFEA3YfQdWp69 U1T8pv8ie3aLnMKolHOPZE2Jlt2gnOZ5ytMzLR8VKxiaU7WeMvAHW9O0IXw1nIW+/htPSs /SwgMKBgoSQjXfxptOllHnOcKStYYDCLAVxmwJHcTc9KNqDOutPHGr8ARivoiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695076696; a=rsa-sha256; cv=none; b=jRsaa8otTGj3hASwZzBZvlcGkWGKainXYJ6Lrorle8j47ZPpIn/cPEOhcO82zJGHR+/G0j 8G+SH996U7txYz9y9B9zKQgF8W+wncNF7j/bgf4GqLPnJlGxry3heWIpE0AwaLoRVfahVF cjL7qGcnzAWCKfDg52RJf4nEplQ1Rr+/sm55dwZ05nhvsSg5Qp7WEfdvpl/cZChEFJYbK8 Tx3hVia4fNjb82SemLj+ynbRIqeSpkWnw/tSj0TE6lHDNKHe1gAw48cjKKogTY5n7TlUMa /qvx6X2vc2okCsjhZ3vkKquxMLplUy2VWNkTYCZskglSJnPRABaFJWbv5SBysw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695076696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+PVJ15yIJat1RmMiHdf30tfepOUPkn656q2hmATfjw=; b=NPhU1KvFupinQKE26V/Oy5WRIQoz2HnKeBeM17MNDo0UupZpuVmutba58CJ8vydgfZAMeL gDlgn9jGkykEnWctn+dzSKJE+7SuTvb+lvsyYmP7yYVvu/eZb9O2JzuZaM29XRWZpiNMeh ATQtB77lVAjUeOPTyykzvf3qF7jx2N6MDSCpcmQzSuebEgQsYlRrwqtUiJzas8oj6o4K8o y+xZmVfoYD5XFGnYfXWzQtem9xtC0BXkfogubiDGNRqfZrn7DmE8En0r3zeuc9vmuahhAW E27JD7rWj/ppcNl7tc2bDYrQeqQctp7bXWiHUcGBkoCb5XB8byHrSjh7aFCvYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqKSm0LHQzpFP; Mon, 18 Sep 2023 22:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IMcFQD012097; Mon, 18 Sep 2023 22:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IMcFmX012094; Mon, 18 Sep 2023 22:38:15 GMT (envelope-from git) Date: Mon, 18 Sep 2023 22:38:15 GMT Message-Id: <202309182238.38IMcFmX012094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 218b262b154f - main - security/zaproxy: Fix issues with latest version of gradle List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 218b262b154f6533172dd6a04c0aaff37f6f1613 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=218b262b154f6533172dd6a04c0aaff37f6f1613 commit 218b262b154f6533172dd6a04c0aaff37f6f1613 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-09-18 22:35:16 +0000 Commit: Jose Alonso Cardenas Marquez 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 [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