From 0e18b95bd561223108587e1a24fa5bae13cf2d4b Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Mon, 30 Dec 2019 12:38:05 +0000 Subject: security/nmap: Update to 7.80 - Remove local patches incorporated upstream. - Add patches to add missing libibverbs dependency when linking libpcap statically (required to allow build on FreeBSD >= 12.0). (See similar fix applied to port net-mgmt/dhcdrop in r499639). Changes this release: https://seclists.org/nmap-announce/2019/0 Approved by: ohauer (maintainer timeout) Differential Revision: https://reviews.freebsd.org/D22730 --- security/nmap/files/patch-configure | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'security/nmap/files/patch-configure') 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" -- cgit v1.2.3