- upate to version 7.10

- remove support for custom IPv4 only kernel [1]

Short summary:
- 12 new NSE scripts
- hundreds of new OS/version fingerprints
- dozens if smaller improvements and bug fixes

Full Changelog:
 https://nmap.org/changelog.html

[1] nmap does no longer build agains custom kernel without IPv6!

8 files changed, 30 insertions, 19 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index a1a0b45..978e95d 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	7.01
+DISTVERSION=	7.10
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
@@ -22,9 +22,10 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 USES=		tar:bzip2 gmake cpe
 GNU_CONFIGURE=	yes
 
+# Note: nmap does no longer build agains custom kernel without IPv6!
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DOCS IPV6 SSL
-OPTIONS_DEFAULT=IPV6 SSL
+OPTIONS_DEFINE=	DOCS SSL
+OPTIONS_DEFAULT=SSL
 
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
@@ -32,10 +33,6 @@ SSL_CONFIGURE_OFF=	--without-openssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 SSL_VARS=		STRIP_FILES=ncat
 
-# PR: ports/159376  Workaround if OS is build with WITHOUT_INET6
-IPV6_LIB_DEPENDS_OFF=	libpcap.so:${PORTSDIR}/net/libpcap
-IPV6_CONFIGURE_OFF=	--with-libpcap=${LOCALBASE}/IPv6
-
 .include <bsd.port.options.mk>
 
 DOCS=	CHANGELOG HACKING
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 9ab18f6..5bc58ad 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-7.01.tar.bz2) = cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705
-SIZE (nmap-7.01.tar.bz2) = 8922697
+SHA256 (nmap-7.10.tar.bz2) = 58cf8896d09057d1c3533f430c06b22791d0227ebbb93dede2ccb73693ed4b4b
+SIZE (nmap-7.10.tar.bz2) = 8947277
diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index 6f27f5d..cecd067 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2015-06-25 13:01:27 UTC
+--- Makefile.in.orig	2015-12-04 13:03:01 UTC
 +++ Makefile.in
 @@ -13,7 +13,7 @@ mandir = @mandir@
  top_srcdir = @top_srcdir@
diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure
index 2bb31bc..a447085 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-06-16 13:47:16 UTC
+--- configure.orig	2016-01-07 05:45:47 UTC
 +++ configure
-@@ -2545,7 +2545,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2546,7 +2546,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
@@ -9,7 +9,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_prog_CC+:} false; then :
-@@ -3378,7 +3378,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -3379,7 +3379,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
diff --git a/security/nmap/files/patch-nmap.cc b/security/nmap/files/patch-nmap.cc
index a4168eb..823152a 100644
--- a/security/nmap/files/patch-nmap.cc
+++ b/security/nmap/files/patch-nmap.cc
@@ -1,8 +1,8 @@
---- nmap.cc.orig	2015-09-21 13:49:51 UTC
+--- nmap.cc.orig	2016-03-14 23:54:51 UTC
 +++ nmap.cc
 @@ -123,6 +123,7 @@
  
- /* $Id: nmap.cc 35268 2015-09-21 13:49:51Z dmiller $ */
+ /* $Id: nmap.cc 35683 2016-03-14 23:54:51Z dmiller $ */
  
 +#include <getopt.h>
  #include "nmap.h"
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index 2ad25a6..4c81bba 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -1,6 +1,6 @@
---- output.cc.orig	2015-06-16 13:59:33 UTC
+--- output.cc.orig	2016-01-13 20:53:39 UTC
 +++ output.cc
-@@ -146,6 +146,7 @@
+@@ -148,6 +148,7 @@
  #include <set>
  #include <vector>
  #include <list>
diff --git a/security/nmap/files/patch-tcpip.cc b/security/nmap/files/patch-tcpip.cc
index 3357b07..4aab376 100644
--- a/security/nmap/files/patch-tcpip.cc
+++ b/security/nmap/files/patch-tcpip.cc
@@ -1,6 +1,6 @@
---- tcpip.cc.orig	2015-06-16 13:59:33 UTC
+--- tcpip.cc.orig	2015-06-30 18:34:28 UTC
 +++ tcpip.cc
-@@ -154,6 +154,8 @@
+@@ -144,6 +144,8 @@
  #endif /* NETINET_IF_ETHER_H */
  #endif /* HAVE_NETINET_IF_ETHER_H */
  
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 03fd1d6..33319fd 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -122,6 +122,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/lfs.luadoc
 %%DATADIR%%/nselib/listop.lua
 %%DATADIR%%/nselib/lpeg-utility.lua
+%%DATADIR%%/nselib/lpeg.luadoc
 %%DATADIR%%/nselib/ls.lua
 %%DATADIR%%/nselib/match.lua
 %%DATADIR%%/nselib/membase.lua
@@ -131,6 +132,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/msrpcperformance.lua
 %%DATADIR%%/nselib/msrpctypes.lua
 %%DATADIR%%/nselib/mssql.lua
+%%DATADIR%%/nselib/multicast.lua
 %%DATADIR%%/nselib/mysql.lua
 %%DATADIR%%/nselib/natpmp.lua
 %%DATADIR%%/nselib/ncp.lua
@@ -331,6 +333,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-adobe-coldfusion-apsa1301.nse
 %%DATADIR%%/scripts/http-affiliate-id.nse
 %%DATADIR%%/scripts/http-apache-negotiation.nse
+%%DATADIR%%/scripts/http-apache-server-status.nse
 %%DATADIR%%/scripts/http-auth-finder.nse
 %%DATADIR%%/scripts/http-auth.nse
 %%DATADIR%%/scripts/http-avaya-ipoffice-users.nse
@@ -428,11 +431,13 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-vuln-cve2011-3368.nse
 %%DATADIR%%/scripts/http-vuln-cve2012-1823.nse
 %%DATADIR%%/scripts/http-vuln-cve2013-0156.nse
+%%DATADIR%%/scripts/http-vuln-cve2013-6786.nse
 %%DATADIR%%/scripts/http-vuln-cve2013-7091.nse
 %%DATADIR%%/scripts/http-vuln-cve2014-2126.nse
 %%DATADIR%%/scripts/http-vuln-cve2014-2127.nse
 %%DATADIR%%/scripts/http-vuln-cve2014-2128.nse
 %%DATADIR%%/scripts/http-vuln-cve2014-2129.nse
+%%DATADIR%%/scripts/http-vuln-cve2014-3704.nse
 %%DATADIR%%/scripts/http-vuln-cve2014-8877.nse
 %%DATADIR%%/scripts/http-vuln-cve2015-1427.nse
 %%DATADIR%%/scripts/http-vuln-cve2015-1635.nse
@@ -451,6 +456,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/ike-version.nse
 %%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
+%%DATADIR%%/scripts/imap-ntlm-info.nse
 %%DATADIR%%/scripts/informix-brute.nse
 %%DATADIR%%/scripts/informix-query.nse
 %%DATADIR%%/scripts/informix-tables.nse
@@ -461,6 +467,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/ip-geolocation-maxmind.nse
 %%DATADIR%%/scripts/ip-https-discover.nse
 %%DATADIR%%/scripts/ipidseq.nse
+%%DATADIR%%/scripts/ipv6-multicast-mld-list.nse
 %%DATADIR%%/scripts/ipv6-node-info.nse
 %%DATADIR%%/scripts/ipv6-ra-flood.nse
 %%DATADIR%%/scripts/irc-botnet-channels.nse
@@ -508,6 +515,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/ms-sql-empty-password.nse
 %%DATADIR%%/scripts/ms-sql-hasdbaccess.nse
 %%DATADIR%%/scripts/ms-sql-info.nse
+%%DATADIR%%/scripts/ms-sql-ntlm-info.nse
 %%DATADIR%%/scripts/ms-sql-query.nse
 %%DATADIR%%/scripts/ms-sql-tables.nse
 %%DATADIR%%/scripts/ms-sql-xp-cmdshell.nse
@@ -543,6 +551,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/nfs-showmount.nse
 %%DATADIR%%/scripts/nfs-statfs.nse
 %%DATADIR%%/scripts/nje-node-brute.nse
+%%DATADIR%%/scripts/nntp-ntlm-info.nse
 %%DATADIR%%/scripts/nping-brute.nse
 %%DATADIR%%/scripts/nrpe-enum.nse
 %%DATADIR%%/scripts/ntp-info.nse
@@ -564,6 +573,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/pjl-ready-message.nse
 %%DATADIR%%/scripts/pop3-brute.nse
 %%DATADIR%%/scripts/pop3-capabilities.nse
+%%DATADIR%%/scripts/pop3-ntlm-info.nse
 %%DATADIR%%/scripts/pptp-version.nse
 %%DATADIR%%/scripts/qconn-exec.nse
 %%DATADIR%%/scripts/qscan.nse
@@ -591,10 +601,12 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/rsync-list-modules.nse
 %%DATADIR%%/scripts/rtsp-methods.nse
 %%DATADIR%%/scripts/rtsp-url-brute.nse
+%%DATADIR%%/scripts/rusers.nse
 %%DATADIR%%/scripts/s7-info.nse
 %%DATADIR%%/scripts/samba-vuln-cve-2012-1182.nse
 %%DATADIR%%/scripts/script.db
 %%DATADIR%%/scripts/servicetags.nse
+%%DATADIR%%/scripts/shodan-api.nse
 %%DATADIR%%/scripts/sip-brute.nse
 %%DATADIR%%/scripts/sip-call-spoof.nse
 %%DATADIR%%/scripts/sip-enum-users.nse
@@ -628,6 +640,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/smtp-brute.nse
 %%DATADIR%%/scripts/smtp-commands.nse
 %%DATADIR%%/scripts/smtp-enum-users.nse
+%%DATADIR%%/scripts/smtp-ntlm-info.nse
 %%DATADIR%%/scripts/smtp-open-relay.nse
 %%DATADIR%%/scripts/smtp-strangeport.nse
 %%DATADIR%%/scripts/smtp-vuln-cve2010-4344.nse
@@ -681,6 +694,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/teamspeak2-version.nse
 %%DATADIR%%/scripts/telnet-brute.nse
 %%DATADIR%%/scripts/telnet-encryption.nse
+%%DATADIR%%/scripts/telnet-ntlm-info.nse
 %%DATADIR%%/scripts/tftp-enum.nse
 %%DATADIR%%/scripts/tls-nextprotoneg.nse
 %%DATADIR%%/scripts/tor-consensus-checker.nse