From owner-svn-ports-all@freebsd.org Mon Jan 6 09:48:20 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AFC5A1FF023; Mon, 6 Jan 2020 09:48:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47rrKw49zyz4V0d; Mon, 6 Jan 2020 09:48:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A62AC80A; Mon, 6 Jan 2020 09:48:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0069mKXn020433; Mon, 6 Jan 2020 09:48:20 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0069mKuD020431; Mon, 6 Jan 2020 09:48:20 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <202001060948.0069mKuD020431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Mon, 6 Jan 2020 09:48:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522213 - in branches/2020Q1/security/nmap: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2020Q1/security/nmap: . files X-SVN-Commit-Revision: 522213 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2020 09:48:20 -0000 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 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"