aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgettoknowmi <gettoknowmi@yahoo.com>2021-08-24 20:37:20 +0000
committerNuno Teixeira <eduardo@FreeBSD.org>2021-08-24 20:37:20 +0000
commit75a79fdae85929c4663e9b8873a7b6f8bffd701a (patch)
tree0664d220763d61727f06bdcae952cf184db75c8b
parent4b1cd541703e54801a2620b7e974b308a194c06f (diff)
downloadports-75a79fdae85929c4663e9b8873a7b6f8bffd701a.tar.gz
ports-75a79fdae85929c4663e9b8873a7b6f8bffd701a.zip
security/masscan: Update to 1.3.2
-rw-r--r--security/masscan/Makefile4
-rw-r--r--security/masscan/distinfo6
-rw-r--r--security/masscan/files/patch-src_smack1.c30
3 files changed, 26 insertions, 14 deletions
diff --git a/security/masscan/Makefile b/security/masscan/Makefile
index a74b6e7ff90b..85aaa246e53d 100644
--- a/security/masscan/Makefile
+++ b/security/masscan/Makefile
@@ -1,7 +1,7 @@
# Created by: Chie Taguchi <taguchi.ch@gmail.com>
PORTNAME= masscan
-PORTVERSION= 1.0.4
+DISTVERSION= 1.3.2
CATEGORIES= security
MAINTAINER= taguchi.ch@gmail.com
@@ -12,8 +12,8 @@ LICENSE= GPLv3
USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= robertdavidgraham
-CFLAGS+= -Wno-format
MAKE_ARGS= SYS=freebsd CC="${CC}" CFLAGS="${CFLAGS}"
+CFLAGS+= -Wno-format
PLIST_FILES= bin/masscan man/man8/masscan.8.gz
diff --git a/security/masscan/distinfo b/security/masscan/distinfo
index c98a42bc097c..de77f6de4d6b 100644
--- a/security/masscan/distinfo
+++ b/security/masscan/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497024027
-SHA256 (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9
-SIZE (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 343513
+TIMESTAMP = 1629557968
+SHA256 (robertdavidgraham-masscan-1.3.2_GH0.tar.gz) = 0363e82c07e6ceee68a2da48acd0b2807391ead9a396cf9c70b53a2a901e3d5f
+SIZE (robertdavidgraham-masscan-1.3.2_GH0.tar.gz) = 463449
diff --git a/security/masscan/files/patch-src_smack1.c b/security/masscan/files/patch-src_smack1.c
index d1986333834e..8a5448fd62dc 100644
--- a/security/masscan/files/patch-src_smack1.c
+++ b/security/masscan/files/patch-src_smack1.c
@@ -1,11 +1,23 @@
---- src/smack1.c.orig 2017-06-06 03:59:39 UTC
+--- src/smack1.c.orig 2021-01-31 09:13:30 UTC
+++ src/smack1.c
-@@ -115,6 +115,8 @@
- #include "pixie-timer.h"
- #if defined(_MSC_VER)
- #include <intrin.h>
-+#elif defined(__llvm__) && (defined(__amd64__) || defined(__i386__))
-+#include <x86intrin.h>
- #elif defined(__GNUC__)
- static __inline__ unsigned long long __rdtsc(void)
+@@ -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__)