WITHOUT_CASPER not working anymore ? Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump

[Garrett Cooper]

On Jan 23, 2015, at 20:52, Luigi Rizzo <rizzo at 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...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 496 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20150123/77aa381a/attachment.sig>