From owner-svn-src-head@freebsd.org  Thu May 31 07:32:27 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73F40FC96C2;
 Thu, 31 May 2018 07:32:27 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 13248750D6;
 Thu, 31 May 2018 07:32:27 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by mail.turbocat.net (Postfix) with ESMTPSA id 98892260338;
 Thu, 31 May 2018 09:32:24 +0200 (CEST)
Subject: Re: svn commit: r334277 - in head: contrib/libpcap
 contrib/ofed/usr.lib/3 contrib/pf/pflogd contrib/wpa/src/l2_packet lib
 lib/libpcap share/mk usr.sbin/cxgbetool
To: Antoine Brodin <antoine@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
References: <201805280812.w4S8CI56046943@repo.freebsd.org>
 <CAALwa8neo=vjQwNt6RqhQuZQixm7qUv2fXw-U3y+bn+asYTskg@mail.gmail.com>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <f327f6c7-240e-f79e-bb86-bf6d7b237770@selasky.org>
Date: Thu, 31 May 2018 09:32:11 +0200
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
 Thunderbird/52.8.0
MIME-Version: 1.0
In-Reply-To: <CAALwa8neo=vjQwNt6RqhQuZQixm7qUv2fXw-U3y+bn+asYTskg@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2018 07:32:27 -0000

On 05/30/18 20:32, Antoine Brodin wrote:
> Hi,
> 
> It seems that this local change was lost during the upgrade:
> https://svnweb.freebsd.org/base/head/contrib/libpcap/pcap/pcap.h?r1=190640&r2=190639&pathrev=190640
> 

Hi,

This change has been removed upstream.

> I think this broke at least the following ports:
> 
> http://gohan2.ysv.freebsd.org/data/head-amd64-default-baseline/p471115_s334360/logs/errors/packetdrill-0.0.2018012501.log
> http://gohan2.ysv.freebsd.org/data/head-amd64-default-baseline/p471115_s334360/logs/errors/spamd-4.9.1_4.log
> http://gohan2.ysv.freebsd.org/data/head-amd64-default-baseline/p471115_s334360/logs/errors/vde2-2.3.2_2.log
> http://gohan2.ysv.freebsd.org/data/head-amd64-default-baseline/p471115_s334360/logs/errors/xprobe2-0.3.log
> 

Can these ports include net/bpf.h before pcap.h ? That should fix the issue.

pcap.h has its own stripped down bpf.h now and that might not work.

--HPS