MFC r349503-349504:

Document the -B, binary logfile, and the -C config file options.
Reference the ipmon.5 man page and ipmon.conf.

PR: 238816

MFC r349448:

Fix a typo.

PR/238816 initially addressed updates to usage() however it has now
become a shopping list of fixes to ipmon man pages and usage().

PR: 238816

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Revert r288682

I meant to do this on ^/user/ngie/more-tests

Pointyhat to: ngie (use svn info next time...)

Comment in the BUGS section header. Matches what's in ipfilter 5.10.

PR: 144880
Submitted by: Glen Barber <glen.j.barber@gmail.com>
MFC after: 1 week

Merge IPFilter 4.1.23 back to HEAD
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13

Resolve conflicts

MFC after: 1 weeks

Resolve conflicts (and believe me...you don't want to know).

* Someone imported a lot of files with the wrong CVS tag, so lots of files need
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

Committ changes from 3.4.31 -> 3.4.35
* fix bug parsing port comparisons in proxy rules
* make parsing errors in ipf/ipnat return an error rather than return
indicating success.
* make parsing errors in ipf/ipnat return an error rather than return
indicating success.
* make ipfstat work as a set{g,u}id thing - gave up privs before opening
/dev/ipl
* fix ipfstat -A
* make "ipfstat -f" output more informative
* various changes to ipsend for sending packets with ipv4 options
* ipmon was not correctly calculating the length of the IPv6 packet (excluded
ipv6 header length)

MFC: 1 week

update man page to reflect change in default syslog level ipmon is now compiled with

bring changes in IPFilter to 3.4.31 on to the head

merge the changes from 3.4.29 that didn't go cleanly due to conflicts

resolve conflicts from import

fix conflicts generated by import, completing import of ipf3.4.25

fix conflicts from rcsids

fix conflicts

Not in this commit: Many spammed deltas have been removed to restore
back to the vendor branch.

Re-merge changes from the vendor branch.

Undo the local spammed changes that I could find. There are probably
more local fixes that were clobbered that I've missed.

Comment out empty "BUGS" section.

PR: 8121
Submitted by: Norihiro Kumagai <kuma@jp.freebsd.org>

Remove duplicate entries for -N and -S commandline switches.

PR: 8120
Submitted by: Horihiro Kumagaio <kuma@jp.freebsd.org>

Merge 3.2.3 -> 3.2.7 changes into mainline.

Spelling corrections.

PR: 6829
Submitted by: Josh Gilliam <josh@quick.net>

This commit was generated by cvs2svn to compensate for changes in r34739,
which included commits to RCS files with non-trunk default branches.

Import ipfilter 3.2.3

Import ipfilter 3.2.1 (update from 3.1.8)

Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2

Import IP Filter v3.1.7 into FreeBSD tree