Date: Fri, 23 Jan 2015 20:53:22 -0800 From: Garrett Cooper <yaneurabeya@gmail.com> To: Luigi Rizzo <rizzo@iet.unipi.it> 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>, Xin LI <delphij@freebsd.org> 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 Message-ID: <C74B165B-448D-4EA9-B894-44359C5ADA5F@gmail.com> In-Reply-To: <CA%2BhQ2%2BiV_SUC3A4YctSwwEQNFaALeV97OPb6Fyp-=BuOj3nS%2Bw@mail.gmail.com> References: <CA%2BhQ2%2BiV_SUC3A4YctSwwEQNFaALeV97OPb6Fyp-=BuOj3nS%2Bw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <rizzo@iet.unipi.it> 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 <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. 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C74B165B-448D-4EA9-B894-44359C5ADA5F>