From nobody Fri Apr 29 18:07:38 2022 X-Original-To: dev-commits-ports-all@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 F317B1ABE3A4; Fri, 29 Apr 2022 18:07:38 +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 4KqgSV6WWNz4m76; Fri, 29 Apr 2022 18:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651255658; 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=+tv9FfH5TFBvaVj+ZzXa0XEA4fidrpLB/+lS3d3fzTE=; b=TivvBlxMFtWWF7a6Fc/ABHWm1m4XSxoaOix571maTp+6QFE4ny0ujp2/y5PvSbJLGuVntD nYrVUIH7ESNtkPGnPl0E79CuR4VCBnsgCrxaPRLX1jUPRG5Pln9lk8W7lV9meBr51TAfLl yurj/oZhy9dgKDkNcuOOMytF8zJ8UiICzXGwQYVrcppVP1gKIbShhuz6bhfO7XFURxJdaZ cEuMzSvtw6/U64pavOW6OpwneZUKWKbjAogZTzfo+9CMZ6tcxrJ8iOGTaptbq0fqJecrOZ guloEoMFLHpF+Ti6yEOLe7JThOsc1aHChWNyZ25vqcb3p8csRy5tN3gc47CYrg== 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 BBBDB1195F; Fri, 29 Apr 2022 18:07:38 +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 23TI7cko025998; Fri, 29 Apr 2022 18:07:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TI7cPu025997; Fri, 29 Apr 2022 18:07:38 GMT (envelope-from git) Date: Fri, 29 Apr 2022 18:07:38 GMT Message-Id: <202204291807.23TI7cPu025997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 4a1604404d17 - main - security/nmap: Revert 7a374db8e5ba3916d4e97e799e0e90c47ba1e62b List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 4a1604404d176e424d3c30f9856e75ca5e010ecb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651255658; 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=+tv9FfH5TFBvaVj+ZzXa0XEA4fidrpLB/+lS3d3fzTE=; b=OTgxz1Zs0/D/Ev4ifs+oWxvSOyjuoIt7ow4BmkaePzeoAHZTsZ4RgTwvPteGbiPyYoYeef 46Y/1QL8e8fRGeRpK08reQ2FMyiVYhCRb1g9bvPxMoxqYiiKM+axqHPtSWVrMxj4MY0Qb3 JvP7n8csdggWRmZSiX/E0cRrt6i8kYat8asWGZTOO9KBnJAU+9X1ZT1/ClFsPTDx/SCAej E06baR6OVKNi1ruusnEfG8VBmY24oOsfdcKLlIxfVjF4RncQR9hSU/kvxt3AUaJzDfnTPq LfLj85KfNeGI7ATmV0XEtF3oCf01CkYQp6j0ifCBRyKnc3y1PO6/XQYi6fYVpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651255658; a=rsa-sha256; cv=none; b=e6QAdIXGNs4dkdrJEtb0vdEkeo8189dCiy+S4SNa1voLhAsk2Tjewqi66ccEJEdQGEAPn+ HyQjBKVvAUaZ4ocsoToyAIZEHuNTn/2HmhgKSxb3RlQkKxoZAUVCNUNQGmyfvzVzo1vyRL 2T+OhzlXL9OXMIgH0dP+5L9+czqVJg9LKj8n9Oe9N5rAN27IixVgqAQ6feoIYDr5HbsYrF C6OIs7gAcfdCvJueQRPGP8l5KdfJuD5yFS9/JqRWJRuMWiraMJ7G95veJcChBLLWgC7NQj CBhkihvCMfkHTyGvOX5rJP3DXhQdDuZTlKchnVv4EMs7GRrW+s6DS4rV+hifqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a1604404d176e424d3c30f9856e75ca5e010ecb commit 4a1604404d176e424d3c30f9856e75ca5e010ecb Author: Cy Schubert AuthorDate: 2022-04-29 18:03:01 +0000 Commit: Cy Schubert CommitDate: 2022-04-29 18:07:27 +0000 security/nmap: Revert 7a374db8e5ba3916d4e97e799e0e90c47ba1e62b Revert "security/nmap: PCAP option conflicts with pcap in 13-STABLE base". security/nmap builds fine with PCAP enabled now. This reverts commit 7a374db8e5ba3916d4e97e799e0e90c47ba1e62b. PR: 261242 Reported by: eugen MFH 2022Q2 --- security/nmap/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index d7580970fa2f..c2223cd54aec 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -57,7 +57,6 @@ 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!