4 files changed, 34 insertions, 17 deletions
diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure
index 8ef57a7f7fff..e8eb0ae905c1 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-07-31 19:09:47 UTC
+--- configure.orig	2019-05-24 18:28:49 UTC
 +++ configure
-@@ -2583,7 +2583,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2542,7 +2542,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 :
-@@ -3416,7 +3416,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -3375,7 +3375,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.
@@ -18,3 +18,12 @@
  { $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 :
+@@ -6365,7 +6365,7 @@ if test $have_libpcap != yes; then
+   else
+     CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir"
+   fi
+-  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
++  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a -libverbs'
+   PCAP_BUILD="build-pcap"
+   PCAP_CLEAN="clean-pcap"
+   PCAP_DIST_CLEAN="distclean-pcap"
diff --git a/security/nmap/files/patch-libdnet-stripped_src_arp-ioctl.c b/security/nmap/files/patch-libdnet-stripped_src_arp-ioctl.c
deleted file mode 100644
index 19ffb7f037d0..000000000000
--- a/security/nmap/files/patch-libdnet-stripped_src_arp-ioctl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-# Use correct width in sscanf. Fixes #1156
-# https://github.com/nmap/nmap/commit/36a6d897a584013d25e51ac339fe45ffc45df9df
-
---- libdnet-stripped/src/arp-ioctl.c.orig	2008-09-19 06:12:25 UTC
-+++ libdnet-stripped/src/arp-ioctl.c
-@@ -218,7 +218,7 @@ arp_loop(arp_t *a, arp_handler callback,
- 
- 	ret = 0;
- 	while (fgets(buf, sizeof(buf), fp) != NULL) {
--		i = sscanf(buf, "%s 0x%x 0x%x %100s %100s %100s\n",
-+		i = sscanf(buf, "%s 0x%x 0x%x %99s %99s %99s\n",
- 		    ipbuf, &type, &flags, macbuf, maskbuf, devbuf);
- 		
- 		if (i < 4 || (flags & ATF_COM) == 0)
diff --git a/security/nmap/files/patch-ncat_configure b/security/nmap/files/patch-ncat_configure
new file mode 100644
index 000000000000..fb644bde9ef1
--- /dev/null
+++ b/security/nmap/files/patch-ncat_configure
@@ -0,0 +1,11 @@
+--- ncat/configure.orig	2019-12-08 01:42:55 UTC
++++ ncat/configure
+@@ -4934,7 +4934,7 @@ fi
+   LIBS="$LIBS_OLD"
+ fi
+ 
+-PCAP_LIBS="-lpcap"
++PCAP_LIBS="-lpcap -libverbs"
+ if test $have_libpcap = yes; then
+   PCAP_DEPENDS=""
+   PCAP_BUILD=""
diff --git a/security/nmap/files/patch-nping_configure b/security/nmap/files/patch-nping_configure
new file mode 100644
index 000000000000..f36960ccfe9c
--- /dev/null
+++ b/security/nmap/files/patch-nping_configure
@@ -0,0 +1,11 @@
+--- nping/configure.orig	2019-01-31 23:28:21 UTC
++++ nping/configure
+@@ -5356,7 +5356,7 @@ if test $have_libpcap != yes; then
+     LDFLAGS="-L$libpcapdir $LDFLAGS"
+     CPPFLAGS="$CPPFLAGS -I$libpcapdir"
+   fi
+-  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
++  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a -libverbs'
+   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
+   PCAP_BUILD="build-pcap"
+   PCAP_CLEAN="clean-pcap"