From nobody Fri Dec 10 04:42:09 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F23E818DD615; Fri, 10 Dec 2021 04:42:12 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9JCl1h4lz3P9Q; Fri, 10 Dec 2021 04:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDADA1451C; Fri, 10 Dec 2021 04:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BA4g9mL035986; Fri, 10 Dec 2021 04:42:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4g9pB035985; Fri, 10 Dec 2021 04:42:09 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:42:09 GMT Message-Id: <202112100442.1BA4g9pB035985@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 566fd26197c5 - 2021Q4 - security/nmap: PCAP option conflicts with pcap in 14-CURRENT base List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 566fd26197c5f39c9db467a674f3968861cf58e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LF844P9rG1DUQvZAIrIQlD4C9TFJj9ddfdjQlq9K5A4=; b=oeIWbeJjRTYKgj2+/k7JVUJbEMZGTN5E8n4cUlzKeqmjbZ0468lgcqtNUkPMtJwMQQEZxV rKnefiATySmFdrK3cdgBBWy3rbz0eP5a3Eoq1kz/jFdrDQkjpRa1yLjqJ0DefyqDZJPFnu 6VeJeEWgdKsdpM1nhMhi/VREfgS7HcS9sLCK40DMsoTZZ8GCl9WoCAfyO+2j379AmeRsFG IzSiKas4KOcZhoCtf5X7Zn+nBSpBhp1LRsfk3EH+Y+xfFrFPb4QqFg/Veado1d/T+dLjtq 7KtNp6kLyPJfi9qVpCEJmKzW20WorWqbcvVzlePwNXWkaCCNTd6/Jk5LT1TCBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111332; a=rsa-sha256; cv=none; b=lIrOFmiJjrhC73XfTpfTKSU91ur3OtfR/s9RN9xVRJaLs0LAOGT6Onv3qLXo6YbO1T4Ptm dzlpXiYZXfpUmORW2B6xmkSzV7MTNd6mnXaagdkgY8m/ezgUxWgm7cEvlq2v/d2X112PeE QcpZPxfqvF/+9psR/0ymyVWEfYHzYRj5rUH6ilSmK1qDg0Dui3nJHkwiePhpX79tM3qfYM GSNuX5p4pSWFoYKrlWElgxewU+YMm2J+3wklAzuUfE1Zxsv1SjlrcUT+Q72T351V5FE2Jk IU7FCLmH6FNl4NS2GkErXtfLIWR7CePTKhVwcZ/HcAXIok/N1e5sNzgKjZMbbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=566fd26197c5f39c9db467a674f3968861cf58e0 commit 566fd26197c5f39c9db467a674f3968861cf58e0 Author: Cy Schubert AuthorDate: 2021-12-06 04:10:49 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:35:21 +0000 security/nmap: PCAP option conflicts with pcap in 14-CURRENT base PCAP option conflicts with pcap in 14-CURRENT base. Mark the option BROKEN. (cherry picked from commit b1dcaf64da857d32153590fed40804f460da9bb9) --- security/nmap/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index d66887d252b6..6cd71bb4892d 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -53,6 +53,12 @@ CONFIGURE_ARGS+=--without-localdirs \ --with-liblua=included \ --without-nmap-update +.include + +.if ${PORT_OPTIONS:MPCAP} +BROKEN_FreeBSD_14= Conflicts with pcap in base +.endif + # XXX limit results if we do a grep in the sources! post-extract: @${RM} -r ${WRKSRC}/mswin32