- update to 7.60

- regenerate patches with makepatch

PR:		ports/221522

12 files changed, 45 insertions, 46 deletions

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;