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

Update ipfilter 4.1.28 --> 5.1.2.

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

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

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

Change the default syslog facility from LOG_LOCAL0 to LOG_SECURITY after
discussion on security@freebsd.org.

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

Import userland tools for IPFilter 3.4.31 into -current

Import IPFilter 3.4.25

Import IPFilter version 3.4.20

Import IP Filter update

Import IP Filter 3.4.12

Import base ipfilter 3.4.9 into contrib dir.

Import v3.4.8 into -current

Import IP Filter 3.4.4 into FreeBSD-current

Import of ipfilter 3.3.3 in anticipation of its revival.
More to come in the next days.

Import trimmed version of ipfilter 3.2.7.

Obtained from: Darren Reed via http://cheops.anu.edu.au/~avalon/

Import ipfilter 3.2.3

Import ipfilter 3.2.1 (update from 3.1.8)

Import version 3.2alpha7

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

reimport ipfilter v3.1.8 to get it onto the vendor branch again.

Import IP Filter v3.1.7 into FreeBSD tree