Attachment #227401 for bug #257931

Lines 1-7 Link Here

(-)b/security/masscan/Makefile (-1 / +1 lines)
1	# Created by: Chie Taguchi <taguchi.ch@gmail.com>	1	# Created by: Chie Taguchi <taguchi.ch@gmail.com>
2		2
3	PORTNAME= masscan	3	PORTNAME= masscan
4	PORTVERSION= 1.0.4	4	DISTVERSION= 1.3.2
5	CATEGORIES= security	5	CATEGORIES= security
6		6
7	MAINTAINER= taguchi.ch@gmail.com	7	MAINTAINER= taguchi.ch@gmail.com

Lines 1-3 Link Here

(-)b/security/masscan/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1497024027	1	TIMESTAMP = 1629557968
2	SHA256 (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9	2	SHA256 (robertdavidgraham-masscan-1.3.2_GH0.tar.gz) = 0363e82c07e6ceee68a2da48acd0b2807391ead9a396cf9c70b53a2a901e3d5f
3	SIZE (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 343513	3	SIZE (robertdavidgraham-masscan-1.3.2_GH0.tar.gz) = 463449




--- src/smack1.c.orig	2021-01-31 09:13:30 UTC
+++ src/smack1.c
@@ -119,8 +119,7 @@
 #elif defined(__FreeBSD__)
 #include <sys/types.h>
 #include <machine/cpufunc.h>
-#define __rdtsc rdtsc
-#if (__ARM_ARCH >= 6)  // V6 is the earliest arch that has a standard cyclecount
+#if (__ARM_ARCH >= 6 && __ARM_ARCH <= 7)  // V6 is the earliest arch that has a standard cyclecount
 unsigned long long rdtsc(void)
 {
   uint32_t pmccntr;
@@ -138,6 +137,10 @@ unsigned long long rdtsc(void)
   }
   return 0;
 }
+#elif defined(__aarch64__)
+#define __rdtsc() 0
+#else
+#define __rdtsc rdtsc
 #endif
 #elif defined (__llvm__)
 #if defined(i386) || defined(__i386__)

Return to bug 257931

Lines 1-11 Link Here

(-)b/security/masscan/files/patch-src_smack1.c (-9 / +21 lines)
1	--- src/smack1.c.orig 2017-06-06 03:59:39 UTC	1	--- src/smack1.c.orig 2021-01-31 09:13:30 UTC
2	+++ src/smack1.c	2	+++ src/smack1.c
3	@@ -115,6 +115,8 @@	3	@@ -119,8 +119,7 @@
4	#include "pixie-timer.h"	4	#elif defined(__FreeBSD__)
5	#if defined(_MSC_VER)	5	#include <sys/types.h>
6	#include <intrin.h>	6	#include <machine/cpufunc.h>
7	+#elif defined(__llvm__) && (defined(__amd64__) \|\| defined(__i386__))	7	-#define __rdtsc rdtsc
8	+#include <x86intrin.h>	8	-#if (__ARM_ARCH >= 6) // V6 is the earliest arch that has a standard cyclecount
9	#elif defined(__GNUC__)	9	+#if (__ARM_ARCH >= 6 && __ARM_ARCH <= 7) // V6 is the earliest arch that has a standard cyclecount
10	static __inline__ unsigned long long __rdtsc(void)	10	unsigned long long rdtsc(void)
11	{	11	{
		12	uint32_t pmccntr;
		13	@@ -138,6 +137,10 @@ unsigned long long rdtsc(void)
		14	}
		15	return 0;
		16	}
		17	+#elif defined(__aarch64__)
		18	+#define __rdtsc() 0
		19	+#else
		20	+#define __rdtsc rdtsc
		21	#endif
		22	#elif defined (__llvm__)
		23	#if defined(i386) \|\| defined(__i386__)