From nobody Thu Aug 4 19:53:26 2022 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 4LzKCp2pJ0z4Xkb0; Thu, 4 Aug 2022 19:53:26 +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 4LzKCp2FNzz3lZh; Thu, 4 Aug 2022 19:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659642806; 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=iKwZ/9VxsFK/IAFo2ucwpudactLaLUTwBrSJm5975Ic=; b=g9PgaRjuf3J2xRMEDvvTcOlN617Tf8byMrUlxi8NuosGI2YLTI/ucp/QotSKhZGOex/wPm pe3d1NMgaMQetxclGrFd7vk3CWmIvRRPUhE39otBH1yhtLDyyAmGBqyDpmT2KusSH2QzuB ICeC9c/N4bBynapgM+JmpvIWu9KsnDU3C+lQI0s55boG9GnFsiNOnFO2O0xgOLc0Yd47ZF HE9B2EyD3e0HZWSQFquo7a3rnqIt10YHUgSkrUBntHSPOTqdztxmjEC4jnEimPyS/Ymf/t iEhryCNVGbwfqhRFoi3qswj7UWi9Jlq8iMhpht/9c8oYUab4X7pXey5hMX4p9Q== 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 4LzKCp1DkKzRXD; Thu, 4 Aug 2022 19:53:26 +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 274JrQIZ045223; Thu, 4 Aug 2022 19:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274JrQMx045222; Thu, 4 Aug 2022 19:53:26 GMT (envelope-from git) Date: Thu, 4 Aug 2022 19:53:26 GMT Message-Id: <202208041953.274JrQMx045222@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Neel Chauhan Subject: git: 9c24af4c6609 - 2022Q3 - security/masscan: 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 9c24af4c660962a2ed4b33bc625a926a740d4413 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659642806; 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=iKwZ/9VxsFK/IAFo2ucwpudactLaLUTwBrSJm5975Ic=; b=VEAeoHgLHEM4sLThsPwDzLJnoTIzsTKPXl4VKr6FAbNEY8BglY8o37tYXt+8upeOPQJDpv ytDkb6mNkZNXd0jfxQhfUgjb4jKwRc9Hnb8v9LkUPAH5i9SoUuH91vk45m00lGEe0FYldJ TgLeFkHtSJeVWpP9CQPrx/cSfZPCCZl/Jc97Pj5aahSmB+uMoIjXDnNwrVHdO73W4HqWRA Ecn0agOvoLdVO+We7eeyCS61GuibHwDvUxt2a8yMBn0ouPbr+yPSuCj12J6OVH4gln/c7+ aX2pwObgSiUyABpIEYb4lVljrj7MS3YR1QzvDn0CyxyYKgyDQtgewctcDrdXLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659642806; a=rsa-sha256; cv=none; b=fbc8iZRclCQYc3g1GfXlCgVyL6WzZaXvZvFMICygvym5MMNsnKTglOxjGospxXR074sINu YO33Hu1LFlG+Tg9RL6a1wcEy3BzWvDET/R7wlUlTupjXNto3QIvPpYYW94FS7IAUNxu/CZ 71vQ5mDPOvxrOO5vPF7B3qL3CXWaPhyLKdvUYK2gGGmH61TcG/w1D+02ssozWB84B2hlo5 zCK5esPoAv1ngd1Ed9i1OlWvk+18wOG+K1XoMi1+xwTYf3uGUf/O9aNFAF19Xlg24utpor Yo9XIxD9gZjTcwy6aaNqWzZs0XEjNHxjCiDBiaKFB3L5EIXcgFjp0vSSaRWp6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c24af4c660962a2ed4b33bc625a926a740d4413 commit 9c24af4c660962a2ed4b33bc625a926a740d4413 Author: Robert Clausecker AuthorDate: 2022-08-02 04:56:16 +0000 Commit: Neel Chauhan CommitDate: 2022-08-04 19:53:16 +0000 security/masscan: fix build on armv7 - fix armv6/armv7 rdtsc patch - add a missing include file PR: 265567 Approved by: taguchi.ch AT gmail DOT com (cherry picked from commit e93cb96a07d574708cb409696ba1257c16de32f0) --- security/masscan/files/patch-src_out-tcp-services.c | 10 ++++++++++ security/masscan/files/patch-src_smack1.c | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/security/masscan/files/patch-src_out-tcp-services.c b/security/masscan/files/patch-src_out-tcp-services.c new file mode 100644 index 000000000000..2e3926af3812 --- /dev/null +++ b/security/masscan/files/patch-src_out-tcp-services.c @@ -0,0 +1,10 @@ +--- src/out-tcp-services.c.orig 2022-08-02 04:53:49 UTC ++++ src/out-tcp-services.c +@@ -1,6 +1,7 @@ + #include "out-tcp-services.h" + #include + #include ++#include + + #ifndef WIN32 + #include diff --git a/security/masscan/files/patch-src_smack1.c b/security/masscan/files/patch-src_smack1.c index 909d256435cf..e88a20706b8b 100644 --- a/security/masscan/files/patch-src_smack1.c +++ b/security/masscan/files/patch-src_smack1.c @@ -6,8 +6,9 @@ #include -#define __rdtsc rdtsc -#if (__ARM_ARCH >= 6) // V6 is the earliest arch that has a standard cyclecount +-unsigned long long rdtsc(void) +#if (__ARM_ARCH >= 6 && __ARM_ARCH <= 7) // V6 is the earliest arch that has a standard cyclecount - unsigned long long rdtsc(void) ++unsigned long long __rdtsc(void) { uint32_t pmccntr; uint32_t pmuseren;