From nobody Sun Jan 16 18:19:57 2022 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 45EDA195C873; Sun, 16 Jan 2022 18:19:58 +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 4JcNcG1Ct0z3mRL; Sun, 16 Jan 2022 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642357198; 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=oGQDXmn0zG0mtWeBeQGFc5uUvHT8dwHLPLDpk3WaiA0=; b=mfuMBDeoZ48BKlPzea2+KmbJpAjNNd6fsad4c1IH36GroK34fd2afZsez6GafF6y6e+Cit bBpTRAlqbsf3qO39ns6fx4UjRbkt8UTAVtE7k/xC3v2haXdPr4t43Hd8Rg/4YEFd6lndo8 f9MquNK9bf9L/76Pu0ol50VMgTJBPBzr+Rjzu4nKAZTKCBVgwcKyQJCPHHDEiZr3j5x6VP UYLHlenQ7PcFcaQX712GGh7rkH3OxvgDyT2P1wTPIUAjUCVN90MaFHz20PZH+/D+76OUGe rkaZP91lvlVBcMJuCMNhCle3u8wXDKpm0cXfmuFkc+bIeivn1RW+FGN7W/is0w== 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 09D201F0FA; Sun, 16 Jan 2022 18:19:58 +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 20GIJvSs041815; Sun, 16 Jan 2022 18:19:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GIJvpV041814; Sun, 16 Jan 2022 18:19:57 GMT (envelope-from git) Date: Sun, 16 Jan 2022 18:19:57 GMT Message-Id: <202201161819.20GIJvpV041814@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: 779c6cbc6160 - 2022Q1 - security/nmap: PCAP option conflicts with pcap in 13-STABLE 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 779c6cbc6160d90e72d61c1b1e02cccb308d81c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642357198; 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=oGQDXmn0zG0mtWeBeQGFc5uUvHT8dwHLPLDpk3WaiA0=; b=ItjzH0Oh9qWVZ+TfvC5P7bu/H+of2IgbuA8gDcSK26jhYV96F3uCT8D6C9PuIrD9Qu3n1+ 8u1olv416PH/VMYjM06OKot9uEK2Rhiqep2AasggAYbntX0z4d/bVJf2wa1AKbKsz4mpR1 bawwtGioQCICxX2kX8wEoMQe2M/ynHmAs+zltxmZtYD6YGwgoBZXw/Ojm1np/EOLBzCCLj ceLKpv8+jkU6eAv7jwwjx6BYy8aZLdTwlwjFWzAXPi+jf95eSvM+a1FHECecZDunF4Z5UI BpAFi/uqiRGM5efP48vp+1w1Mm2uJrzg1gf5DOHPzjPFPoDAUXpn4ehDgl1qCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642357198; a=rsa-sha256; cv=none; b=YY2ykrBxm4ORzw+11prSAojVBpsFXT7iNI8AB/RBWR8NC1+hvG1iUQIskgBEtkNVcGp7Pu khBj0++W/3SFDhTItEfY2q7dcBBb4OEt6JIhd9J9T38dWMrjVLN3DDTr/uGzyJSuREp7IN bJ8DFMLwpQPTl/gPeJV5Btt4vQy1Dbld8wS1CsT9Fec8zACtSk4Jolta6is39ThmS8euWB p8IAMklZ3BOXOD8zPujTQV6PL40eAquvt6/F0JB9i1EtuQxg39hJ3ocv/Thl6J33XFaUnm H5e8vCfrHySVz2OukDIOnH0RbmmzEtvo+7yn9lhoATpLuBqku+sjWR2nEQ17AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=779c6cbc6160d90e72d61c1b1e02cccb308d81c7 commit 779c6cbc6160d90e72d61c1b1e02cccb308d81c7 Author: Cy Schubert AuthorDate: 2022-01-16 18:14:32 +0000 Commit: Cy Schubert CommitDate: 2022-01-16 18:19:34 +0000 security/nmap: PCAP option conflicts with pcap in 13-STABLE base PCAP option also conflicts with pcap in 13-STABLE base. Mark the option BROKEN. This is the same fix as b1dcaf64da857d32153590fed40804f460da9bb9 for 14-CURRENT. PR: 261242 (cherry picked from commit 7a374db8e5ba3916d4e97e799e0e90c47ba1e62b) --- security/nmap/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index c2223cd54aec..d7580970fa2f 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -57,6 +57,7 @@ CONFIGURE_ARGS+=--without-localdirs \ .if ${PORT_OPTIONS:MPCAP} BROKEN_FreeBSD_14= Conflicts with pcap in base +BROKEN_FreeBSD_13= Conflicts with pcap in base .endif # XXX limit results if we do a grep in the sources!