- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

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

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

Update ipfilter 4.1.28 --> 5.1.2.

Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)

Fix paths for example files.

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

fix spelling mistake

Pullup IPFilter 4.1.28 from the vendor branch into HEAD.

MFC after: 7 days

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

Add a man page for mkfilters(1) and put the corrected perl script in the
ipfilter usr/share directory

PR: docs/26879

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

Since this is already off the vendor branch: Our kernel is now in
/boot/kernel/kernel, not plain /kernel

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

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

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

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

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

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

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

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

Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28

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

resolve conflicts from import

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

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

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

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

fix conflicts created by import

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

fix conflicts

fix conflicts from rcsids

fix conflicts

fix conflicts

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

Remove files not in the v3_3_8 import.

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.

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

ipfstat is now in section 8 of the manual.

PR: 7791
Submitted by: Stefan Eggers <seggers@semyam.dinoco.de>

remove non-existant references, correct spelling errors.

PR: docs/7963, docs/7790
Submitted by: Stefan Eggers seggers@semyam.dinoco.de
Norihiro Kumagai kuma@jp.freebsd.org

Remove bogus reference to mkfilters(1)

PR: docs/7790
Submitted by: Stefan Eggers seggers@semyam.dinoco.de

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>

Typo fix: "whether on not" -> "whether or not".

PR: 8102
Submitted by: Kazuo Horikawa <horikawa@jp.freebsd.org>

vmunix -> kernel
PR: port/8543
Submitted by: jkb@best.com

Merge 3.2.3 -> 3.2.7 changes into mainline.

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

Spelling fixes.

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

Fix a bunch of spelling errors.

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

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.

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

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

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

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