svn commit: r522213 - in branches/2020Q1/security/nmap: . files
Ben Woods
woodsb02 at FreeBSD.org
Mon Jan 6 09:48:20 UTC 2020
Author: woodsb02
Date: Mon Jan 6 09:48:19 2020
New Revision: 522213
URL: https://svnweb.freebsd.org/changeset/ports/522213
Log:
MFH: r522159
security/nmap: Fix build on 11i386, 11arm, 11arm64
Fix patches to configure scripts to only add -libverbs if found in base
PR: 242987
Reported by: Dries Michiels <driesm.michiels at gmail.com>
Reported by: garga
Approved by: ports-secteam (joneum)
Deleted:
branches/2020Q1/security/nmap/files/patch-ncat_configure
branches/2020Q1/security/nmap/files/patch-nping_configure
Modified:
branches/2020Q1/security/nmap/Makefile
branches/2020Q1/security/nmap/files/patch-configure
Directory Properties:
branches/2020Q1/ (props changed)
Modified: branches/2020Q1/security/nmap/Makefile
==============================================================================
--- branches/2020Q1/security/nmap/Makefile Mon Jan 6 09:46:14 2020 (r522212)
+++ branches/2020Q1/security/nmap/Makefile Mon Jan 6 09:48:19 2020 (r522213)
@@ -56,6 +56,15 @@ CONFIGURE_ARGS+=--without-localdirs \
post-extract:
@${RM} -r ${WRKSRC}/mswin32
+.if exists(/usr/lib/libibverbs.a)
+# Link with libibverbs is needed by static libpcap
+post-patch-PCAP-on:
+ @${REINPLACE_CMD} -E -e "s|(PCAP_LIBS=['\"].*)(['\"])$$|\1 -libverbs\2|" \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/nping/configure \
+ ${WRKSRC}/ncat/configure
+.endif
+
post-configure:
@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
Modified: branches/2020Q1/security/nmap/files/patch-configure
==============================================================================
--- branches/2020Q1/security/nmap/files/patch-configure Mon Jan 6 09:46:14 2020 (r522212)
+++ branches/2020Q1/security/nmap/files/patch-configure Mon Jan 6 09:48:19 2020 (r522213)
@@ -18,12 +18,3 @@
{ $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"
More information about the svn-ports-all
mailing list