MFC r343486:Fix a typo.
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 mergedhere.Additional commits post-branch will follow.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Revert r288682I meant to do this on ^/user/ngie/more-testsPointyhat 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)
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.
This commit was generated by cvs2svn to compensate for changes in r145510,which included commits to RCS files with non-trunk default branches.
import ipfilter 4.1.8 into the vendor branch
Import ipfilter 3.4.35 onto vendor branch
Import userland tools for IPFilter 3.4.31 into -current
With a bit of luck, this will be a first-time right import of ipfilter 3.4.29on to the vendor branch.
Import IPFilter 3.4.28
Import IPFilter 3.4.26
Import IPFilter 3.4.25
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 IP Filter v3.1.7 into FreeBSD tree