From nobody Mon Dec 19 20:10:53 2022 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 4NbW6j62lxz1GvRL; Mon, 19 Dec 2022 20:10:53 +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 4NbW6j5L4rz4FNP; Mon, 19 Dec 2022 20:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671480653; 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=M0cTWK42PywKp3Orenb0OlYUdfLISBxb5cr8FEjxeug=; b=bd6TkYRuKh0x2Pom3rQzlF0QTrcSbfiwFYraLNqcN5Kl5uWfaPNHftLoG8WYDA0EUg7pvA FSR8cmZVlOOwvjp5YXojfr4GnFr42UduralqugsIWkBUVkBanZEcoirf8cx82rg3w6/J8J hHBlWH3Su4dsXVNw0uR2qR/lDD8+YUK1cQ1QhT2jj9j/CfPLtL71XtdFWpbLTj1D//5X0x gRcZT5Ux85EFGrORZNIo16YxHhyy6k8S2FgHXPCU6JggM5fgByV4c6p+8AQFamGw0YSuwI TRUD4XGAdv5CfCKkA6H/O4XwJDacVACqlZ9z4uisFDjUs71lPQIawyuNPtEfGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671480653; 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=M0cTWK42PywKp3Orenb0OlYUdfLISBxb5cr8FEjxeug=; b=elCmqRXs41eXo54jC5nUtwbl+k6OYwKflqtiSa98EnJqqz3Pp8dZW4iXxjQDl8bTrc33es KwdksAHv5W/frk6fHUoN4hhfBBK6zLM3SbO8DU+VC27H4PwPMpl7fg/bX6PVl5Hp6/jKM6 kB6pfuU08IT61Iphm00+KufcYUsoiCZoFptZQt/a6DjA5FRdR4/DL97wJ0VqUjeaXFnJOb UOzFhrb6HKWKZhSUaHBlRr7mxdYfapfERPg7R+FluaMQaxZRIv0M/3tQPcptVC0tVYPtcq ZFKsJNfBn1gPtou4pZgNIpq5LuNO/+vYOjkH5XbOq+oSYfPYyGkGKRC2dhyhFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671480653; a=rsa-sha256; cv=none; b=eZPENlzyjIZKwoiis08EVfYPYA4q6MgJBwitMc0LyYMrQ/SHuFRxeWFN7wdh10UJac9bvi sb6c0EEe9bKd+OAipAzeHB6uqzFyOVEh8IqH/zjxjLwJyIqt48q2fDyqAHHSU80cxK2A55 W958NRtwdklhcsmKUCbVd9BVowm5SqdU7ZCEJunRr6AVpOPDc0DyNWyuymPl/MS9Pq5JjU y36TLtmoVfibD2zODmeZ3qZG7fFrD4Duqg16MIarK3Xml+AVt8/ZThk+r2VX/xRUBPBVcw 3Ht54AI4JpmFWJzwUfFEIbuGcVYpEfDP+XhCnprGJwRPT2iu0AKDWYYxDeT/RQ== 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 4NbW6j4Pdyz17SR; Mon, 19 Dec 2022 20:10:53 +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 2BJKAr3T081028; Mon, 19 Dec 2022 20:10:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJKAr9n081027; Mon, 19 Dec 2022 20:10:53 GMT (envelope-from git) Date: Mon, 19 Dec 2022 20:10:53 GMT Message-Id: <202212192010.2BJKAr9n081027@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: 2a5f4ad4879d - main - security/zaproxy: Fix build after of gradle update to 7.6 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: 2a5f4ad4879dd0806c88e0519854ff54511d1005 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a5f4ad4879dd0806c88e0519854ff54511d1005 commit 2a5f4ad4879dd0806c88e0519854ff54511d1005 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-12-19 20:08:44 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-12-19 20:08:44 +0000 security/zaproxy: Fix build after of gradle update to 7.6 - Fix way to generate plugins distfile - Bump PORTREVISION --- security/zaproxy/Makefile | 5 ++++- security/zaproxy/distinfo | 10 +++++----- ...org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile index a972cbe90029..5a62cf4b1eec 100644 --- a/security/zaproxy/Makefile +++ b/security/zaproxy/Makefile @@ -1,6 +1,7 @@ PORTNAME= zaproxy DISTVERSIONPREFIX= v DISTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= security java MAINTAINER= acm@FreeBSD.org @@ -35,11 +36,13 @@ DESKTOP_ENTRIES="ZAP" "OWASP ZAP" "${PREFIX}/share/pixmaps/zaproxy.png" "${PORTN DEV_UPDATE_MODE= no DEPS_CACHE_DIR= ${WRKDIR} +EXCLUDE_TASK= --exclude-task :zap:downloadMainAddOns MAKE_ENV+= JAVA_HOME=${JAVA_HOME} SUB_LIST= JAVA_HOME=${JAVA_HOME} .if (${DEV_UPDATE_MODE} == "yes") +EXCLUDE_TASK= # post-build: @cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} gradle-${PORTNAME} @cd ${WRKSRC}/zap/build && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX} mainAddOns @@ -63,7 +66,7 @@ post-patch: do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \ --gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \ - ${GRADLE_ARGS} --build-cache :zap:distCore --exclude-task :zap:downloadMainAddOns + ${GRADLE_ARGS} --build-cache :zap:distCore ${EXCLUDE_TASK} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/zap/build/distFiles/zap.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo index eb03a80126a5..2fe760372a9b 100644 --- a/security/zaproxy/distinfo +++ b/security/zaproxy/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1667261004 -SHA256 (zaproxy-2.12.0-deps.tar.gz) = 7a7e4839a25f883f91bcabfe836b022819947af6f39be6c6dd9bd4e27fd17704 -SIZE (zaproxy-2.12.0-deps.tar.gz) = 374388136 -SHA256 (zaproxy-2.12.0-plugins.tar.gz) = 2d6dc11846aa82df4f2452da91280b45a1266ea2149a58442c4005a346c1d1e2 -SIZE (zaproxy-2.12.0-plugins.tar.gz) = 256334454 +TIMESTAMP = 1671479878 +SHA256 (zaproxy-2.12.0-deps.tar.gz) = cde40f1763645ce0380098dde0638f8e76ec27a4eff35d04b7e075a3e66fb6a8 +SIZE (zaproxy-2.12.0-deps.tar.gz) = 331125479 +SHA256 (zaproxy-2.12.0-plugins.tar.gz) = 5b22706fee46203944c3667e5c490ff0af27bba20360d2f4390fe2062a9e390c +SIZE (zaproxy-2.12.0-plugins.tar.gz) = 256337831 SHA256 (zaproxy-zaproxy-v2.12.0_GH0.tar.gz) = caae3ad419d9ea6f327cc4d3a4450748aba9dedc0377d052381c352ec7976fac SIZE (zaproxy-zaproxy-v2.12.0_GH0.tar.gz) = 7442143 diff --git a/security/zaproxy/files/patch-buildSrc-src-main-java-org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java b/security/zaproxy/files/patch-buildSrc-src-main-java-org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java new file mode 100644 index 000000000000..6650874c4130 --- /dev/null +++ b/security/zaproxy/files/patch-buildSrc-src-main-java-org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java @@ -0,0 +1,19 @@ +--- buildSrc/src/main/java/org/zaproxy/zap/tasks/GradleBuildWithGitRepos.java 2022-12-19 14:49:43.923955000 -0500 ++++ buildSrc/src/main/java/org/zaproxy/zap/tasks/GradleBuildWithGitRepos.java 2022-12-19 14:49:59.270410000 -0500 +@@ -48,6 +48,7 @@ + import org.gradle.api.provider.Property; + import org.gradle.api.tasks.Console; + import org.gradle.api.tasks.Input; ++import org.gradle.api.tasks.InputDirectory; + import org.gradle.api.tasks.InputFile; + import org.gradle.api.tasks.Nested; + import org.gradle.api.tasks.TaskAction; +@@ -80,7 +81,7 @@ + return repositoriesDataFile; + } + +- @Input ++ @InputDirectory + public DirectoryProperty getRepositoriesDirectory() { + return repositoriesDirectory; + }