15 files changed, 83 insertions, 52 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 17d813f284e4..c74079161f3b 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	7.40
-PORTREVISION=	1
+DISTVERSION=	7.60
+PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index e1fc288ae898..a1523573cf2a 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482248215
-SHA256 (nmap-7.40.tar.bz2) = 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188
-SIZE (nmap-7.40.tar.bz2) = 9043221
+TIMESTAMP = 1501622830
+SHA256 (nmap-7.60.tar.bz2) = a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21
+SIZE (nmap-7.60.tar.bz2) = 10394925
diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index cecd0670596b..17cf6b16ebfd 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2015-12-04 13:03:01 UTC
+--- Makefile.in.orig	2017-07-31 20:56:53 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 a4470856ba6d..8ef57a7f7fff 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-01-07 05:45:47 UTC
+--- configure.orig	2017-07-31 19:09:47 UTC
 +++ configure
-@@ -2546,7 +2546,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2583,7 +2583,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 :
-@@ -3379,7 +3379,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -3416,7 +3416,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-libdnet-stripped__configure b/security/nmap/files/patch-libdnet-stripped__configure
deleted file mode 100644
index 0d381c5cacce..000000000000
--- a/security/nmap/files/patch-libdnet-stripped__configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- libdnet-stripped/configure.orig	2011-09-28 06:55:47 UTC
-+++ libdnet-stripped/configure
-@@ -14344,11 +14344,8 @@ $as_echo_n "checking for Berkeley Packet
-     if test "${ac_cv_dnet_bsd_bpf+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  if test -c /dev/bpf0 ; then
--	    ac_cv_dnet_bsd_bpf=yes
--	else
--	    ac_cv_dnet_bsd_bpf=no
--	fi
-+# PR ports/154353 : support building in FreeBSD jail
-+    ac_cv_dnet_bsd_bpf=yes
- fi
- 
-     { $as_echo "$as_me:$LINENO: result: $ac_cv_dnet_bsd_bpf" >&5
diff --git a/security/nmap/files/patch-libdnet-stripped_configure b/security/nmap/files/patch-libdnet-stripped_configure
new file mode 100644
index 000000000000..2f8357e7c87d
--- /dev/null
+++ b/security/nmap/files/patch-libdnet-stripped_configure
@@ -0,0 +1,26 @@
+--- libdnet-stripped/configure.orig	2017-02-13 19:46:23 UTC
++++ libdnet-stripped/configure
+@@ -733,6 +733,9 @@ ac_includes_default="\
+ #ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+@@ -11716,11 +11719,8 @@ $as_echo_n "checking for Berkeley Packet
+     if test "${ac_cv_dnet_bsd_bpf+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -c /dev/bpf0 ; then
+-	    ac_cv_dnet_bsd_bpf=yes
+-	else
+-	    ac_cv_dnet_bsd_bpf=no
+-	fi
++# PR ports/154353 : support building in FreeBSD jail
++    ac_cv_dnet_bsd_bpf=yes
+ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5
diff --git a/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c b/security/nmap/files/patch-libdnet-stripped_src_eth-bsd.c
index 24d538b095f8..24d538b095f8 100644
--- a/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c
+++ b/security/nmap/files/patch-libdnet-stripped_src_eth-bsd.c
diff --git a/security/nmap/files/patch-intf.c b/security/nmap/files/patch-libdnet-stripped_src_intf.c
index b00c4a17e91e..188374dfaaee 100644
--- a/security/nmap/files/patch-intf.c
+++ b/security/nmap/files/patch-libdnet-stripped_src_intf.c
@@ -1,5 +1,5 @@
---- libdnet-stripped/src/intf.c.orig	2017-03-05 16:19:13.768984000 +0700
-+++ libdnet-stripped/src/intf.c	2017-03-05 16:16:48.337379000 +0700
+--- libdnet-stripped/src/intf.c.orig	2016-07-27 20:11:27 UTC
++++ libdnet-stripped/src/intf.c
 @@ -163,7 +163,7 @@ intf_open(void)
  #if defined(SIOCGLIFCONF) || defined(SIOCGIFNETMASK_IN6) || defined(SIOCGIFNETMASK6)
  		if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
diff --git a/security/nmap/files/patch-liblua__Makefile b/security/nmap/files/patch-liblua_Makefile
index 647f655b714b..647f655b714b 100644
--- a/security/nmap/files/patch-liblua__Makefile
+++ b/security/nmap/files/patch-liblua_Makefile
diff --git a/security/nmap/files/patch-liblua__liolib.c b/security/nmap/files/patch-liblua_liolib.c
index b62f4ae63ad5..800fbbebfe87 100644
--- a/security/nmap/files/patch-liblua__liolib.c
+++ b/security/nmap/files/patch-liblua_liolib.c
@@ -1,10 +1,10 @@
---- liblua/liolib.c.orig	2014-01-02 15:33:55 UTC
+--- liblua/liolib.c.orig	2016-07-02 17:02:27 UTC
 +++ liblua/liolib.c
-@@ -19,6 +19,7 @@
+@@ -16,6 +16,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#include <unistd.h>
  
- #define liolib_c
- #define LUA_LIB
+ #include "lua.h"
+ 
diff --git a/security/nmap/files/patch-ncat_test_test-wildcard.c b/security/nmap/files/patch-ncat_test_test-wildcard.c
deleted file mode 100644
index 517575df7d7a..000000000000
--- a/security/nmap/files/patch-ncat_test_test-wildcard.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ncat/test/test-wildcard.c.orig	2016-08-01 09:34:56 UTC
-+++ ncat/test/test-wildcard.c
-@@ -253,7 +253,7 @@ static int set_dNSNames(X509 *cert, cons
-         if (gen_name == NULL)
-             goto stack_err;
-         gen_name->type = GEN_DNS;
--    #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         gen_name->d.dNSName = M_ASN1_IA5STRING_new();
-     #else
-         gen_name->d.dNSName = ASN1_IA5STRING_new();
diff --git a/security/nmap/files/patch-nmap.cc b/security/nmap/files/patch-nmap.cc
index 823152a1d23d..0db38d88f60f 100644
--- a/security/nmap/files/patch-nmap.cc
+++ b/security/nmap/files/patch-nmap.cc
@@ -1,10 +1,10 @@
---- nmap.cc.orig	2016-03-14 23:54:51 UTC
+--- nmap.cc.orig	2017-07-31 16:56:48 UTC
 +++ nmap.cc
-@@ -123,6 +123,7 @@
+@@ -130,6 +130,7 @@
  
- /* $Id: nmap.cc 35683 2016-03-14 23:54:51Z dmiller $ */
+ /* $Id: nmap.cc 36896 2017-07-31 16:56:48Z dmiller $ */
  
 +#include <getopt.h>
  #include "nmap.h"
  #include "osscan.h"
- #include "osscan2.h"
+ #include "scan_engine.h"
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index 4c81bbad3e58..45c26a932422 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -1,6 +1,6 @@
---- output.cc.orig	2016-01-13 20:53:39 UTC
+--- output.cc.orig	2017-06-07 12:32:38 UTC
 +++ output.cc
-@@ -148,6 +148,7 @@
+@@ -157,6 +157,7 @@
  #include <set>
  #include <vector>
  #include <list>
diff --git a/security/nmap/files/patch-tcpip.cc b/security/nmap/files/patch-tcpip.cc
index 4aab3767a8fd..493c12d4fcc0 100644
--- a/security/nmap/files/patch-tcpip.cc
+++ b/security/nmap/files/patch-tcpip.cc
@@ -1,6 +1,6 @@
---- tcpip.cc.orig	2015-06-30 18:34:28 UTC
+--- tcpip.cc.orig	2017-06-07 12:32:38 UTC
 +++ tcpip.cc
-@@ -144,6 +144,8 @@
+@@ -151,6 +151,8 @@
  #endif /* NETINET_IF_ETHER_H */
  #endif /* HAVE_NETINET_IF_ETHER_H */
  
@@ -8,4 +8,4 @@
 +
  extern NmapOps o;
  
- #ifdef WIN32
+ static PacketCounter PktCt;
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index e863390d41e9..9e683fa0a8d0 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -85,6 +85,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/data/psexec/nmap_service.c
 %%DATADIR%%/nselib/data/psexec/nmap_service.vcproj
 %%DATADIR%%/nselib/data/psexec/pwdump.lua
+%%DATADIR%%/nselib/data/publickeydb
 %%DATADIR%%/nselib/data/rtsp-urls.txt
 %%DATADIR%%/nselib/data/snmpcommunities.lst
 %%DATADIR%%/nselib/data/ssl-fingerprints
@@ -119,12 +120,15 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/ipOps.lua
 %%DATADIR%%/nselib/ipmi.lua
 %%DATADIR%%/nselib/ipp.lua
+%%DATADIR%%/nselib/irc.lua
 %%DATADIR%%/nselib/iscsi.lua
 %%DATADIR%%/nselib/isns.lua
 %%DATADIR%%/nselib/jdwp.lua
 %%DATADIR%%/nselib/json.lua
 %%DATADIR%%/nselib/ldap.lua
 %%DATADIR%%/nselib/lfs.luadoc
+%%DATADIR%%/nselib/libssh2-utility.lua
+%%DATADIR%%/nselib/libssh2.luadoc
 %%DATADIR%%/nselib/listop.lua
 %%DATADIR%%/nselib/lpeg-utility.lua
 %%DATADIR%%/nselib/lpeg.luadoc
@@ -169,6 +173,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/sip.lua
 %%DATADIR%%/nselib/slaxml.lua
 %%DATADIR%%/nselib/smb.lua
+%%DATADIR%%/nselib/smb2.lua
 %%DATADIR%%/nselib/smbauth.lua
 %%DATADIR%%/nselib/smtp.lua
 %%DATADIR%%/nselib/snmp.lua
@@ -241,6 +246,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/broadcast-netbios-master-browser.nse
 %%DATADIR%%/scripts/broadcast-networker-discover.nse
 %%DATADIR%%/scripts/broadcast-novell-locate.nse
+%%DATADIR%%/scripts/broadcast-ospf2-discover.nse
 %%DATADIR%%/scripts/broadcast-pc-anywhere.nse
 %%DATADIR%%/scripts/broadcast-pc-duo.nse
 %%DATADIR%%/scripts/broadcast-pim-discovery.nse
@@ -261,6 +267,8 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/cassandra-info.nse
 %%DATADIR%%/scripts/cccam-version.nse
 %%DATADIR%%/scripts/cics-enum.nse
+%%DATADIR%%/scripts/cics-info.nse
+%%DATADIR%%/scripts/cics-user-brute.nse
 %%DATADIR%%/scripts/cics-user-enum.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps-xml.nse
@@ -326,6 +334,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/ftp-brute.nse
 %%DATADIR%%/scripts/ftp-libopie.nse
 %%DATADIR%%/scripts/ftp-proftpd-backdoor.nse
+%%DATADIR%%/scripts/ftp-syst.nse
 %%DATADIR%%/scripts/ftp-vsftpd-backdoor.nse
 %%DATADIR%%/scripts/ftp-vuln-cve2010-4221.nse
 %%DATADIR%%/scripts/ganglia-info.nse
@@ -364,6 +373,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-coldfusion-subzero.nse
 %%DATADIR%%/scripts/http-comments-displayer.nse
 %%DATADIR%%/scripts/http-config-backup.nse
+%%DATADIR%%/scripts/http-cookie-flags.nse
 %%DATADIR%%/scripts/http-cors.nse
 %%DATADIR%%/scripts/http-cross-domain-policy.nse
 %%DATADIR%%/scripts/http-csrf.nse
@@ -421,6 +431,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-robots.txt.nse
 %%DATADIR%%/scripts/http-robtex-reverse-ip.nse
 %%DATADIR%%/scripts/http-robtex-shared-ns.nse
+%%DATADIR%%/scripts/http-security-headers.nse
 %%DATADIR%%/scripts/http-server-header.nse
 %%DATADIR%%/scripts/http-shellshock.nse
 %%DATADIR%%/scripts/http-sitemap-generator.nse
@@ -459,6 +470,10 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/http-vuln-cve2014-8877.nse
 %%DATADIR%%/scripts/http-vuln-cve2015-1427.nse
 %%DATADIR%%/scripts/http-vuln-cve2015-1635.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-1001000.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-5638.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-5689.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-8917.nse
 %%DATADIR%%/scripts/http-vuln-misfortune-cookie.nse
 %%DATADIR%%/scripts/http-vuln-wnr1000-creds.nse
 %%DATADIR%%/scripts/http-waf-detect.nse
@@ -471,10 +486,12 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/iax2-brute.nse
 %%DATADIR%%/scripts/iax2-version.nse
 %%DATADIR%%/scripts/icap-info.nse
+%%DATADIR%%/scripts/iec-identify.nse
 %%DATADIR%%/scripts/ike-version.nse
 %%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
 %%DATADIR%%/scripts/imap-ntlm-info.nse
+%%DATADIR%%/scripts/impress-remote-discover.nse
 %%DATADIR%%/scripts/informix-brute.nse
 %%DATADIR%%/scripts/informix-query.nse
 %%DATADIR%%/scripts/informix-tables.nse
@@ -586,6 +603,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/omron-info.nse
 %%DATADIR%%/scripts/openlookup-info.nse
 %%DATADIR%%/scripts/openvas-otp-brute.nse
+%%DATADIR%%/scripts/openwebnet-discovery.nse
 %%DATADIR%%/scripts/oracle-brute-stealth.nse
 %%DATADIR%%/scripts/oracle-brute.nse
 %%DATADIR%%/scripts/oracle-enum-users.nse
@@ -602,6 +620,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/pop3-capabilities.nse
 %%DATADIR%%/scripts/pop3-ntlm-info.nse
 %%DATADIR%%/scripts/pptp-version.nse
+%%DATADIR%%/scripts/puppet-naivesigning.nse
 %%DATADIR%%/scripts/qconn-exec.nse
 %%DATADIR%%/scripts/qscan.nse
 %%DATADIR%%/scripts/quake1-info.nse
@@ -640,6 +659,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/sip-methods.nse
 %%DATADIR%%/scripts/skypev2-version.nse
 %%DATADIR%%/scripts/smb-brute.nse
+%%DATADIR%%/scripts/smb-double-pulsar-backdoor.nse
 %%DATADIR%%/scripts/smb-enum-domains.nse
 %%DATADIR%%/scripts/smb-enum-groups.nse
 %%DATADIR%%/scripts/smb-enum-processes.nse
@@ -651,19 +671,25 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/smb-mbenum.nse
 %%DATADIR%%/scripts/smb-os-discovery.nse
 %%DATADIR%%/scripts/smb-print-text.nse
+%%DATADIR%%/scripts/smb-protocols.nse
 %%DATADIR%%/scripts/smb-psexec.nse
 %%DATADIR%%/scripts/smb-security-mode.nse
 %%DATADIR%%/scripts/smb-server-stats.nse
 %%DATADIR%%/scripts/smb-system-info.nse
 %%DATADIR%%/scripts/smb-vuln-conficker.nse
+%%DATADIR%%/scripts/smb-vuln-cve-2017-7494.nse
 %%DATADIR%%/scripts/smb-vuln-cve2009-3103.nse
 %%DATADIR%%/scripts/smb-vuln-ms06-025.nse
 %%DATADIR%%/scripts/smb-vuln-ms07-029.nse
 %%DATADIR%%/scripts/smb-vuln-ms08-067.nse
 %%DATADIR%%/scripts/smb-vuln-ms10-054.nse
 %%DATADIR%%/scripts/smb-vuln-ms10-061.nse
+%%DATADIR%%/scripts/smb-vuln-ms17-010.nse
 %%DATADIR%%/scripts/smb-vuln-regsvc-dos.nse
-%%DATADIR%%/scripts/smbv2-enabled.nse
+%%DATADIR%%/scripts/smb2-capabilities.nse
+%%DATADIR%%/scripts/smb2-security-mode.nse
+%%DATADIR%%/scripts/smb2-time.nse
+%%DATADIR%%/scripts/smb2-vuln-uptime.nse
 %%DATADIR%%/scripts/smtp-brute.nse
 %%DATADIR%%/scripts/smtp-commands.nse
 %%DATADIR%%/scripts/smtp-enum-users.nse
@@ -689,7 +715,11 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/socks-auth-info.nse
 %%DATADIR%%/scripts/socks-brute.nse
 %%DATADIR%%/scripts/socks-open-proxy.nse
+%%DATADIR%%/scripts/ssh-auth-methods.nse
+%%DATADIR%%/scripts/ssh-brute.nse
 %%DATADIR%%/scripts/ssh-hostkey.nse
+%%DATADIR%%/scripts/ssh-publickey-acceptance.nse
+%%DATADIR%%/scripts/ssh-run.nse
 %%DATADIR%%/scripts/ssh2-enum-algos.nse
 %%DATADIR%%/scripts/sshv1.nse
 %%DATADIR%%/scripts/ssl-ccs-injection.nse
@@ -725,6 +755,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/telnet-ntlm-info.nse
 %%DATADIR%%/scripts/tftp-enum.nse
 %%DATADIR%%/scripts/tls-nextprotoneg.nse
+%%DATADIR%%/scripts/tls-ticketbleed.nse
 %%DATADIR%%/scripts/tn3270-screen.nse
 %%DATADIR%%/scripts/tor-consensus-checker.nse
 %%DATADIR%%/scripts/traceroute-geolocation.nse
@@ -737,6 +768,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/ventrilo-info.nse
 %%DATADIR%%/scripts/versant-info.nse
 %%DATADIR%%/scripts/vmauthd-brute.nse
+%%DATADIR%%/scripts/vmware-version.nse
 %%DATADIR%%/scripts/vnc-brute.nse
 %%DATADIR%%/scripts/vnc-info.nse
 %%DATADIR%%/scripts/vnc-title.nse