Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

libpcap: Update to 1.10.3

Local changes:

- In contrib/libpcap/pcap/bpf.h, do not include pcap/dlt.h. Our system
net/dlt.h is pulled in from net/bpf.h.
- sys/net/dlt.h: Incorporate changes from libpcap 1.10.3.
- lib/libpcap/Makefile: Update for libpcap 1.10.3.

Changelog: https://git.tcpdump.org/libpcap/blob/95691ebe7564afa3faa5c6ba0dbd17e351be455a:/CHANGES
Reviewed by: emaste
Obtained from: https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz
Sponsored by: The FreeBSD Foundation

MFV r353141 (by phillip):

Update libpcap from 1.9.0 to 1.9.1.

MFC after: 2 weeks

Install missing pcap(3) manual pages and add missing manpage
section substitutions.

Submitted by: Martin Beran <martin@mber.cz>
PR: 237893
MFC after: 1 week
Sponsored by: Mellanox Technologies

pkgbase: Create a FreeBSD-utilities package and make it the default one

The default package use to be FreeBSD-runtime but it should only contain
binaries and libs enough to boot to single user and repair the system, it
is also very handy to have a package that can be tranform to a small mfsroot.
So create a new package named FreeBSD-utilities and make it the default one.
Also move a few binaries and lib into this package when it make sense.
Reviewed by: bapt, gjb
Differential Revision: https://reviews.freebsd.org/D21506

Remove redundant header file from source list in libpcap.

MFC after: 3 weeks
Sponsored by: Mellanox Technologies

MFV r333789: libpcap 1.9.0 (pre-release)

MFC after: 1 month
Sponsored by: Mellanox Technologies

Stop installing pcap-int.h, which is the internal interface for libpcap.

Reference: https://github.com/the-tcpdump-group/libpcap/issues/560
PR: 217221

MFV r313676: libpcap 1.8.1

MFC after: 1 month

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This implifies pathing in make/displayed output

MFC after: 3 weeks
Sponsored by: Dell EMC Isilon

First pass through library packaging.

Sponsored by: The FreeBSD Foundation

META MODE: Don't create .meta files when symlinking sources into the obj directory.

Tracking these leads to situations where meta mode will consider the
file to be out of date if /bin/sh or /bin/ln are newer than the source
file. There's no reason for meta mode to do this as make is already
handling the rebuild dependency fine.

Sponsored by: EMC / Isilon Storage Division

Revert r284417 it is not necessary anymore

Enforce overwritting SHLIBDIR

Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load loading
bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc everywhere.

This makes /lib being populated again.

Reported by: many

MFV r276759: libpcap 1.6.2.

MFC after: 1 month

Add netmap support to libpcap. Tcpdump and other native pcap application can now
run directly on netmap ports using netmap:foo or valeXX:YY device names.
Modifications to existing code are small and trivial, the netmap-specific
code is all in a new file.

Please be aware that in netmap mode the physical interface is disconnected from
the host stack, so libpcap will steal the traffic not just make a copy.

For the full version of the code (including linux and autotools support) see
https://code.google.com/p/netmap-libpcap/

MFC after: 3 days

Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.

Merge from vendor branch: update libpcap to 1.2.1.

MFC after: 2 weeks

Bump shared libraries version numbers in preparation for 9.0.
This time, only libraries which ABI has been changed compared to
stable/8, are bumped.

ABI analysis done by: Gleb Kurtsou
Approved by: re (kensmith)

add pcap-common.c.

Submitted by: dim

Update for libpcap-1.1.1.

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE. Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by: kib
Approved by: re (rwatson)

Fix typo in comment.

Install the new headers.

Support files for new libpcap 1.0.0.
Includes a shlib bump.

Add links to all libpcap functions.

Update for libpcap 0.9.8 import

Bump library versions in preparation for 7.0.

Ok'd by: kan

Place shared libpcap library under /lib, currently needed by
/sbin/ipf and /sbin/pflogd.

OK'ed by: mlaier

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

bump SHLIB_MAJOR as libpcap refers getnetbyname(3).

Noticed by: ru

NOINET6 -> NO_INET6

Bump the library version numbers for the following libraries:

/lib/{libm,libreadline}
/usr/lib/{libhistory,libopie,libpcap}

in preparation for doing the same thing to RELENG_5. HUGE amounts of
help for determining what to bump provided by kris.

Discussed on: freebsd-current
Approved by: re (not required for commit but something like this should be)

Merge of libpcap 0.8.3 from tcpdump.org.

* 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*".

Zap now-unused SHLIB_MINOR

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".

Update our bpf.h with tcpdump.org's new DLT_ types.
Use our bpf.h instead of tcpdump.org's to build libpcap.

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).

Update for libpcap 0.6.2

MAN[1-9] -> MAN.

Don't try to compile in INET6 support when NOINET6 is defined.

Upgrade to libpcap 0.5

$Id$ -> $FreeBSD$

Fixed CLEANFILES.

Bump minor version number and add version.c to update to version 0.4

PR: bin/7877

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

Simplified by using new yacc rules.

Also install pcap-int.h so things can call pcap_compile on arbitary
expressions (eg: in pppd)

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>

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

Revert $FreeBSD$ to $Id$

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.

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.

cmp -s || install -c ==> install -C, use .for loop for includes

Uniquely name the distribution directory variable so that it can be overridden
for multiple packages at the same time.

Bump shared library number to 2.1

Grab libpcap sources out of contrib_libpcap module

Define ETHER_SERVICE, since we have one. ie: use getetherxxx() instead
of parsing /etc/ethers manually. This allows it to read NIS.

backout yacc changes

yacc rule change.

``mv'' -> ``mv -f''
``rm'' -> ``rm -f''
so mv/rm may not ask for confirmation if you are not root

Install source files with the -c flag, not with the optional flag ${COPY}.

Fix typo: pcap.h.h

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)

Add the Packet Capture Library from Michael Reifenberger.
Submitted by: mr

Install missing pcap(3) manual pages and add missing manpage
section substitutions.

Submitted by: Martin Beran <martin@mber.cz>
PR: 237893
MFC after: 1 week
Sponsored by: Mellanox Technologies

pkgbase: Create a FreeBSD-utilities package and make it the default one

The default package use to be FreeBSD-runtime but it should only contain
binaries and libs enough to boot to single user and repair the system, it
is also very handy to have a package that can be tranform to a small mfsroot.
So create a new package named FreeBSD-utilities and make it the default one.
Also move a few binaries and lib into this package when it make sense.
Reviewed by: bapt, gjb
Differential Revision: https://reviews.freebsd.org/D21506

Remove redundant header file from source list in libpcap.

MFC after: 3 weeks
Sponsored by: Mellanox Technologies

Stop installing pcap-int.h, which is the internal interface for libpcap.

Reference: https://github.com/the-tcpdump-group/libpcap/issues/560
PR: 217221

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This implifies pathing in make/displayed output

MFC after: 3 weeks
Sponsored by: Dell EMC Isilon

First pass through library packaging.

Sponsored by: The FreeBSD Foundation

META MODE: Don't create .meta files when symlinking sources into the obj directory.

Tracking these leads to situations where meta mode will consider the
file to be out of date if /bin/sh or /bin/ln are newer than the source
file. There's no reason for meta mode to do this as make is already
handling the rebuild dependency fine.

Sponsored by: EMC / Isilon Storage Division

Revert r284417 it is not necessary anymore

Enforce overwritting SHLIBDIR

Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load loading
bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc everywhere.

This makes /lib being populated again.

Reported by: many

Add netmap support to libpcap. Tcpdump and other native pcap application can now
run directly on netmap ports using netmap:foo or valeXX:YY device names.
Modifications to existing code are small and trivial, the netmap-specific
code is all in a new file.

Please be aware that in netmap mode the physical interface is disconnected from
the host stack, so libpcap will steal the traffic not just make a copy.

For the full version of the code (including linux and autotools support) see
https://code.google.com/p/netmap-libpcap/

MFC after: 3 days

Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.

Bump shared libraries version numbers in preparation for 9.0.
This time, only libraries which ABI has been changed compared to
stable/8, are bumped.

ABI analysis done by: Gleb Kurtsou
Approved by: re (kensmith)

add pcap-common.c.

Submitted by: dim

Update for libpcap-1.1.1.

A new jail(8) with a configuration file, to replace the work currently done
by /etc/rc.d/jail.

Create the altix project branch. The altix project will add support
for the SGI Altix 350 to FreeBSD/ia64. The hardware used for porting
is a two-module system, consisting of a base compute module and a
CPU expansion module. SGI's NUMAFlex architecture can be an excellent
platform to test CPU affinity and NUMA-aware features in FreeBSD.

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE. Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by: kib
Approved by: re (rwatson)

Fix typo in comment.

Install the new headers.

Support files for new libpcap 1.0.0.
Includes a shlib bump.

- Import the HEAD csup code which is the basis for the cvsmode work.

Add links to all libpcap functions.

Update for libpcap 0.9.8 import

Bump library versions in preparation for 7.0.

Ok'd by: kan

Place shared libpcap library under /lib, currently needed by
/sbin/ipf and /sbin/pflogd.

OK'ed by: mlaier

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

bump SHLIB_MAJOR as libpcap refers getnetbyname(3).

Noticed by: ru

NOINET6 -> NO_INET6

Bump the library version numbers for the following libraries:

/lib/{libm,libreadline}
/usr/lib/{libhistory,libopie,libpcap}

in preparation for doing the same thing to RELENG_5. HUGE amounts of
help for determining what to bump provided by kris.

Discussed on: freebsd-current
Approved by: re (not required for commit but something like this should be)

Merge of libpcap 0.8.3 from tcpdump.org.

* 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*".

Zap now-unused SHLIB_MINOR

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".

Update our bpf.h with tcpdump.org's new DLT_ types.
Use our bpf.h instead of tcpdump.org's to build libpcap.

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).

Update for libpcap 0.6.2

MAN[1-9] -> MAN.

Don't try to compile in INET6 support when NOINET6 is defined.

Upgrade to libpcap 0.5

$Id$ -> $FreeBSD$

Fixed CLEANFILES.

Bump minor version number and add version.c to update to version 0.4

PR: bin/7877

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

Simplified by using new yacc rules.

Also install pcap-int.h so things can call pcap_compile on arbitary
expressions (eg: in pppd)

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>

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

Revert $FreeBSD$ to $Id$

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.

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.

cmp -s || install -c ==> install -C, use .for loop for includes

Uniquely name the distribution directory variable so that it can be overridden
for multiple packages at the same time.

Bump shared library number to 2.1

Grab libpcap sources out of contrib_libpcap module

Define ETHER_SERVICE, since we have one. ie: use getetherxxx() instead
of parsing /etc/ethers manually. This allows it to read NIS.

backout yacc changes

yacc rule change.

``mv'' -> ``mv -f''
``rm'' -> ``rm -f''
so mv/rm may not ask for confirmation if you are not root

Install source files with the -c flag, not with the optional flag ${COPY}.

Fix typo: pcap.h.h

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)

Add the Packet Capture Library from Michael Reifenberger.
Submitted by: mr