From owner-svn-src-head@FreeBSD.ORG  Sat Jan 24 04:52:21 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 16AF3D9;
 Sat, 24 Jan 2015 04:52:21 +0000 (UTC)
Received: from mail-la0-x22d.google.com (mail-la0-x22d.google.com
 [IPv6:2a00:1450:4010:c03::22d])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id A82B3B88;
 Sat, 24 Jan 2015 04:52:20 +0000 (UTC)
Received: by mail-la0-f45.google.com with SMTP id gd6so814325lab.4;
 Fri, 23 Jan 2015 20:52:18 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:date:message-id:subject:from:to:cc:content-type;
 bh=GLHW3I4jbIDVexj1XfybSNxEgkkbSXOiA/vqXELpJF4=;
 b=o5zN4rxnksH6sCm47+sdfBtTkpszqNgPkKBaMd3mSxm3XygAeGZNTQzpPln1T3LFwM
 mPcTvgLkYU+VPV5I5OTzpPJHZyTK7g77CW93V0K/r5AWX1/Q5Hin7VHp9gZFH/kSjqWu
 80HZ9lYTNcVqxjhGzQjtDZPzAW+PdNx7+QgQsUPqm3lURezDGYGTP/XocLTFFEiVW9Vd
 xlEh0pD7s+n87WSQLK6ZJxIkfJuCuAi1NAtUtSKL5O120xEZNGwvSwD5yPJpEp7O2xdH
 xx9N2c+UF0ZkBuH7T1BazHjcv34p5vygoKoUNQ6zeQ0i47kzez3ghoTOoXg0MB/ddzCg
 9rog==
MIME-Version: 1.0
X-Received: by 10.112.12.134 with SMTP id y6mr10943491lbb.34.1422075138663;
 Fri, 23 Jan 2015 20:52:18 -0800 (PST)
Sender: rizzo.unipi@gmail.com
Received: by 10.114.10.168 with HTTP; Fri, 23 Jan 2015 20:52:18 -0800 (PST)
Date: Fri, 23 Jan 2015 20:52:18 -0800
X-Google-Sender-Auth: VfjbERBOOmglkLVuB9n0i5aFc3s
Message-ID: <CA+hQ2+iV_SUC3A4YctSwwEQNFaALeV97OPb6Fyp-=BuOj3nS+w@mail.gmail.com>
Subject: WITHOUT_CASPER not working anymore ? Re: svn commit: r276788 - in
 head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing
 usr.sbin/tcpdump/tcpdump
From: Luigi Rizzo <rizzo@iet.unipi.it>
To: Xin LI <delphij@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2015 04:52:21 -0000

Not that i mind if it is intentional (though it seems not), but after this
commit tcpdump does not build anymore with -DWITHOUT_CASPER.

To be precise, the failure is when you do a buildworld with WITHOUT_CASPER,
which does not install the libcapsicum headers.

I understand that there is a change in the macro that defines support
(from HAVE_LIBCAPSICUM to HAVE_CAPSICUM), but it seems to me
that in the chunk below (for tcpdump.c, but other sources are affected too)
the #ifdef HAVE_CAPSICUM / #endif block contains headers
that are totally unrelated to capsicum:
you should probably protect the <libcapsicum*> headers.


@@ -70,25 +76,24 @@
 #include <limits.h>
 #ifdef __FreeBSD__
 #include <sys/capsicum.h>
-#include <sys/ioccom.h>
-#include <sys/types.h>
 #include <sys/sysctl.h>
-#include <net/bpf.h>
-#include <fcntl.h>
-#include <libgen.h>
-#ifdef HAVE_LIBCAPSICUM
 #include <libcapsicum.h>
 #include <libcapsicum_dns.h>
 #include <libcapsicum_service.h>
 #include <nv.h>
-#endif /* HAVE_LIBCAPSICUM */
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ */
+#ifdef HAVE_CAPSICUM
+#include <sys/capability.h>
+#include <sys/ioccom.h>
+#include <net/bpf.h>
+#include <fcntl.h>
+#include <libgen.h>
+#endif /* HAVE_CAPSICUM */
 #ifndef WIN32
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <pwd.h>
 #include <grp.h>
-#include <errno.h>
 #endif /* WIN32 */

 /* capabilities convinience library */

I am happy to send a patch but would be more comfortable if you could
review/deal with it yourself.

cheers
luigi



On Wed, Jan 7, 2015 at 11:55 AM, Xin LI <delphij@freebsd.org> wrote:
> Author: delphij
> Date: Wed Jan  7 19:55:18 2015
> New Revision: 276788
> URL: https://svnweb.freebsd.org/changeset/base/276788
>
> Log:
>   MFV r276761: tcpdump 4.6.2.