From nobody Wed Dec 22 16:07:04 2021 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 9719D190B88C; Wed, 22 Dec 2021 16:07:04 +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 4JJyrS2NLgz3FT5; Wed, 22 Dec 2021 16:07:04 +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 31A3120192; Wed, 22 Dec 2021 16:07:04 +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 1BMG74vC075440; Wed, 22 Dec 2021 16:07:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMG74mu075439; Wed, 22 Dec 2021 16:07:04 GMT (envelope-from git) Date: Wed, 22 Dec 2021 16:07:04 GMT Message-Id: <202112221607.1BMG74mu075439@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 7075bf819e7c - main - net/libpcap: Fix build 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: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7075bf819e7c5c63fe08db41a406d89a25dac7d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640189224; 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=eWZKQnN5gLXbAKNPsTxTSQQbRCWImhQXC8DhT+9hW5I=; b=CDUmTvYwsDkbGvBYEjQ4dCjn32egB2iFqLNaIfc/ey2jZS9RmelL/qxAXGcTKF+vPwzULp YJYx8mu+jxboFw6s22AoH1Nxc/rKnUtnW+sLdHq9WAnKgEc5ejTaWNbGldEOC6zpoJbzdf pqKE0ODxeXqCAhv/z+VkImAVzBKV7/LdQFJwyEKj8CLkbvsvcaSzJKNEofjzUEUIRGPOPg K7r3kH1mv2GRuSxhDFyPnyU6AK3G1BIYv81gRTWiC1aCRcgQS9s2TEF/25yxYtl0rRUt05 AaNbl7KAgxOccrkZp8XxCZ4UQlN0q1Ax+WYpyfMKhb685HbT9nHJrJYnnuWuvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640189224; a=rsa-sha256; cv=none; b=Cl9Syn+yNSlQvYuiOXHKBWR3AoKByut49Ss5UCj9BzGIffnpaWW0Hc8z+PFXwvzzhLl0SN /D95I1ZsnAf6kvlt43Gqck+5brHxdOxrsMuX+ZcSvEdxFtasnUvGYzuGlaxeL8pEtptdit YrZmk1GqsQCd8q/sGNmkwNJTGJx7N9628bTkPMOpMYCCZzkASPLXiJyW1V3z6sfUM/CmAn gNLmV6V/tdw0W6z81oRy2XJMQwrMSf+ozRtIJJcADIykbK9dPTzreNLbcAoakgmkZSonIB 5XPXnFRqWsgFWlfJFxAhf8nb74otd6K0CCZwLsp2+Xzn2to7h50koKuGgy7esA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=7075bf819e7c5c63fe08db41a406d89a25dac7d3 commit 7075bf819e7c5c63fe08db41a406d89a25dac7d3 Author: Kristof Provost AuthorDate: 2021-12-22 16:04:17 +0000 Commit: Renato Botelho CommitDate: 2021-12-22 16:06:50 +0000 net/libpcap: Fix build Fix build issues since if_pflog.h added a net/bpf.h include Obtained from: https://github.com/the-tcpdump-group/libpcap/pull/1074 Sponsored by: Rubicon Communications, LLC ("Netgate") --- net/libpcap/Makefile | 1 + net/libpcap/files/patch-gencode.c | 20 ++++++++++++++++++++ net/libpcap/files/patch-pcap_bpf.h | 13 +++++++++++++ 3 files changed, 34 insertions(+) diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index c04ddbff131f..5be5227c71b5 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -2,6 +2,7 @@ PORTNAME= libpcap PORTVERSION= 1.10.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.tcpdump.org/release/ diff --git a/net/libpcap/files/patch-gencode.c b/net/libpcap/files/patch-gencode.c new file mode 100644 index 000000000000..5f626d26ab32 --- /dev/null +++ b/net/libpcap/files/patch-gencode.c @@ -0,0 +1,20 @@ +--- gencode.c.orig 2021-06-07 20:21:35 UTC ++++ gencode.c +@@ -59,10 +59,16 @@ + #include + #include + #include +-#include + #endif /* HAVE_NET_PFVAR_H */ + + #include "pcap-int.h" ++ ++#ifdef HAVE_NET_PFVAR_H ++/* FreeBSD includes from , and indirectly includes ++ * . The FreeBSD version lacks DLT_IEEE802_15_4_TAP, so we really ++ * want to use our own version. */ ++#include ++#endif /* HAVE_NET_PFVAR_H */ + + #include "extract.h" + diff --git a/net/libpcap/files/patch-pcap_bpf.h b/net/libpcap/files/patch-pcap_bpf.h new file mode 100644 index 000000000000..96679e5d5727 --- /dev/null +++ b/net/libpcap/files/patch-pcap_bpf.h @@ -0,0 +1,13 @@ +--- pcap/bpf.h.orig 2021-06-07 20:21:35 UTC ++++ pcap/bpf.h +@@ -78,6 +78,10 @@ + */ + #if !defined(_NET_BPF_H_) && !defined(_NET_BPF_H_INCLUDED) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h) + #define lib_pcap_bpf_h ++#define _NET_BPF_H_ ++#define _NET_BPF_H_INCLUDED ++#define _BPF_H_ ++#define _H_BPF + + #include +