- update to 7.70

- add option for bundled libssh2
- add option for bundled libpcap
- add upstream patch for arp-ioctl.c
- change URL's from http to https

PR:		221522
Submitted by:	lightside

5 files changed, 46 insertions, 11 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index c74079161f3b..dd4f1eb8b194 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	7.60
+DISTVERSION=	7.70
 PORTREVISION=	0
 CATEGORIES=	security ipv6
-MASTER_SITES=	http://nmap.org/dist/ \
+MASTER_SITES=	https://nmap.org/dist/ \
 		LOCAL/ohauer
 
 MAINTAINER?=	ohauer@FreeBSD.org
 COMMENT?=	Port scanning utility for large networks
 
 # nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
-# http://nmap.org/book/man-legal.html
+# https://nmap.org/book/man-legal.html
 # Install the nmap modified license because of
 # http://insecure.org/news/download-com-fiasco.html
 LICENSE=	GPLv2
@@ -26,14 +26,21 @@ USES=		tar:bzip2 gmake cpe
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DOCS SSL
-OPTIONS_DEFAULT=SSL
+OPTIONS_DEFINE=	DOCS PCAP SSH2 SSL
+OPTIONS_DEFAULT=PCAP SSH2 SSL
 
+PCAP_DESC=		Build with libpcap from nmap
+SSH2_DESC=		SSH2 protocol support
+
+PCAP_CONFIGURE_ON=	--with-libpcap=included
+SSH2_CONFIGURE_ON=	--with-libssh2=included
+SSH2_CONFIGURE_OFF=	--without-libssh2
+SSH2_IMPLIES=		SSL
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_CONFIGURE_OFF=	--without-openssl
 SSL_CFLAGS=		-I${OPENSSLINC}
-SSL_VARS=		STRIP_FILES=ncat
+SSL_VARS=		STRIP_FILES+=ncat
 
 DOCS=	CHANGELOG HACKING
 STRIP_FILES+=	nmap nping
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index a1523573cf2a..f36fbb8e2136 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501622830
-SHA256 (nmap-7.60.tar.bz2) = a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21
-SIZE (nmap-7.60.tar.bz2) = 10394925
+TIMESTAMP = 1521565225
+SHA256 (nmap-7.70.tar.bz2) = 847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
+SIZE (nmap-7.70.tar.bz2) = 10467371
diff --git a/security/nmap/files/patch-libdnet-stripped_src_arp-ioctl.c b/security/nmap/files/patch-libdnet-stripped_src_arp-ioctl.c
new file mode 100644
index 000000000000..19ffb7f037d0
--- /dev/null
+++ b/security/nmap/files/patch-libdnet-stripped_src_arp-ioctl.c
@@ -0,0 +1,14 @@
+# Use correct width in sscanf. Fixes #1156
+# https://github.com/nmap/nmap/commit/36a6d897a584013d25e51ac339fe45ffc45df9df
+
+--- libdnet-stripped/src/arp-ioctl.c.orig	2008-09-19 06:12:25 UTC
++++ libdnet-stripped/src/arp-ioctl.c
+@@ -218,7 +218,7 @@ arp_loop(arp_t *a, arp_handler callback,
+ 
+ 	ret = 0;
+ 	while (fgets(buf, sizeof(buf), fp) != NULL) {
+-		i = sscanf(buf, "%s 0x%x 0x%x %100s %100s %100s\n",
++		i = sscanf(buf, "%s 0x%x 0x%x %99s %99s %99s\n",
+ 		    ipbuf, &type, &flags, macbuf, maskbuf, devbuf);
+ 		
+ 		if (i < 4 || (flags & ATF_COM) == 0)
diff --git a/security/nmap/pkg-descr b/security/nmap/pkg-descr
index 2b15c25d8226..5b803d06c576 100644
--- a/security/nmap/pkg-descr
+++ b/security/nmap/pkg-descr
@@ -12,7 +12,7 @@ Refer to the separate port security/zenmap for those parts of the
 Nmap toolset which depend on python.  The translated manual pages
 for Nmap are contained in security/nmap-i18n-man.
 
-WWW: http://nmap.org/
+WWW: https://nmap.org/
 
 See the web page and the Phrack Magazine article (Volume 7, Issue 51
-September 01, 1997, article 11 of 17) http://nmap.org/p51-11.html
+September 01, 1997, article 11 of 17) https://nmap.org/p51-11.html
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 9e683fa0a8d0..6c4f53e65fa5 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -62,6 +62,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/data/http-folders.txt
 %%DATADIR%%/nselib/data/http-sql-errors.lst
 %%DATADIR%%/nselib/data/http-web-files-extensions.lst
+%%DATADIR%%/nselib/data/idnaMappings.lua
 %%DATADIR%%/nselib/data/ike-fingerprints.lua
 %%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.class
 %%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.java
@@ -114,6 +115,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/http.lua
 %%DATADIR%%/nselib/httpspider.lua
 %%DATADIR%%/nselib/iax2.lua
+%%DATADIR%%/nselib/idna.lua
 %%DATADIR%%/nselib/ike.lua
 %%DATADIR%%/nselib/imap.lua
 %%DATADIR%%/nselib/informix.lua
@@ -145,6 +147,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/multicast.lua
 %%DATADIR%%/nselib/mysql.lua
 %%DATADIR%%/nselib/natpmp.lua
+%%DATADIR%%/nselib/nbd.lua
 %%DATADIR%%/nselib/ncp.lua
 %%DATADIR%%/nselib/ndmp.lua
 %%DATADIR%%/nselib/netbios.lua
@@ -160,6 +163,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/pop3.lua
 %%DATADIR%%/nselib/pppoe.lua
 %%DATADIR%%/nselib/proxy.lua
+%%DATADIR%%/nselib/punycode.lua
 %%DATADIR%%/nselib/rdp.lua
 %%DATADIR%%/nselib/re.lua
 %%DATADIR%%/nselib/redis.lua
@@ -205,6 +209,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/wsdd.lua
 %%DATADIR%%/nselib/xdmcp.lua
 %%DATADIR%%/nselib/xmpp.lua
+%%DATADIR%%/nselib/zlib.luadoc
 %%DATADIR%%/scripts/acarsd-info.nse
 %%DATADIR%%/scripts/address-info.nse
 %%DATADIR%%/scripts/afp-brute.nse
@@ -288,6 +293,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/daap-get-library.nse
 %%DATADIR%%/scripts/daytime.nse
 %%DATADIR%%/scripts/db2-das-info.nse
+%%DATADIR%%/scripts/deluge-rpc-brute.nse
 %%DATADIR%%/scripts/dhcp-discover.nse
 %%DATADIR%%/scripts/dict-info.nse
 %%DATADIR%%/scripts/distcc-cve2004-2687.nse
@@ -352,6 +358,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/hddtemp-info.nse
 %%DATADIR%%/scripts/hnap-info.nse
 %%DATADIR%%/scripts/hostmap-bfk.nse
+%%DATADIR%%/scripts/hostmap-crtsh.nse
 %%DATADIR%%/scripts/hostmap-ip2hosts.nse
 %%DATADIR%%/scripts/hostmap-robtex.nse
 %%DATADIR%%/scripts/http-adobe-coldfusion-apsa1301.nse
@@ -366,6 +373,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-axis2-dir-traversal.nse
 %%DATADIR%%/scripts/http-backup-finder.nse
 %%DATADIR%%/scripts/http-barracuda-dir-traversal.nse
+%%DATADIR%%/scripts/http-bigip-cookie.nse
 %%DATADIR%%/scripts/http-brute.nse
 %%DATADIR%%/scripts/http-cakephp-version.nse
 %%DATADIR%%/scripts/http-chrono.nse
@@ -408,6 +416,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-iis-webdav-vuln.nse
 %%DATADIR%%/scripts/http-internal-ip-disclosure.nse
 %%DATADIR%%/scripts/http-joomla-brute.nse
+%%DATADIR%%/scripts/http-jsonp-detection.nse
 %%DATADIR%%/scripts/http-litespeed-sourcecode-download.nse
 %%DATADIR%%/scripts/http-ls.nse
 %%DATADIR%%/scripts/http-majordomo2-dir-traversal.nse
@@ -445,6 +454,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-tplink-dir-traversal.nse
 %%DATADIR%%/scripts/http-trace.nse
 %%DATADIR%%/scripts/http-traceroute.nse
+%%DATADIR%%/scripts/http-trane-info.nse
 %%DATADIR%%/scripts/http-unsafe-output-escaping.nse
 %%DATADIR%%/scripts/http-useragent-tester.nse
 %%DATADIR%%/scripts/http-userdir-enum.nse
@@ -576,6 +586,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/mysql-vuln-cve2012-2122.nse
 %%DATADIR%%/scripts/nat-pmp-info.nse
 %%DATADIR%%/scripts/nat-pmp-mapport.nse
+%%DATADIR%%/scripts/nbd-info.nse
 %%DATADIR%%/scripts/nbstat.nse
 %%DATADIR%%/scripts/ncp-enum-users.nse
 %%DATADIR%%/scripts/ncp-serverinfo.nse
@@ -643,6 +654,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/rpcap-brute.nse
 %%DATADIR%%/scripts/rpcap-info.nse
 %%DATADIR%%/scripts/rpcinfo.nse
+%%DATADIR%%/scripts/rsa-vuln-roca.nse
 %%DATADIR%%/scripts/rsync-brute.nse
 %%DATADIR%%/scripts/rsync-list-modules.nse
 %%DATADIR%%/scripts/rtsp-methods.nse
@@ -663,6 +675,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/smb-enum-domains.nse
 %%DATADIR%%/scripts/smb-enum-groups.nse
 %%DATADIR%%/scripts/smb-enum-processes.nse
+%%DATADIR%%/scripts/smb-enum-services.nse
 %%DATADIR%%/scripts/smb-enum-sessions.nse
 %%DATADIR%%/scripts/smb-enum-shares.nse
 %%DATADIR%%/scripts/smb-enum-users.nse
@@ -754,6 +767,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/telnet-encryption.nse
 %%DATADIR%%/scripts/telnet-ntlm-info.nse
 %%DATADIR%%/scripts/tftp-enum.nse
+%%DATADIR%%/scripts/tls-alpn.nse
 %%DATADIR%%/scripts/tls-nextprotoneg.nse
 %%DATADIR%%/scripts/tls-ticketbleed.nse
 %%DATADIR%%/scripts/tn3270-screen.nse