From nobody Thu Aug 04 19:52:47 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 4LzKC36Psvz4Xkkb; Thu, 4 Aug 2022 19:52:47 +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 4LzKC35wMGz3lWM; Thu, 4 Aug 2022 19:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659642767; 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=FKJCxmnq0b7N2PbvwoHdipr+mVqlj6pFnXUAn4Flj5A=; b=s6xEa0kHPqjYmMNWI8EXhL6g8DVnlhN+Uz+DY175UxtlhEUqW64EoLjagKf9LqmdbVxy3E U3TXkvH5hoQXSTpQyZwGmaSvECtDMrQYUuaF6CLiRQ80w4V5m+qmZIcUX4Yw9la6V3SaV8 5XUojD4BeVT1BVRtEpSShQNVpKaiyQwcHkUv8kR0C5fQ4HiYDTeL9qLEQydTGJx5YnBAu6 y6FWrQnaApkdkVCYCJK/GdkmbCI5hvqCzkJfwXnmEd/9QUOJI7jTz7pQBGLtSBtrz0OPad u1r4n9mkUlcDOKpQLUPDrMgjXQP6UYMPGxE+Fi8aXuOGKVbXM04uGGXelmh4Ow== 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 4LzKC34yz3zRXC; Thu, 4 Aug 2022 19:52:47 +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 274Jqlvr045046; Thu, 4 Aug 2022 19:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274JqlG9045045; Thu, 4 Aug 2022 19:52:47 GMT (envelope-from git) Date: Thu, 4 Aug 2022 19:52:47 GMT Message-Id: <202208041952.274JqlG9045045@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: e93cb96a07d5 - main - security/masscan: fix build on armv7 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e93cb96a07d574708cb409696ba1257c16de32f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659642767; 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=FKJCxmnq0b7N2PbvwoHdipr+mVqlj6pFnXUAn4Flj5A=; b=kCnZuUQPOhB0ej2TeSHILXYVPd94jLSN9H4kGB/Wd+ybv9lDEafMYE+c8SiXu7naYGkudR TXh0lsZS6zDHwXPrwD8EpprhyftQ+EveRcNOUlr4dKl4SsimNUChmYXJcxospWyTDC24O7 HGwWblxjqn+C56Zv5jKeeZ12cz3RXHQBAP/V05KaC1ajUVmVb5EPgAQa/IxvvqSKwS7Jvz QDhQeKge2Cgq5OmFpH9j0uB+Gm9BcFDU7MBASqfYysthJ3qyW1mSM/1mnjNWpXt9xQ2MrO Myew4JXJinYatdVuy9G7mPxtsb6Ouiq+rL6kOgO2O5Tf72arX0XO1M8/pjZOog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659642767; a=rsa-sha256; cv=none; b=aSUUwmj8aLGs5nD+RAY1PD+f+dxz06kdQQ8hbdZsdmrHKf1lmjr2OZzoou7YWIm0gH4C5j /AvhOKDf61UglzjwTCXLMpMbZb7ewXpKwMqoQ2XavQTvOZEajMsuPIN3QVQ390wYPL4oTV Y/y1uCqEag72tUyMsB8JiAsexCe7QeYk5whEooEIqy8I8dFlxEDiI26nl+0yTI2Xn0/VlQ 3B60rBoj0FLpv5239GEvjXXuyUJbvB1/aNvbu9tGJxZe6jcDmWxwGPYLF+SCGSWPWDp8DA BVBtBdJudOCHV8fA8bOZCbxzJrUfLPJxf2cOhrb5LpLAtxwR84t2nZ8nmQS6HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=e93cb96a07d574708cb409696ba1257c16de32f0 commit e93cb96a07d574708cb409696ba1257c16de32f0 Author: Robert Clausecker AuthorDate: 2022-08-02 04:56:16 +0000 Commit: Neel Chauhan CommitDate: 2022-08-04 19:52:09 +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 --- 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;