Changes 7.00:

* Major Nmap Scripting Engine (NSE) Expansion
* Mature IPv6 support
* Infrastructure Upgrades
* Faster Scans
* SSL/TLS scanning solution of choice
* Ncat Enhanced
* Extreme Portability

8 files changed, 113 insertions, 46 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 074670a4c4a..18dfa459b93 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.124 2015/04/25 14:23:47 tnn Exp $
+# $NetBSD: Makefile,v 1.125 2015/11/20 15:37:40 adam Exp $
 
-DISTNAME=	nmap-6.47
-PKGREVISION=	2
+DISTNAME=	nmap-7.00
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +18,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-liblinear=${BUILDLINK_PREFIX.liblinear}
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-libpcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
@@ -35,6 +35,7 @@ CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/oracle-sids
 CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/passwords.lst
 CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/rtsp-urls.txt
 CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/snmpcommunities.lst
+CHECK_PORTABILITY_SKIP+=	libpcap/configure
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -58,6 +59,7 @@ pre-build:
 .endif
 
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../math/liblinear/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 #.include "../../devel/subversion-base/buildlink3.mk"
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index bd00407e046..b02c02433a5 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2015/04/09 17:01:31 abs Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/11/20 15:37:40 adam Exp $
 bin/ncat
 ${PLIST.ndiff}bin/ndiff
 bin/nmap
@@ -248,6 +248,66 @@ share/nmap/nmap-service-probes
 share/nmap/nmap-services
 share/nmap/nmap.dtd
 share/nmap/nmap.xsl
+${PLIST.lua}share/nmap/nselib/anyconnect.lua
+${PLIST.lua}share/nmap/nselib/data/drupal-themes.lst
+${PLIST.lua}share/nmap/nselib/data/enterprise_numbers.txt
+${PLIST.lua}share/nmap/nselib/data/targets-ipv6-wordlist
+${PLIST.lua}share/nmap/nselib/data/wp-themes.lst
+${PLIST.lua}share/nmap/nselib/lpeg-utility.lua
+${PLIST.lua}share/nmap/nselib/ls.lua
+${PLIST.lua}share/nmap/nselib/re.lua
+${PLIST.lua}share/nmap/nselib/slaxml.lua
+${PLIST.lua}share/nmap/scripts/bacnet-info.nse
+${PLIST.lua}share/nmap/scripts/broadcast-sonicwall-discover.nse
+${PLIST.lua}share/nmap/scripts/docker-version.nse
+${PLIST.lua}share/nmap/scripts/enip-info.nse
+${PLIST.lua}share/nmap/scripts/fcrdns.nse
+${PLIST.lua}share/nmap/scripts/hnap-info.nse
+${PLIST.lua}share/nmap/scripts/http-avaya-ipoffice-users.nse
+${PLIST.lua}share/nmap/scripts/http-cisco-anyconnect.nse
+${PLIST.lua}share/nmap/scripts/http-cross-domain-policy.nse
+${PLIST.lua}share/nmap/scripts/http-drupal-enum.nse
+${PLIST.lua}share/nmap/scripts/http-fetch.nse
+${PLIST.lua}share/nmap/scripts/http-ls.nse
+${PLIST.lua}share/nmap/scripts/http-shellshock.nse
+${PLIST.lua}share/nmap/scripts/http-svn-enum.nse
+${PLIST.lua}share/nmap/scripts/http-svn-info.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2006-3392.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2013-7091.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2126.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2127.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2128.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2129.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-8877.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2015-1427.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2015-1635.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-misfortune-cookie.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-wnr1000-creds.nse
+${PLIST.lua}share/nmap/scripts/http-webdav-scan.nse
+${PLIST.lua}share/nmap/scripts/http-wordpress-users.nse
+${PLIST.lua}share/nmap/scripts/ip-https-discover.nse
+${PLIST.lua}share/nmap/scripts/knx-gateway-discover.nse
+${PLIST.lua}share/nmap/scripts/knx-gateway-info.nse
+${PLIST.lua}share/nmap/scripts/mikrotik-routeros-brute.nse
+${PLIST.lua}share/nmap/scripts/nje-node-brute.nse
+${PLIST.lua}share/nmap/scripts/omron-info.nse
+${PLIST.lua}share/nmap/scripts/s7-info.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-conficker.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-cve2009-3103.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-ms06-025.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-ms07-029.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-ms08-067.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-regsvc-dos.nse
+${PLIST.lua}share/nmap/scripts/snmp-info.nse
+${PLIST.lua}share/nmap/scripts/ssl-ccs-injection.nse
+${PLIST.lua}share/nmap/scripts/ssl-dh-params.nse
+${PLIST.lua}share/nmap/scripts/ssl-poodle.nse
+${PLIST.lua}share/nmap/scripts/supermicro-ipmi-conf.nse
+${PLIST.lua}share/nmap/scripts/targets-ipv6-map4to6.nse
+${PLIST.lua}share/nmap/scripts/targets-ipv6-wordlist.nse
+${PLIST.lua}share/nmap/scripts/targets-xml.nse
+${PLIST.lua}share/nmap/scripts/tor-consensus-checker.nse
+${PLIST.lua}share/nmap/scripts/xmlrpc-methods.nse
 ${PLIST.lua}share/nmap/nse_main.lua
 ${PLIST.lua}share/nmap/nselib/afp.lua
 ${PLIST.lua}share/nmap/nselib/ajp.lua
@@ -300,7 +360,6 @@ ${PLIST.lua}share/nmap/nselib/data/psexec/nmap_service.vcproj
 ${PLIST.lua}share/nmap/nselib/data/psexec/pwdump.lua
 ${PLIST.lua}share/nmap/nselib/data/rtsp-urls.txt
 ${PLIST.lua}share/nmap/nselib/data/snmpcommunities.lst
-${PLIST.lua}share/nmap/nselib/data/ssl-ciphers
 ${PLIST.lua}share/nmap/nselib/data/ssl-fingerprints
 ${PLIST.lua}share/nmap/nselib/data/tftplist.txt
 ${PLIST.lua}share/nmap/nselib/data/usernames.lst
@@ -473,7 +532,6 @@ ${PLIST.lua}share/nmap/scripts/cvs-brute.nse
 ${PLIST.lua}share/nmap/scripts/daap-get-library.nse
 ${PLIST.lua}share/nmap/scripts/daytime.nse
 ${PLIST.lua}share/nmap/scripts/db2-das-info.nse
-${PLIST.lua}share/nmap/scripts/db2-discover.nse
 ${PLIST.lua}share/nmap/scripts/dhcp-discover.nse
 ${PLIST.lua}share/nmap/scripts/dict-info.nse
 ${PLIST.lua}share/nmap/scripts/distcc-cve2004-2687.nse
@@ -557,8 +615,6 @@ ${PLIST.lua}share/nmap/scripts/http-dlink-backdoor.nse
 ${PLIST.lua}share/nmap/scripts/http-dombased-xss.nse
 ${PLIST.lua}share/nmap/scripts/http-domino-enum-passwords.nse
 ${PLIST.lua}share/nmap/scripts/http-drupal-enum-users.nse
-${PLIST.lua}share/nmap/scripts/http-drupal-modules.nse
-${PLIST.lua}share/nmap/scripts/http-email-harvest.nse
 ${PLIST.lua}share/nmap/scripts/http-enum.nse
 ${PLIST.lua}share/nmap/scripts/http-errors.nse
 ${PLIST.lua}share/nmap/scripts/http-exif-spider.nse
@@ -625,12 +681,10 @@ ${PLIST.lua}share/nmap/scripts/http-vuln-cve2011-3192.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2011-3368.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2012-1823.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2013-0156.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-zimbra-lfi.nse
 ${PLIST.lua}share/nmap/scripts/http-waf-detect.nse
 ${PLIST.lua}share/nmap/scripts/http-waf-fingerprint.nse
 ${PLIST.lua}share/nmap/scripts/http-wordpress-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-wordpress-enum.nse
-${PLIST.lua}share/nmap/scripts/http-wordpress-plugins.nse
 ${PLIST.lua}share/nmap/scripts/http-xssed.nse
 ${PLIST.lua}share/nmap/scripts/iax2-brute.nse
 ${PLIST.lua}share/nmap/scripts/iax2-version.nse
@@ -781,7 +835,6 @@ ${PLIST.lua}share/nmap/scripts/sip-enum-users.nse
 ${PLIST.lua}share/nmap/scripts/sip-methods.nse
 ${PLIST.lua}share/nmap/scripts/skypev2-version.nse
 ${PLIST.lua}share/nmap/scripts/smb-brute.nse
-${PLIST.lua}share/nmap/scripts/smb-check-vulns.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-domains.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-groups.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-processes.nse
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 14196dc9326..9e99c9353ea 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.64 2015/11/04 00:35:16 agc Exp $
+$NetBSD: distinfo,v 1.65 2015/11/20 15:37:40 adam Exp $
 
-SHA1 (nmap-6.47.tar.bz2) = 0c917453a91a5e85c2a217d27c3853b0f3e0e6ac
-RMD160 (nmap-6.47.tar.bz2) = 20c4023935e53fbceb2ef33205cb301fb29bd0b2
-SHA512 (nmap-6.47.tar.bz2) = f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296
-Size (nmap-6.47.tar.bz2) = 7878122 bytes
-SHA1 (patch-ab) = 442683349642a665e7d0a90bc581b971919ead8b
-SHA1 (patch-ac) = 807ace5f25bb9fd07ca4947a9debbb390fa80403
+SHA1 (nmap-7.00.tar.bz2) = cf04e64632e44a972cf894379cb5205c79c45fe8
+RMD160 (nmap-7.00.tar.bz2) = 3155f0f0488e678db9755b3e35e52093774809e4
+SHA512 (nmap-7.00.tar.bz2) = f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351
+Size (nmap-7.00.tar.bz2) = 8918906 bytes
+SHA1 (patch-configure) = 5fc39f084eadd6ea0560cd8e6f52074113566600
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
+SHA1 (patch-ndiff_setup.py) = 4e4af27cb896fd1bffc2c9089f930d7075daeb22
diff --git a/net/nmap/options.mk b/net/nmap/options.mk
index 72e0244ecc8..436e72b1536 100644
--- a/net/nmap/options.mk
+++ b/net/nmap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2014/05/09 07:37:14 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2015/11/20 15:37:40 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nmap
 
@@ -21,7 +21,7 @@ PLIST.ndiff=		yes
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	ndiff/setup.py
-SUBST_SED.paths=	-e "s|@@PKGMANDIR@@|${PKGMANDIR}|g"
+SUBST_VARS.paths=	PKGMANDIR
 SUBST_MESSAGE.paths=	Fixing paths.
 .include "../../lang/python/application.mk"
 .else
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--without-zenmap
 
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-liblua=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-liblua=${BUILDLINK_PREFIX.lua}
 PLIST.lua=		yes
 .else
 CONFIGURE_ARGS+=	--without-liblua
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
deleted file mode 100644
index 6bcefea18f1..00000000000
--- a/net/nmap/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.20 2014/06/07 23:12:16 rodent Exp $
-
---- configure.orig	2013-05-13 04:21:11.000000000 +0000
-+++ configure
-@@ -6322,6 +6322,7 @@ else
- extern char pcap_version[];
- int main() {
-   int major, minor1, minor2;
-+  exit(0);	/* fool it */
-   sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
-   if (major > 0)
-     return 0;
diff --git a/net/nmap/patches/patch-ac b/net/nmap/patches/patch-ac
deleted file mode 100644
index 12e2fbfb1ef..00000000000
--- a/net/nmap/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2014/09/05 11:51:41 adam Exp $
-
-Use PKGMANDIR.
-
---- ndiff/setup.py.orig	2014-04-12 01:24:32.000000000 +0000
-+++ ndiff/setup.py
-@@ -112,5 +112,5 @@ Installing your distribution's python-de
- 
- distutils.core.setup(name=u"ndiff", scripts=[u"scripts/ndiff"],
-     py_modules=[u"ndiff"],
--    data_files=[(u"share/man/man1", [u"docs/ndiff.1"])],
-+    data_files=[(u"@@PKGMANDIR@@/man1", [u"docs/ndiff.1"])],
-     cmdclass={"install_egg_info": null_command, "install": checked_install})
diff --git a/net/nmap/patches/patch-configure b/net/nmap/patches/patch-configure
new file mode 100644
index 00000000000..526627f4464
--- /dev/null
+++ b/net/nmap/patches/patch-configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2015/11/20 15:37:40 adam Exp $
+
+External liblinear must be configured later.
+
+--- configure.orig	2015-11-10 04:26:26.000000000 +0000
++++ configure
+@@ -6192,6 +6192,7 @@ else
+ extern char pcap_version[];
+ int main() {
+   int major, minor1, minor2;
++  exit(0);	/* fool it */
+   sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
+   if (major > 0)
+     return 0;
+@@ -6894,7 +6895,6 @@ if test "${with_liblinear+set}" = set; t
+   *)
+     CPPFLAGS="-I$with_liblinear/include $CPPFLAGS"
+     LDFLAGS="-L$with_liblinear/lib $LDFLAGS"
+-    have_liblinear=yes
+   ;;
+   esac
+ 
diff --git a/net/nmap/patches/patch-ndiff_setup.py b/net/nmap/patches/patch-ndiff_setup.py
new file mode 100644
index 00000000000..4c501574e2e
--- /dev/null
+++ b/net/nmap/patches/patch-ndiff_setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-ndiff_setup.py,v 1.1 2015/11/20 15:37:40 adam Exp $
+
+Use PKGMANDIR.
+
+--- ndiff/setup.py.orig	2015-09-20 04:16:36.000000000 +0000
++++ ndiff/setup.py
+@@ -309,7 +309,7 @@ class my_uninstall(distutils.cmd.Command
+ 
+ distutils.core.setup(name=u"ndiff", scripts=[u"scripts/ndiff"],
+     py_modules=[u"ndiff"],
+-    data_files=[(u"share/man/man1", [u"docs/ndiff.1"])],
++    data_files=[(u"@PKGMANDIR@/man1", [u"docs/ndiff.1"])],
+     cmdclass={
+         "install_egg_info": null_command,
+         "install": checked_install,