From nobody Tue Nov 07 00:25:20 2023 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 4SPTWh2M4Sz50qJq; Tue, 7 Nov 2023 00:25:20 +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 4SPTWh1srHz4dQS; Tue, 7 Nov 2023 00:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316720; 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=W64xMvOLm9YVniIc9dgs/vA50ClnsP2CaJkolzUtjUk=; b=b/ghLFZrAickW7/iQz1tRCpKN5hUy64Hyfs/E3fD/V7OLb7awFQx0gVMAd+ZfLlQgBn0pF xyGXnkcivs8QM9osFIue38BSk8wdIVLzXIjZKohkXuknjy/YCba2vIPV6beB9e4McbpDeT mhPj0Z1S8yeq6hTeN9Qnbx4tYFwcBgSeMP13KhHp6Kck2Zp6tjksKl2CJ0UxFAG2+Rak2D whnVSwlII8AyiVvxMago3LxZwhfRi4h3jeLgD1Lmpaa92NhCMGSzV5D5TpNXVbEm8tAFWs 0I6v1XuieXesJu9QYkxeOetYfWpJHKex5jfjsacEC2gVtmQ5QkvSb9gLkn0Cig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316720; 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=W64xMvOLm9YVniIc9dgs/vA50ClnsP2CaJkolzUtjUk=; b=a9J1WdAn9i/i0wMRcL+FcxdqFLAaeT7SFqP6AcCDegtduM/7nAWu1O1GbQQimxwzi/xFZZ AOUHAqcgVJmPnDTAIaEP/hR2XAxJfXnA63IaoMDrRw39FZZ5X2QxsFGQL/S5Th3wbKh7Lc rfjNrbrXXXopBDMu/WM+A3MIP43TymPSAzJbzIXZZaQ3njfa+doC/S/VDbVUnIDi73gahy 3sbAscS1GlGsazgh1dx+kHAaRynC+fawyldzTNobSfad7QoG8sLsO/GY5mZu+PqFAUqGdN kenEmOls99PeDvKBOyVpk7A+CZtgyorfsVBBTWgIphA0SKqz92wfk7qTAYnLyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699316720; a=rsa-sha256; cv=none; b=njImW9BiKApEoR5ifbim2u6yJ41e2G1S8M3IWADDJAdX90rmYC1W9F7c1zPVMwjv+0DR1Y OD8l0NjcmTcL61Nf4OH5V80HAQx91wNaP0WANCOUvhBX4qvw5oyLPt6cgpnSo4YMMCdtP3 9UqQ8jxYTfHZ7JfAFxmnr2zCjMPUnuGMeSFkdqyHN6NN/txjiMa53yPmZzhhrC9kE4caVV VEWo6XtvGKX2RI9nChd+Y82RWnIpnC7B+xUocc/O3iJfQ6Vd3f/unrXBlQBugQwHqMR8IT av9Kf7hZ/OLncjl+3+ZFchPtqkXNDFbUC4jvfDSFmYffMaltvRO+clGRqUsCSA== 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 4SPTWh0w1FzTjp; Tue, 7 Nov 2023 00:25:20 +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 3A70PKwF033432; Tue, 7 Nov 2023 00:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A70PKXJ033429; Tue, 7 Nov 2023 00:25:20 GMT (envelope-from git) Date: Tue, 7 Nov 2023 00:25:20 GMT Message-Id: <202311070025.3A70PKXJ033429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 8b1bd68d1b82 - 2023Q4 - security/openvas: fix build on armv7 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 8b1bd68d1b82dd75826e3a8386c06b3d2996fe70 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b1bd68d1b82dd75826e3a8386c06b3d2996fe70 commit 8b1bd68d1b82dd75826e3a8386c06b3d2996fe70 Author: Robert Clausecker AuthorDate: 2023-11-04 06:19:31 +0000 Commit: Robert Clausecker CommitDate: 2023-11-07 00:24:52 +0000 security/openvas: fix build on armv7 - fix a wrong formatting specifier - mute a well-intended but irrelevant warning. It would be better to just kill -Werror altogether as per policy, but I'll leave this up to the maintainer - remove a REINPLACE_CMD now that the same effect is achieved by patch Approved by: portmgr (build fix blanket) MFH: 2023Q4 (cherry picked from commit c5f3ade2afe4807dfb9de757367c10aafb7b3500) --- security/openvas/Makefile | 8 +++++++- security/openvas/files/patch-src_attack.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/security/openvas/Makefile b/security/openvas/Makefile index 93e2b40529ba..57c44842cf05 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -44,8 +44,14 @@ GROUPS= ${USERS} CFLAGS+= -Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-error=invalid-utf8 .endif +# The struct this error is about is only ever accessed using bcopy() and memset(), +# so the unaligned structure doesn't matter. Disable the error, but keep it as a +# warning so we can see where it is. +CFLAGS_armv6= -Wno-error=unaligned-access +CFLAGS_armv7= -Wno-error=unaligned-access + post-patch: - @${REINPLACE_CMD} -e 's|#include ||g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c + @${REINPLACE_CMD} -e 's|#include ||g' ${WRKSRC}/src/nasl_plugins.c @${REINPLACE_CMD} -e 's|#include |#include |g' ${WRKSRC}//src/pluginload.c @${REINPLACE_CMD} -e 's|vendor_version_get ()|vendor_version_get (void)|g' ${WRKSRC}/misc/vendorversion.c diff --git a/security/openvas/files/patch-src_attack.c b/security/openvas/files/patch-src_attack.c index 2d6e3094ab66..8efb19d1240b 100644 --- a/security/openvas/files/patch-src_attack.c +++ b/security/openvas/files/patch-src_attack.c @@ -1,6 +1,33 @@ ---- src/attack.c.orig 2023-01-03 21:45:22 UTC +--- src/attack.c.orig 2023-10-11 11:14:13 UTC +++ src/attack.c -@@ -1493,13 +1493,13 @@ stop: +@@ -31,7 +31,7 @@ + #include "utils.h" + + #include /* for inet_ntoa() */ +-#include ++ + #include /* for errno() */ + #include + #include +@@ -1095,7 +1095,7 @@ apply_hosts_reverse_lookup_preferences (gvm_hosts_t *h + gvm_hosts_t *excluded; + + excluded = gvm_hosts_reverse_lookup_unify_excluded (hosts); +- g_debug ("reverse_lookup_unify: Skipped %lu host(s).", excluded->count); ++ g_debug ("reverse_lookup_unify: Skipped %zu host(s).", excluded->count); + + // Get the amount of hosts which are excluded now for this option, + // but they are already in the exclude list. +@@ -1111,7 +1111,7 @@ apply_hosts_reverse_lookup_preferences (gvm_hosts_t *h + gvm_hosts_t *excluded; + + excluded = gvm_hosts_reverse_lookup_only_excluded (hosts); +- g_debug ("reverse_lookup_unify: Skipped %lu host(s).", excluded->count); ++ g_debug ("reverse_lookup_unify: Skipped %zu host(s).", excluded->count); + // Get the amount of hosts which are excluded now for this option, + // but they are already in the exclude list. + // This is to avoid issues with the scan progress calculation, since +@@ -1614,13 +1614,13 @@ stop: gettimeofday (&now, NULL); if (test_alive_hosts_only)