- update to 7.90

Relnotes:	https://nmap.org/changelog#7.90

8 files changed, 25 insertions, 25 deletions

diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index 17cf6b16ebfd..443a73d4a9fc 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2017-07-31 20:56:53 UTC
+--- Makefile.in.orig	2020-08-27 19:13:31 UTC
 +++ Makefile.in
-@@ -13,7 +13,7 @@ mandir = @mandir@
+@@ -10,7 +10,7 @@ mandir = @mandir@
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
  nmapdatadir = @datadir@/nmap
diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure
index 6a95f4f2b3d4..96651d558b5a 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2019-05-24 18:28:49 UTC
+--- configure.orig	2020-08-27 19:13:31 UTC
 +++ configure
-@@ -2542,7 +2542,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
+@@ -2529,7 +2529,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  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 :
-@@ -3375,7 +3375,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
+@@ -3362,7 +3362,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  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
index 2f8357e7c87d..74170ec491a6 100644
--- a/security/nmap/files/patch-libdnet-stripped_configure
+++ b/security/nmap/files/patch-libdnet-stripped_configure
@@ -1,6 +1,6 @@
---- libdnet-stripped/configure.orig	2017-02-13 19:46:23 UTC
+--- libdnet-stripped/configure.orig	2017-08-02 18:48:27 UTC
 +++ libdnet-stripped/configure
-@@ -733,6 +733,9 @@ ac_includes_default="\
+@@ -764,6 +764,9 @@ ac_includes_default="\
  #ifdef HAVE_STDINT_H
  # include <stdint.h>
  #endif
@@ -10,8 +10,8 @@
  #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 :
+@@ -11828,11 +11831,8 @@ $as_echo_n "checking for Berkeley Packet Filter... " >
+     if ${ac_cv_dnet_bsd_bpf+:} false; then :
    $as_echo_n "(cached) " >&6
  else
 -  if test -c /dev/bpf0 ; then
diff --git a/security/nmap/files/patch-libpcap_Makefile.in b/security/nmap/files/patch-libpcap_Makefile.in
index 6226cfda44df..a71ba748570a 100644
--- a/security/nmap/files/patch-libpcap_Makefile.in
+++ b/security/nmap/files/patch-libpcap_Makefile.in
@@ -1,11 +1,11 @@
---- libpcap/Makefile.in.orig	2019-03-29 20:24:48.000000000 -0700
-+++ libpcap/Makefile.in	2020-01-04 21:25:56.152375000 -0800
-@@ -69,7 +69,7 @@
+--- libpcap/Makefile.in.orig	2020-10-05 09:03:33 UTC
++++ libpcap/Makefile.in
+@@ -69,7 +69,7 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@
  EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@
  
  # Standard CFLAGS for building members of a shared library
--FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
-+FULL_CFLAGS = -I. $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
+-FULL_CFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
++FULL_CFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/security/nmap/files/patch-nmap.cc b/security/nmap/files/patch-nmap.cc
index 0db38d88f60f..e73b24a585fc 100644
--- a/security/nmap/files/patch-nmap.cc
+++ b/security/nmap/files/patch-nmap.cc
@@ -1,8 +1,8 @@
---- nmap.cc.orig	2017-07-31 16:56:48 UTC
+--- nmap.cc.orig	2020-10-02 16:12:22 UTC
 +++ nmap.cc
-@@ -130,6 +130,7 @@
- 
- /* $Id: nmap.cc 36896 2017-07-31 16:56:48Z dmiller $ */
+@@ -69,6 +69,7 @@
+ #include <shlobj.h>
+ #endif
  
 +#include <getopt.h>
  #include "nmap.h"
diff --git a/security/nmap/files/patch-nping_EchoServer.cc b/security/nmap/files/patch-nping_EchoServer.cc
index 9e5e551eb10e..cb903d069245 100644
--- a/security/nmap/files/patch-nping_EchoServer.cc
+++ b/security/nmap/files/patch-nping_EchoServer.cc
@@ -1,6 +1,6 @@
---- nping/EchoServer.cc.orig	2018-01-28 21:18:17 UTC
+--- nping/EchoServer.cc.orig	2020-10-02 16:12:22 UTC
 +++ nping/EchoServer.cc
-@@ -281,12 +281,12 @@ int EchoServer::nep_listen_socket(){
+@@ -213,12 +213,12 @@ int EchoServer::nep_listen_socket(){
          server_addr6.sin6_len = sizeof(struct sockaddr_in6);
      #endif
      /* Bind to local address and the specified port */
@@ -15,7 +15,7 @@
                  nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
              }else{ 
                  nping_print(VB_1, "Server bound to port %d", port);
-@@ -319,12 +319,12 @@ int EchoServer::nep_listen_socket(){
+@@ -251,12 +251,12 @@ int EchoServer::nep_listen_socket(){
  #endif
  
      /* Bind to local address and the specified port */
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index 45c26a932422..d0b6705f6ff0 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -1,6 +1,6 @@
---- output.cc.orig	2017-06-07 12:32:38 UTC
+--- output.cc.orig	2020-10-02 16:12:22 UTC
 +++ output.cc
-@@ -157,6 +157,7 @@
+@@ -90,6 +90,7 @@
  #include <set>
  #include <vector>
  #include <list>
diff --git a/security/nmap/files/patch-tcpip.cc b/security/nmap/files/patch-tcpip.cc
index 493c12d4fcc0..4cccc9ddd947 100644
--- a/security/nmap/files/patch-tcpip.cc
+++ b/security/nmap/files/patch-tcpip.cc
@@ -1,6 +1,6 @@
---- tcpip.cc.orig	2017-06-07 12:32:38 UTC
+--- tcpip.cc.orig	2020-10-02 16:12:22 UTC
 +++ tcpip.cc
-@@ -151,6 +151,8 @@
+@@ -83,6 +83,8 @@
  #endif /* NETINET_IF_ETHER_H */
  #endif /* HAVE_NETINET_IF_ETHER_H */