Commit Graph

41 Commits

Author SHA1 Message Date
bms
723e163490 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
green
1bb1923e83 * Modify libpcap to work a bit better with our 802.11 code. This means
tcpdump -y ieee802_11 will work in the basic senses, including the
  code compilation for filters (where you may specify "link[]" to refer
  to parts of the 802.11 header, as well as treat it like a normal
  Ethernet header).  Previously, it was just too far off to do anything
  useful for us.
* While I'm here, fix some compile problems that will result from lex
  and yacc namespace polution when linking with -lpcap.  The namespace
  is now "pcapyy*" instead of "yy*", and it tests fine with world and
  some external applications that may or may not use "yy*".
2003-11-04 06:12:21 +00:00
peter
0a7f0ba37e Zap now-unused SHLIB_MINOR 2002-09-28 00:25:32 +00:00
fenner
71820ddb16 Update for libpcap 0.7.1 2002-06-21 01:35:37 +00:00
ru
59049318b6 Added new bsd.incs.mk which handles installing of header files
via INCS.  Implemented INCSLINKS (equivalent to SYMLINKS) to
handle symlinking include files.  Allow for multiple groups of
include files to be installed, with the powerful INCSGROUPS knob.
Documentation to follow.

Added standard `includes' and `incsinstall' targets, use them
in Makefile.inc1.  Headers from the following makefiles were
not installed before (during `includes' in Makefile.inc1):

	kerberos5/lib/libtelnet/Makefile
	lib/libbz2/Makefile
	lib/libdevinfo/Makefile
	lib/libform/Makefile
	lib/libisc/Makefile
	lib/libmenu/Makefile
	lib/libmilter/Makefile
	lib/libpanel/Makefile

Replaced all `beforeinstall' targets for installing includes
with the INCS stuff.

Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS,
and for compatibility with NetBSD.  Similarly for INCOWN, INCGRP,
and INCMODE.

Consistently use INCLUDEDIR instead of /usr/include.

gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes
were only lightly tested due to the missing contrib/libstdc++-v3.
I fully tested the pre-WIP_GCC31 version of this patch with the
contrib/libstdc++.295 stuff.

These changes have been tested on i386 with the -DNO_WERROR "make
world" and "make release".
2002-05-12 16:01:00 +00:00
fenner
db46728f21 Update our bpf.h with tcpdump.org's new DLT_ types.
Use our bpf.h instead of tcpdump.org's to build libpcap.
2001-07-31 23:27:06 +00:00
bde
0dda54756f Fixed world breakage in previous commit (config.h was inaccessible
except in the unusual case where ${.OBJDIR} == ${.CURDIR}).

Fixed nearby style bugs (the DEFS variable had rotted to be just
an obfuscation).
2001-04-03 10:08:51 +00:00
fenner
b14c9adfb6 Update for libpcap 0.6.2 2001-04-03 04:34:50 +00:00
ru
25ef23ac1c MAN[1-9] -> MAN. 2001-03-27 17:27:19 +00:00
steve
1feb59c27f Don't try to compile in INET6 support when NOINET6 is defined. 2000-04-15 20:45:52 +00:00
fenner
e328086255 Upgrade to libpcap 0.5 2000-01-30 00:44:23 +00:00
peter
76f0c923fe $Id$ -> $FreeBSD$ 1999-08-28 00:22:10 +00:00
bde
9b7e972a2c Fixed CLEANFILES. 1998-12-27 15:04:33 +00:00
fenner
a27e663b5d Bump minor version number and add version.c to update to version 0.4
PR:		bin/7877
1998-09-15 19:34:01 +00:00
ache
861a4bd425 do not include private copy of bpf.h - it leads to dangerous mismatch
of kernel/user bpf interface - include updated /sys/net/bpf.h instead
1998-08-18 10:29:37 +00:00
bde
ff58493209 Simplified by using new yacc rules. 1998-05-08 06:43:07 +00:00
peter
ee6e7caa07 Also install pcap-int.h so things can call pcap_compile on arbitary
expressions (eg: in pppd)
1997-10-10 11:55:42 +00:00
jkh
418d0a6a92 Changes to support full make parallelism (-j<n>) in the world
target.
Reviewed by:	<many different folks>
Submitted by:	Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 09:40:24 +00:00
fenner
b41570e6e6 Bump minor version number.
Add -I${PCAP_DISTDIR}/bpf to CFLAGS since our <net/bpf.h> is out of date.
Remove -Wall and -Dlint.
DHAVE_ETHER_HOSTTON=1 -DHAVE_STRERROR=1 \
	-DHAVE_SOCKADDR_SA_LEN=1 -DLBL_ALIGN=1

CFLAGS+=-I. -Dyylval=pcap_lval ${DEFS}

SHLIB_MAJOR=2
SHLIB_MINOR=2

#
# Magic to grab sources out of src/contrib
#
PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap
CFLAGS+=-I${PCAP_DISTDIR} -I${PCAP_DISTDIR}/lbl -I${PCAP_DISTDIR}/bpf
.PATH:	${PCAP_DISTDIR}
.PATH:	${PCAP_DISTDIR}/bpf/net

beforeinstall:
.for i in pcap.h pcap-namedb.h
	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${PCAP_DISTDIR}/$i \
		${DESTDIR}/usr/include
.endfor

tokdefs.h grammar.c: grammar.y
	${YACC} ${YACCFLAGS} -d ${PCAP_DISTDIR}/grammar.y
	mv y.tab.c grammar.c
	mv y.tab.h tok/home/ncvs/CVSROOT/commitcheck
1997-05-27 00:08:01 +00:00
peter
6b08958c64 Revert $FreeBSD$ to $Id$ 1997-02-22 15:12:41 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
wollman
afa9804a34 Fix Makefile so that dependencies are actually right this time.
It is almost always the wrong thing to put .y and .l files directly
into the SRCS.
1997-01-05 18:25:53 +00:00
peter
ccd40c8c62 cmp -s || install -c ==> install -C, use .for loop for includes 1996-08-30 01:59:46 +00:00
pst
ddd2ef851a Uniquely name the distribution directory variable so that it can be overridden
for multiple packages at the same time.
1996-08-21 16:50:15 +00:00
pst
5bad8486ad Bump shared library number to 2.1 1996-08-20 05:43:51 +00:00
pst
a96a62bfac Grab libpcap sources out of contrib_libpcap module 1996-08-19 21:01:37 +00:00
peter
85b8c8adb1 Define ETHER_SERVICE, since we have one. ie: use getetherxxx() instead
of parsing /etc/ethers manually. This allows it to read NIS.
1996-08-19 14:23:50 +00:00
jkh
c4d4a99d31 General -Wall warning cleanup, part I.
Submitted-By: Kent Vander Velden <graphix@iastate.edu>
1996-07-12 18:57:58 +00:00
phk
3b816e03a0 backout yacc changes 1996-06-02 17:10:13 +00:00
phk
3203743c60 yacc rule change. 1996-05-30 23:01:04 +00:00
wosch
9f795376b3 `mv'' -> `mv -f''
``rm'' -> ``rm -f''
so mv/rm may not ask for confirmation if you are not root
1996-05-07 23:19:49 +00:00
bde
0a13cbc5da Fixed incomplete or wrong lists of prerequisite #includes related to
<sys/types.h>.
1996-05-01 01:45:23 +00:00
bde
1d5c50aac7 Install source files with the -c flag, not with the optional flag ${COPY}. 1995-08-06 12:37:41 +00:00
ache
215845d698 Fix handling NULL-encapsulated interfaces (lo & tun)
Reviewed by: wollman
Submitted by: dvv@sprint.net
1995-06-22 16:56:00 +00:00
rgrimes
f05428e4cd Remove trailing whitespace. 1995-05-30 05:51:47 +00:00
ache
d70484c276 Fix typo: pcap.h.h 1995-02-23 18:47:06 +00:00
phk
9bf4b628ff Quench a warning and fix some duplicity by using the official strerror
routine, instead of rolling our own.
1995-02-23 06:55:14 +00:00
olah
f0c34d41d1 Fix bogus Makefile which resulted in incompatible shared and static
libs.

Reviewed by:	Michael Reifenberger <root@rz-wb.fh-sw.de>,
		roberto@blaise.ibp.fr (Ollivier ROBERT)
1995-02-21 10:46:34 +00:00
jkh
17c7fa25ae This commit was generated by cvs2svn to compensate for changes in r5739,
which included commits to RCS files with non-trunk default branches.
1995-01-20 04:13:07 +00:00
jkh
8e4f208589 Add the Packet Capture Library from Michael Reifenberger.
Submitted by:	mr
1995-01-20 04:13:07 +00:00
jkh
92a97f198b Add the Packet Capture Library from Michael Reifenberger.
Submitted by:	mr
1995-01-20 04:13:07 +00:00