From owner-svn-src-stable@FreeBSD.ORG Thu Jun 27 15:52:56 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 99F4A9E9; Thu, 27 Jun 2013 15:52:56 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-wg0-x233.google.com (mail-wg0-x233.google.com [IPv6:2a00:1450:400c:c00::233]) by mx1.freebsd.org (Postfix) with ESMTP id 662511F3B; Thu, 27 Jun 2013 15:52:55 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id e11so729039wgh.30 for ; Thu, 27 Jun 2013 08:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=DybVAblirX5fgIh2jZHuZGLzv5XdTsfpmDvhj0MHX28=; b=j/SHHZYuPZzDQP677NBS+dPzg7JcORKKBAlUFNksN42AGsbSp8xCadwEnAHqYgRP/g uqEoPboqGAEuGy43RN0qLo/hW0q2UibcKHOydD7cHn5Zz9ivCftJ3MtEP6cA6bx5PKz8 BxOe3XL0iCow/x6GfsEAJ0Dc3+X68vlUl1xCA2qlDNfo+/FVum3akSt0qHCUJxCKjVzg vCZCGh4L7IFyCTgT0ltFGE1aOSUkLq7hWiIH+SWrI4Jwydpn7x9Vs/qp9lNCfVgGjDJF fk4bdyXEEAFXn4i1fK/QzXQ48Ut1wiljX0LXMS3X3UlrZcci84KCVB+6jrNpWalyj4AP UVag== MIME-Version: 1.0 X-Received: by 10.180.182.229 with SMTP id eh5mr6353746wic.63.1372348374550; Thu, 27 Jun 2013 08:52:54 -0700 (PDT) Sender: pluknet@gmail.com Received: by 10.194.172.133 with HTTP; Thu, 27 Jun 2013 08:52:54 -0700 (PDT) In-Reply-To: <20130627135820.GA1686@glenbarber.us> References: <201306270038.r5R0c0S4024756@svn.freebsd.org> <20130627135820.GA1686@glenbarber.us> Date: Thu, 27 Jun 2013 19:52:54 +0400 X-Google-Sender-Auth: Kx2EzqCtA9yt8N7wHcESLSMtER8 Message-ID: Subject: Re: svn commit: r252283 - in stable/9: contrib/tcpdump usr.sbin/tcpdump/tcpdump From: Sergey Kandaurov To: Glen Barber Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Xin LI , svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 15:52:56 -0000 On 27 June 2013 17:58, Glen Barber wrote: > On Thu, Jun 27, 2013 at 12:38:00AM +0000, Xin LI wrote: >> Author: delphij >> Date: Thu Jun 27 00:37:59 2013 >> New Revision: 252283 >> URL: http://svnweb.freebsd.org/changeset/base/252283 >> >> Log: >> MFC: tcpdump 4.4.0. >> > > I think this breaks the build. > > cc -O -pipe -G0 -I/src/usr.sbin/tcpdump/tcpdump > -I/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump -DHAVE_CONFIG_H > -D_U_="__attribute__((unused))" -DINET6 -DLBL_ALIGN > -I/obj/mips.mipsel/src/tmp/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H > -DHAVE_NET_PFVAR_H -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith > -Wno-uninitialized -Wno-pointer-sign -c > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c: In function > 'print_src_dst': > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c:330: error: 'tcpstates' > undeclared (first use in this function) > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c:330: error: (Each > undeclared identifier is reported only once > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c:330: error: for each > function it appears in.) It is broken in stable/9 due to contrib/pf include spaghetti. This does work in head thanks to glebius. This change tries to fix the build on stable/9. Merge r240136 partially from projects/pf via head. This is a direct change due to significant divergence in code. Index: sys/contrib/pf/net/if_pfsync.c =================================================================== --- sys/contrib/pf/net/if_pfsync.c (revision 252306) +++ sys/contrib/pf/net/if_pfsync.c (working copy) @@ -114,6 +114,7 @@ #include #include #include +#include #include #ifdef INET Index: sys/contrib/pf/net/pf.c =================================================================== --- sys/contrib/pf/net/pf.c (revision 252306) +++ sys/contrib/pf/net/pf.c (working copy) @@ -111,6 +111,7 @@ #include #include #include +#include #include #include #include Index: sys/contrib/pf/net/pf_norm.c =================================================================== --- sys/contrib/pf/net/pf_norm.c (revision 252306) +++ sys/contrib/pf/net/pf_norm.c (working copy) @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include Index: sys/contrib/pf/net/pfvar.h =================================================================== --- sys/contrib/pf/net/pfvar.h (revision 252306) +++ sys/contrib/pf/net/pfvar.h (working copy) @@ -58,8 +58,6 @@ #include #endif -#include - struct ip; struct ip6_hdr; #ifdef __FreeBSD__ -- wbr, pluknet