Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Jun 2017 23:24:56 +0000 (UTC)
From:      "Danilo G. Baio" <dbaio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r443915 - in head/security/masscan: . files
Message-ID:  <201706192324.v5JNOupL099913@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbaio
Date: Mon Jun 19 23:24:55 2017
New Revision: 443915
URL: https://svnweb.freebsd.org/changeset/ports/443915

Log:
  security/masscan: Update to 1.0.4
  
  Include a patch for build it in 10.3, 11 and CURRENT
  
  Changes: https://github.com/robertdavidgraham/masscan/releases/tag/1.0.4
  
  PR:		219886
  Submitted by:	taguchi.ch@gmail.com (maintainer)
  Approved by:	garga (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11260

Added:
  head/security/masscan/files/
  head/security/masscan/files/patch-src_smack1.c   (contents, props changed)
Modified:
  head/security/masscan/Makefile
  head/security/masscan/distinfo

Modified: head/security/masscan/Makefile
==============================================================================
--- head/security/masscan/Makefile	Mon Jun 19 22:45:58 2017	(r443914)
+++ head/security/masscan/Makefile	Mon Jun 19 23:24:55 2017	(r443915)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	masscan
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	security
 
 MAINTAINER=	taguchi.ch@gmail.com
@@ -21,10 +21,13 @@ MAKE_ARGS=	SYS=freebsd CC="${CC}" CFLAGS="${CFLAGS}"
 
 PLIST_FILES=	bin/masscan man/man8/masscan.8.gz
 
-pre-build:
-	@${REINPLACE_CMD} -e "s|SYS :=|SYS ?=|"\
-	-e "s|describe --tags|describe --tags 2> /dev/null|" ${WRKSRC}/Makefile
+.include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
+BUILD_DEPENDS+=	clang38:lang/clang38
+CC=	clang38
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/masscan ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/masscan.8 ${STAGEDIR}${MANPREFIX}/man/man8
@@ -32,4 +35,4 @@ do-install:
 regression-test: build
 	${WRKSRC}/bin/masscan --selftest
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/security/masscan/distinfo
==============================================================================
--- head/security/masscan/distinfo	Mon Jun 19 22:45:58 2017	(r443914)
+++ head/security/masscan/distinfo	Mon Jun 19 23:24:55 2017	(r443915)
@@ -1,2 +1,3 @@
-SHA256 (robertdavidgraham-masscan-1.0.3_GH0.tar.gz) = 331edd529df1904bcbcfb43029ced7e2dafe1744841e74cd9fc9f440b8301085
-SIZE (robertdavidgraham-masscan-1.0.3_GH0.tar.gz) = 333393
+TIMESTAMP = 1497024027
+SHA256 (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9
+SIZE (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 343513

Added: head/security/masscan/files/patch-src_smack1.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/masscan/files/patch-src_smack1.c	Mon Jun 19 23:24:55 2017	(r443915)
@@ -0,0 +1,11 @@
+--- src/smack1.c.orig	2017-06-06 03:59:39 UTC
++++ src/smack1.c
+@@ -115,6 +115,8 @@
+ #include "pixie-timer.h"
+ #if defined(_MSC_VER)
+ #include <intrin.h>
++#elif defined(__llvm__)
++#include <x86intrin.h>
+ #elif defined(__GNUC__)
+ static __inline__ unsigned long long __rdtsc(void)
+ {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706192324.v5JNOupL099913>