diff options
| author | Lawrence Teo <lteo@cvs.openbsd.org> | 2013-06-19 03:51:31 +0000 |
|---|---|---|
| committer | Lawrence Teo <lteo@cvs.openbsd.org> | 2013-06-19 03:51:31 +0000 |
| commit | 001bdfd0bc84a2e9a6f113de77f60f4e06e71fac (patch) | |
| tree | 127dc124affc7013dbf996fbaeee344c5826b069 | |
| parent | addb686c249c0bd50683516f299368427e6c6b0b (diff) | |
Do not install pcap-int.h to /usr/include as it is an internal library
header (pointed out by matthew@). Let only pflogd and tcpdump include
pcap-int.h directly since they need it for privilege separation.
"looks good" sthen
feedback/ok deraadt matthew millert
| -rw-r--r-- | lib/libpcap/Makefile | 4 | ||||
| -rw-r--r-- | sbin/pflogd/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/Makefile | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index a31a05f6bd6..03264f44dc7 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2012/08/02 13:38:39 okan Exp $ +# $OpenBSD: Makefile,v 1.24 2013/06/19 03:51:30 lteo Exp $ # $NetBSD: Makefile,v 1.3 1996/05/10 21:54:24 cgd Exp $ LIB= pcap @@ -36,7 +36,7 @@ DEFS= -DHAVE_SYS_IOCCOM_H -DHAVE_SYS_SOCKIO_H -DHAVE_ETHER_HOSTTON \ CFLAGS+=-I. -I${.CURDIR} -Dyylval=pcap_yylval ${DEFS} -HDRS= pcap.h pcap-int.h pcap-namedb.h +HDRS= pcap.h pcap-namedb.h SRCS= pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \ savefile.c bpf_filter.c bpf_image.c grammar.y scanner.l \ pcap-bpf.c version.c fad-getad.c diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile index fd5b4d52c0b..826ed0a22af 100644 --- a/sbin/pflogd/Makefile +++ b/sbin/pflogd/Makefile @@ -1,6 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2009/11/16 16:56:50 otto Exp $ +# $OpenBSD: Makefile,v 1.9 2013/06/19 03:51:30 lteo Exp $ CFLAGS+=-Wall -Wmissing-prototypes -Wshadow + +# for pcap-int.h +CFLAGS+=-I${.CURDIR}/../../lib/libpcap + LDADD+= -lpcap DPADD+= ${LIBPCAP} diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index e04594d7fa4..7cfb2d2af02 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2009/11/04 09:43:11 jsing Exp $ +# $OpenBSD: Makefile,v 1.54 2013/06/19 03:51:30 lteo Exp $ # # Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 # The Regents of the University of California. All rights reserved. @@ -25,6 +25,9 @@ MAN= tcpdump.8 CFLAGS+=-Wall -I${.CURDIR}/../../sbin/pfctl -I${.CURDIR}/../hostapd +# for pcap-int.h +CFLAGS+=-I${.CURDIR}/../../lib/libpcap + CFLAGS+=-DCSLIP -DPPP -DHAVE_FDDI -DETHER_SERVICE -DRETSIGTYPE=void -DHAVE_NET_SLIP_H -DHAVE_ETHER_NTOHOST -DINET6 LDADD+= -lpcap -ll -lcrypto |