From nobody Mon Aug 04 13:23:39 2025 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 4bwchC57hPz642sM; Mon, 04 Aug 2025 13:23:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwchC1zP1z3VqT; Mon, 04 Aug 2025 13:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754313819; 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=hH3uNZD3i8EcRz8pcPTWDIscIo5xMLl6/Em5I557JAk=; b=Fk4/j3aHIFCasqcr68ulwA76sAWpbbh5OHWVUU9fO/A9ActW1MZl3jOGKt/FN0AKlI6aaI 1MkGcpfiUF5uI/eyE+xhwIuau4BVHnHHGuYq49LA2v5hXlV7+byN/tEJHHBP8NwiAmdO5G +FgL4xapzPipzHnp/b7MjFe3uR0sVRvoF0wW+TIR1YC3cbth/kEkHDgZpRmVr9ZI+gpxmX NImMlmmWDa5FG1Q5vwCvSQzw7MtQN3P3HymWYRnENxUeGb5O0CrjSkP7CalIioRltpJDx2 90gqnPpT2dC6yDGxQ81tsGVfYM5pEpdnMVo6/aTk+tdVhlsKHzs7nHonAFYg7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754313819; 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=hH3uNZD3i8EcRz8pcPTWDIscIo5xMLl6/Em5I557JAk=; b=Gk6+G0cqd7n1T6KvraeOzWO1CdUEuzhLjc2EQycjsr8itfcTTKaPRBCMlIBYbWPq5ZVN15 UgRIQuczIJ24Sbpkp7GXp8M2gEYBGlXmi7+c2Xk7ZrMfyDtMBcPQkPXjLwS4TPQ+lK9T0v yONInICdUrr6FYFCqNLtI2XD5oeyRR084GZgX6ZmTxjHKUkX3+XEfYqHDzBvRl1gtXaXtR GCh+3UIhNVV0boYsJ+HnPWeEoB/Hos9zMYSZlf32+7Oapi9q1CzYpepN41j6kaieP3Je9q sMUTxcTaPtLxWOjND8MYjp+cXK4G9lgf9/k85Wc0wNnsWkPpPAYO9OLCaLaWVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754313819; a=rsa-sha256; cv=none; b=IG7iSDUilR+R7xE6vs6YRjYwRgNbuWiDEkg3YDFavUCc8nlzgPVqHtbQ1GD+DYyqXUxds6 +jd+rKVQsh8KVFUFUblKYGo+CYawYMjJhidG8xq2l636a3ciWjvwohATiHxXPh3WLqqldX lmVQRPovtBIYY4YwGGEhCKndcU7fo1tYLHEC1m6Tn39k0OJXO40IJr0ptZJc2tdTDa4jLy 88UNFQ9OFvdphxx5XY+3jNKL7ujDNJ3+ES9UmLm+dul0bIucWSZj19mR0KSOhlMfkvav++ EwxvGI/rJYzPOYKX4pdLbES7lOP9NIntxZP3QEJJnWSkdFoAzJcMaW1cINz1BQ== 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 4bwchC1bCmzrJs; Mon, 04 Aug 2025 13:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 574DNduN081790; Mon, 4 Aug 2025 13:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 574DNd81081787; Mon, 4 Aug 2025 13:23:39 GMT (envelope-from git) Date: Mon, 4 Aug 2025 13:23:39 GMT Message-Id: <202508041323.574DNd81081787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 4c8d901b75f8 - main - security/openvas: fix build on armv7 (again) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c8d901b75f85fb6a9cb8d2570274fef288d2e71 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c8d901b75f85fb6a9cb8d2570274fef288d2e71 commit 4c8d901b75f85fb6a9cb8d2570274fef288d2e71 Author: Robert Clausecker AuthorDate: 2025-08-01 11:43:28 +0000 Commit: Robert Clausecker CommitDate: 2025-08-04 13:23:24 +0000 security/openvas: fix build on armv7 (again) Some more printf type errors. These are really not important, -Werror should be dropped as per policy so I don't have to revisit this port yet again. Approved by: portmgr (build fix blanket) MFH: 2025Q3 --- security/openvas/Makefile | 2 +- security/openvas/files/patch-misc_plugutils.c | 11 +++++++++++ security/openvas/files/patch-src_attack.c | 15 ++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/security/openvas/Makefile b/security/openvas/Makefile index 5181bd1bc773..27e3a9a1a15a 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -1,6 +1,6 @@ PORTNAME= openvas DISTVERSION= 23.20.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= security diff --git a/security/openvas/files/patch-misc_plugutils.c b/security/openvas/files/patch-misc_plugutils.c new file mode 100644 index 000000000000..5c04ea7c4825 --- /dev/null +++ b/security/openvas/files/patch-misc_plugutils.c @@ -0,0 +1,11 @@ +--- misc/plugutils.c.orig 2025-08-01 11:38:10 UTC ++++ misc/plugutils.c +@@ -74,7 +74,7 @@ add_kb_usage (struct script_infos *args, size_t size) + kb_usage += size; + if (kb_usage > max_kb_usage) + { +- g_warning ("KB usage exceeded %lu MB. Unable to store any further KB " ++ g_warning ("KB usage exceeded %zu MB. Unable to store any further KB " + "Items for script %s", + max_kb_usage / 1024 / 1024, args->name); + return -1; diff --git a/security/openvas/files/patch-src_attack.c b/security/openvas/files/patch-src_attack.c index af15212b9768..9a78559b0a30 100644 --- a/security/openvas/files/patch-src_attack.c +++ b/security/openvas/files/patch-src_attack.c @@ -1,5 +1,5 @@ ---- src/attack.c 2025-03-03 04:49:55.000000000 -0800 -+++ src/attack.c 2025-04-14 20:09:40.968033000 -0700 +--- src/attack.c.orig 2025-05-27 12:10:19 UTC ++++ src/attack.c @@ -31,7 +31,6 @@ #include "utils.h" @@ -8,7 +8,7 @@ #include /* for errno() */ #include #include -@@ -1555,14 +1554,14 @@ +@@ -1555,21 +1554,21 @@ stop: gettimeofday (&now, NULL); if (test_alive_hosts_only) { @@ -27,3 +27,12 @@ gvm_hosts_count (hosts)); if (prefs_get ("report_scripts")) + { + char *buff = +- g_strdup_printf ("},\"scan_time\": {\"start\": %ld, \"stop\": %ld}}", +- then.tv_sec, now.tv_sec); ++ g_strdup_printf ("},\"scan_time\": {\"start\": %lld, \"stop\": %lld}}", ++ (long long)then.tv_sec, (long long)now.tv_sec); + char *path = g_strdup_printf ( + "%s/%s-stats.json", prefs_get ("report_scripts"), globals->scan_id); +