From nobody Sat Dec 11 18:00:12 2021 X-Original-To: dev-commits-ports-all@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 E701A18E89CD; Sat, 11 Dec 2021 18:00:12 +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 4JBFt44ZyJz4kFf; Sat, 11 Dec 2021 18:00:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7E98312845; Sat, 11 Dec 2021 18:00:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BBI0C9w024736; Sat, 11 Dec 2021 18:00:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBI0CeZ024730; Sat, 11 Dec 2021 18:00:12 GMT (envelope-from git) Date: Sat, 11 Dec 2021 18:00:12 GMT Message-Id: <202112111800.1BBI0CeZ024730@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: 42492bdd9dc5 - main - security/zaproxy: update to 2.11.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 42492bdd9dc50b8e258b0ddc84eca24b20fd9500 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639245612; 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=dpcQ9EVsOcrEaOIFF0c0SWW4pQCIODEU28VckWz5E10=; b=o2hY4Ll8PYNp3hKWBsyeMQqO18yolVvyOyQ02ELf+wbsnsLmfZSLtta9r6vXB6gRPsatHP HX7awLKdPtPXlQj2OWWxXZ8XG7XvoPcfl1VKd8E9EHetTsxrYcwfS8ySN/B1sH6TTg3Oeh 3gQSTIwH8fuz/H9r0dwziuqqmTd/fbDyOZOqueilvNX8d+T9yZqCzo37HQkqCmMI7/Sv5O xbx5AuV5641LKneAVJ/YwF47qhaEurdwJOi46YZNOXioqrIS0k5pVIi7gZ9n6DtRoswX3b U4BuDEsmnpveyBDU9Sq+ZWkZd0KTMuLHWjl3f1Bv1yG1g24jr5e2s0PcUq/2IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639245612; a=rsa-sha256; cv=none; b=cHut0I08DiQoeS3GZy+T4U3icqawImbOXRA3nil81WV8Hsh2qoXWwKcQowdiKxtu0Nkwuc 8fmWsM28t3hm/tOY/1NMd23VmLMK2kXv+jj3GbuGs0Jump7Cbqqeeo64WIy30GifwA48zE dqCqo1Hd44PKbKZdJ+23ocaP7jxIhW5gPFneXED31FXFYe3+05lshW6BOBSZk/hH6DPCNr L/uC0qOYHWiBPu7CtRstO2ex1DPOp4Cl19j+oGItcp7mj6+lIylg6x0irABpQEIiC9KcsO qi7JW8Q9rgbsrjcqMO/Jls8TzRq2sAG7bDDa4Gptv7v3Q6KO2Dl4/ZAVYGnJrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=42492bdd9dc50b8e258b0ddc84eca24b20fd9500 commit 42492bdd9dc50b8e258b0ddc84eca24b20fd9500 Author: Jose Alonso Cardenas Marquez AuthorDate: 2021-12-11 17:43:45 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2021-12-11 17:58:28 +0000 security/zaproxy: update to 2.11.1 ChangeLog at: https://www.zaproxy.org/docs/desktop/releases/2.11.1/ --- security/zaproxy/Makefile | 7 ++-- security/zaproxy/distinfo | 14 +++---- .../zaproxy/files/patch-zap-src-main-dist_zap.sh | 2 +- security/zaproxy/pkg-plist | 46 +++++++++++----------- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile index ba0b128a37ee..f81fb3eabb12 100644 --- a/security/zaproxy/Makefile +++ b/security/zaproxy/Makefile @@ -1,6 +1,6 @@ PORTNAME= zaproxy DISTVERSIONPREFIX= v -DISTVERSION= 2.11.0 +DISTVERSION= 2.11.1 CATEGORIES= security java MAINTAINER= acm@FreeBSD.org @@ -56,7 +56,8 @@ post-extract: # need a separate extract step because the cache is in /tmp, and n post-patch: @${ECHO} "" > ${WRKSRC}/zap/src/main/add-ons.txt @${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \ - -e 's|%%JAVA_HOME%%|${JAVA_HOME}|g' ${WRKSRC}/zap/src/main/dist/zap.sh + -e 's|%%JAVA_HOME%%|${JAVA_HOME}|g' \ + -e 's|%%VERSION%%|${DISTVERSION}|g' ${WRKSRC}/zap/src/main/dist/zap.sh .endif do-build: @@ -66,7 +67,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/zap/build/distFiles/zap.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - cd ${WRKSRC}/zap/build/distFiles/ && ${COPYTREE_SHARE} "db lang lib license plugin README scripts xml zap-2.11.0.jar" ${STAGEDIR}${JAVAJARDIR}/${PORTNAME} + cd ${WRKSRC}/zap/build/distFiles/ && ${COPYTREE_SHARE} "db lang lib license plugin README scripts xml zap-${DISTVERSION}.jar" ${STAGEDIR}${JAVAJARDIR}/${PORTNAME} cd ${WRKDIR}/mainAddOns && ${COPYTREE_SHARE} ./ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugin ${INSTALL_DATA} ${WRKSRC}/zap/src/main/resources/resource/zap64x64.png ${STAGEDIR}${PREFIX}/share/pixmaps/zaproxy.png diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo index 49cb22a87914..bbbd6073b8e8 100644 --- a/security/zaproxy/distinfo +++ b/security/zaproxy/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1638315045 -SHA256 (zaproxy-2.11.0-deps.tar.gz) = 6e9416494386edea16a0bc0b18b2d3aed1c9a8314dfca2a506d9a6578cf6bf5d -SIZE (zaproxy-2.11.0-deps.tar.gz) = 366399057 -SHA256 (zaproxy-2.11.0-plugins.tar.gz) = d41b0eb0d7e8c7e0b55613fa14a16973591ed7238f218ef1000d101ecb251f44 -SIZE (zaproxy-2.11.0-plugins.tar.gz) = 144148190 -SHA256 (zaproxy-zaproxy-v2.11.0_GH0.tar.gz) = bf1e23ea5817c6aa8ce6a23c9867a4c0854862b1f2ade8a122c65def0aeb0e7e -SIZE (zaproxy-zaproxy-v2.11.0_GH0.tar.gz) = 7311000 +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 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 fccf79b4b815..904a7265be0c 100644 --- a/security/zaproxy/files/patch-zap-src-main-dist_zap.sh +++ b/security/zaproxy/files/patch-zap-src-main-dist_zap.sh @@ -67,5 +67,5 @@ - 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-2.11.0.jar" "${ARGS}" ++ %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "zap-%%VERSION%%.jar" "${ARGS}" +fi diff --git a/security/zaproxy/pkg-plist b/security/zaproxy/pkg-plist index 78e31726616b..3e7d3064b896 100644 --- a/security/zaproxy/pkg-plist +++ b/security/zaproxy/pkg-plist @@ -123,9 +123,9 @@ 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.14.1.jar -%%JAVAJARDIR%%/zaproxy/lib/log4j-api-2.14.1.jar -%%JAVAJARDIR%%/zaproxy/lib/log4j-core-2.14.1.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/swingx-all-1.6.5-1.jar @@ -142,43 +142,45 @@ bin/zaproxy %%JAVAJARDIR%%/zaproxy/license/lgpl-3.0.txt %%JAVAJARDIR%%/zaproxy/plugin/Readme.txt %%JAVAJARDIR%%/zaproxy/plugin/alertFilters-release-13.zap -%%JAVAJARDIR%%/zaproxy/plugin/ascanrules-release-41.zap -%%JAVAJARDIR%%/zaproxy/plugin/automation-alpha-0.7.0.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/commonlib-release-1.5.0.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/directorylistv1-release-5.zap -%%JAVAJARDIR%%/zaproxy/plugin/domxss-beta-11.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.3.0.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.6.0.zap -%%JAVAJARDIR%%/zaproxy/plugin/help-release-12.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/oast-alpha-0.5.0.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-23.zap -%%JAVAJARDIR%%/zaproxy/plugin/pscanrules-release-36.zap -%%JAVAJARDIR%%/zaproxy/plugin/quickstart-release-30.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.7.0.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.4.0.zap -%%JAVAJARDIR%%/zaproxy/plugin/soap-alpha-10.zap -%%JAVAJARDIR%%/zaproxy/plugin/spiderAjax-release-23.6.0.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-32.zap -%%JAVAJARDIR%%/zaproxy/plugin/webdrivermacos-release-32.zap -%%JAVAJARDIR%%/zaproxy/plugin/webdriverwindows-release-32.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/scripts/templates/active/Active default template.js @@ -204,5 +206,5 @@ bin/zaproxy %%JAVAJARDIR%%/zaproxy/xml/drivers.dtd %%JAVAJARDIR%%/zaproxy/xml/drivers.xml %%JAVAJARDIR%%/zaproxy/xml/reportCompare.xsl -%%JAVAJARDIR%%/zaproxy/zap-2.11.0.jar +%%JAVAJARDIR%%/zaproxy/zap-2.11.1.jar share/pixmaps/zaproxy.png