From nobody Sun Mar 24 00:24:06 2024 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 4V2GyZ4hvrz5GC18; Sun, 24 Mar 2024 00:24:06 +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 4V2GyZ49kgz4dQQ; Sun, 24 Mar 2024 00:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711239846; 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=AoXD4DMfXVhk926uPBoVcLp2mTwIhtXazw8CYHTWfAQ=; b=K7uqpSXYpJYXEiTsw/9Msq1T/8IRQThVQhJjDQOpN0JQ/x3lDH0XwJkDm7fVQLV/UjD9A9 ERJ3CR5CwgS6DSUyVgcjM8KZibFlW50Eyw7+KtC8hh9LT03efBFXoMAFxJZesHNB+1aWf9 NqA72WyrrcN4Rx8p2Fbp2EkYSbxxWwKs+uFY5e0Xb70yZsLEDac38xtUvcJsxaqQ6C0izr CcFubERkhz/KsyH//vlOfv5wRz4eYaoJd+OwDi+zIfWnL8Xj/mQ4t6ODb0IhV1SY2bUXu6 BiIE+84jK+6S2IdbsljOJsF3mD2PV7FomZyoy4JIYoKIOl6hJGHSZRvwUiM0Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711239846; a=rsa-sha256; cv=none; b=x8Gjx/kpNC6AsTMS5dgu4Ag4WrlVhr3FCP/f5EoIRfGo8RgUYwG8WgbqiKwWrqXpYENhki n9YhZNkLidzck/i/asnb2Kmtu+/ICJGokFPDx1Q927w1ZzJmRu4/c4t/Jd9scs+GNU8AIb rrDV1v01zmpAVFHa+8Z+JUxvsuaim7ebKLQx1OQFEZO+CxUzQZhnLHhVvKw0cp8WE42gnk ZqzbJ7X3mFOmPNAMJeEj93GdztbSkfTMqqFY65L4JfkSrMdktustKvs4CstrUzHAZbEP2h XOZndkyJLNmXmlSR8czgQFhakVywnVr9m7al0EUYOmuytcofqNYnUyrM3IZmeA== 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=1711239846; 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=AoXD4DMfXVhk926uPBoVcLp2mTwIhtXazw8CYHTWfAQ=; b=Y46xPUsGinqDrWP4LsvpJySLziZ8FvJ0gqwzOJPBtjursckc/PMcgBZ08m/MPTHIfSyCwJ sRjuBXwBQEPbZc4NCDItD+OHQBrQnV45XhuQfU0YWAyoDRPhPefwAr/hHBhHLc1l3oFTfR 0ViJ4RHb2Y5DeqWkXM9a7J/70HrWhoCYcUGDTLTYf7c1/XQu/KGAYRtoRuvV2WKo6bjGUe bKrQJ2knigUgA5X+Wuw2ikHEbpYv/4DstvMkCG1VuoBbIRoIkyNNYCx63yDy6IrnNWalL3 LlfcIjpq6Cbn6qYV8u+oZ7to2Yl0lW8jxorgWG2BXYzzsMIHe2Ci5ypKpVQZ9A== 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 4V2GyZ3mQtz191N; Sun, 24 Mar 2024 00:24:06 +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 42O0O6tE066703; Sun, 24 Mar 2024 00:24:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0O6m4066700; Sun, 24 Mar 2024 00:24:06 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:24:06 GMT Message-Id: <202403240024.42O0O6m4066700@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: 84b72a1703f8 - main - security/zaproxy: Update cache files because gradle was updated 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: 84b72a1703f8f24c308dca77823b33b1cdd48da5 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=84b72a1703f8f24c308dca77823b33b1cdd48da5 commit 84b72a1703f8f24c308dca77823b33b1cdd48da5 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-03-24 00:22:20 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-03-24 00:22:20 +0000 security/zaproxy: Update cache files because gradle was updated - Fix open options menu PR: 276730 Reported by: salvadore --- security/zaproxy/Makefile | 1 + security/zaproxy/distinfo | 10 +++++----- ...rc_main_java_org_parosproxy_paros_Constant.java | 23 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile index 4ead5886e9e8..4e92038c9f9a 100644 --- a/security/zaproxy/Makefile +++ b/security/zaproxy/Makefile @@ -1,6 +1,7 @@ PORTNAME= zaproxy DISTVERSIONPREFIX= v DISTVERSION= 2.14.0 +PORTREVISION= 1 CATEGORIES= security java MAINTAINER= acm@FreeBSD.org diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo index 0648bfdd5661..1205a06c49d7 100644 --- a/security/zaproxy/distinfo +++ b/security/zaproxy/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1697561594 -SHA256 (zaproxy-2.14.0-deps.tar.gz) = b26f5ed89c10de95b3cb1d39224c8cb9f4e154b3a78c0bcc75106c152c2d9feb -SIZE (zaproxy-2.14.0-deps.tar.gz) = 332187220 -SHA256 (zaproxy-2.14.0-plugins.tar.gz) = d6ca3c5179347c02c2addad85c9f29758143e2aaf5bb9c4e6752684982daef0c -SIZE (zaproxy-2.14.0-plugins.tar.gz) = 232482983 +TIMESTAMP = 1711238273 +SHA256 (zaproxy-2.14.0-deps.tar.gz) = 961ed29f92d165bd06ed8b54821760fbf339069f80a6e26d3c9d77ea3fa0f2d2 +SIZE (zaproxy-2.14.0-deps.tar.gz) = 369588532 +SHA256 (zaproxy-2.14.0-plugins.tar.gz) = 93d2f25beecd882ea8af173665372faab82c0b8c1e0389e3dbededc2909e3517 +SIZE (zaproxy-2.14.0-plugins.tar.gz) = 232482946 SHA256 (zaproxy-zaproxy-v2.14.0_GH0.tar.gz) = e775b827f2c1aa8ed93dae5c2677399fedbe8c64cbdd21e0122c3799706ca0ea SIZE (zaproxy-zaproxy-v2.14.0_GH0.tar.gz) = 5541732 diff --git a/security/zaproxy/files/patch-zap_src_main_java_org_parosproxy_paros_Constant.java b/security/zaproxy/files/patch-zap_src_main_java_org_parosproxy_paros_Constant.java new file mode 100644 index 000000000000..31a1e2f23177 --- /dev/null +++ b/security/zaproxy/files/patch-zap_src_main_java_org_parosproxy_paros_Constant.java @@ -0,0 +1,23 @@ +--- zap/src/main/java/org/parosproxy/paros/Constant.java.orig 2024-03-24 00:03:43 UTC ++++ zap/src/main/java/org/parosproxy/paros/Constant.java +@@ -1405,9 +1405,19 @@ public final class Constant { + return matcher.find(); + } + ++ // Determine FreeBSD Operating System ++ // ZAP: Changed to final. ++ private static final Pattern patternFreeBSD = Pattern.compile("freebsd", Pattern.CASE_INSENSITIVE); ++ ++ public static boolean isFreeBSD() { ++ String os_name = System.getProperty("os.name"); ++ Matcher matcher = patternFreeBSD.matcher(os_name); ++ return matcher.find(); ++ } ++ + // Determine Linux Operating System + // ZAP: Changed to final. +- private static final Pattern patternLinux = Pattern.compile("linux", Pattern.CASE_INSENSITIVE); ++ private static final Pattern patternLinux = Pattern.compile("linux|freebsd", Pattern.CASE_INSENSITIVE); + + public static boolean isLinux() { + String os_name = System.getProperty("os.name");