From owner-svn-src-head@FreeBSD.ORG Sat Jan 24 04:53:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 059A821D; Sat, 24 Jan 2015 04:53:27 +0000 (UTC) Received: from mail-pd0-x22e.google.com (mail-pd0-x22e.google.com [IPv6:2607:f8b0:400e:c02::22e]) (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 BEA2EB92; Sat, 24 Jan 2015 04:53:26 +0000 (UTC) Received: by mail-pd0-f174.google.com with SMTP id ft15so1645896pdb.5; Fri, 23 Jan 2015 20:53:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=CCXWDjaQTwAeUKqxHkTn/t6SdRRbTYUYgRf9vRFonwM=; b=J2Rd3+4HtllWtEqefrBW7vXeum1Cka/x/9A9AKwhSeMH3qqXcSUCUDpOnMRNC4nbcO N37NFiHmqnQetQRDDmogFYRc/W6dzdIlM+xUXECaGj9m3SqCZmJWZuivprrPaH581Kd0 VDYikaSb1H/kuai47HvqbaeneGPcCiXy1/AYq5fzcgaMrf8LMIfb6S4XkNCgiH1CW/FL m1bAVzQ83eAGD3xDN8A1X+yhgkqqPdt9j4a9v/jzKHI4YhWtLeAvOJ19lw61esGWUaId gl7Bs++8f6/1vcuGFjth9t0L5b5cAzp2s5iQTKBVDS+wCnuUAn0tQ4huSyWh5XKnWbzG 8p9w== X-Received: by 10.68.129.6 with SMTP id ns6mr16419401pbb.137.1422075206382; Fri, 23 Jan 2015 20:53:26 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:ecbe:280c:8546:4daf? ([2601:8:ab80:7d6:ecbe:280c:8546:4daf]) by mx.google.com with ESMTPSA id v2sm3411959pdm.77.2015.01.23.20.53.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Jan 2015 20:53:25 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_AE487524-55E1-4D84-AE02-C22C6B5AB13A"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: WITHOUT_CASPER not working anymore ? Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump From: Garrett Cooper In-Reply-To: Date: Fri, 23 Jan 2015 20:53:22 -0800 Message-Id: References: To: Luigi Rizzo X-Mailer: Apple Mail (2.1878.6) Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Xin LI 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jan 2015 04:53:27 -0000 --Apple-Mail=_AE487524-55E1-4D84-AE02-C22C6B5AB13A Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On Jan 23, 2015, at 20:52, Luigi Rizzo wrote: > 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 headers. > > > @@ -70,25 +76,24 @@ > #include > #ifdef __FreeBSD__ > #include > -#include > -#include > #include > -#include > -#include > -#include > -#ifdef HAVE_LIBCAPSICUM > #include > #include > #include > #include > -#endif /* HAVE_LIBCAPSICUM */ > -#endif /* __FreeBSD__ */ > +#endif /* __FreeBSD__ */ > +#ifdef HAVE_CAPSICUM > +#include > +#include > +#include > +#include > +#include > +#endif /* HAVE_CAPSICUM */ > #ifndef WIN32 > #include > #include > #include > #include > -#include > #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. Someone else reported this too on the mailing lists... --Apple-Mail=_AE487524-55E1-4D84-AE02-C22C6B5AB13A Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJUwyVDAAoJEMZr5QU6S73e8zgH/1dwxJqLJDNXKdlc8D3toZY1 +amno/ZKfev766s1uOT6Nw1B0eEvYLWzai6za1p9ugrTR+TMvtII5mADDXg41XBQ vBS4ohgftCs8Ro7Ld2HUUBHY9UKxCgkIsENI3YQq+SpG8CeLq2lcWb2IGmj7OuzQ S6JHtAn35Xht7L/gZ/N/q0RzNweod6fpSQcvio27ao8bXSGNsSrGNvpqKlNoa2SH gdpojI4oseBWMLZzwdu5vhgnpgTfJLwrcuBN6LffmA7kOZJYLwKZ7sgqQg5lEs8X IPAgPf1ite6//hTqB1+nl5wKrBQK3v9PIwtI/FxkK3f9DpCDxlLCxpyGBByGVaM= =OGV1 -----END PGP SIGNATURE----- --Apple-Mail=_AE487524-55E1-4D84-AE02-C22C6B5AB13A--