66 Commits

Author SHA1 Message Date
darrenr
fd172ed327 Pullup IPFilter 4.1.28 from the vendor branch into HEAD.
MFC after:	7 days
2007-10-18 21:52:14 +00:00
darrenr
a33069b532 Merge IPFilter 4.1.23 back to HEAD
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13
2007-06-04 02:54:36 +00:00
guido
e49049679f Resolve conflicts
MFC after:	1 weeks
2006-08-16 12:23:02 +00:00
darrenr
aacbf565b5 Add a man page for mkfilters(1) and put the corrected perl script in the
ipfilter usr/share directory

PR:     docs/26879
2006-02-27 11:22:20 +00:00
guido
7ee0924750 Resolve conflicts (and believe me...you don't want to know). 2005-12-30 11:52:26 +00:00
eivind
e998be30e5 Since this is already off the vendor branch: Our kernel is now in
/boot/kernel/kernel, not plain /kernel
2005-05-27 01:09:42 +00:00
darrenr
d643bc9db0 * 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.
2005-04-25 18:20:15 +00:00
darrenr
1c27d898b4 This commit was generated by cvs2svn to compensate for changes in r145510,
which included commits to RCS files with non-trunk default branches.
2005-04-25 17:31:50 +00:00
darrenr
d438802dcb import ipfilter 4.1.8 into the vendor branch 2005-04-25 17:31:50 +00:00
darrenr
a444d606d5 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
2004-06-21 22:53:03 +00:00
darrenr
590450fec6 Import ipfilter 3.4.35 onto vendor branch 2004-06-21 22:47:51 +00:00
darrenr
ac063842a5 This commit was generated by cvs2svn to compensate for changes in r130887,
which included commits to RCS files with non-trunk default branches.
2004-06-21 22:47:51 +00:00
darrenr
72ec972c34 update man page to reflect change in default syslog level ipmon is now compiled with 2003-04-05 21:12:58 +00:00
darrenr
e818bd682c bring changes in IPFilter to 3.4.31 on to the head 2003-02-15 06:32:48 +00:00
darrenr
bb1b56a0d0 Import userland tools for IPFilter 3.4.31 into -current 2003-02-15 06:27:40 +00:00
darrenr
cd8fb83e1f This commit was generated by cvs2svn to compensate for changes in r110917,
which included commits to RCS files with non-trunk default branches.
2003-02-15 06:27:40 +00:00
darrenr
b6c99dc12d merge the changes from 3.4.29 that didn't go cleanly due to conflicts 2002-08-28 13:45:36 +00:00
darrenr
3aab5fb9fd With a bit of luck, this will be a first-time right import of ipfilter 3.4.29
on to the vendor branch.
2002-08-28 13:42:48 +00:00
darrenr
694c267c8d This commit was generated by cvs2svn to compensate for changes in r102521,
which included commits to RCS files with non-trunk default branches.
2002-08-28 13:42:48 +00:00
darrenr
9765382011 Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28 2002-06-07 09:01:41 +00:00
darrenr
18c772ae03 Import IPFilter 3.4.28 2002-06-07 08:58:22 +00:00
darrenr
05bc20a37a This commit was generated by cvs2svn to compensate for changes in r98005,
which included commits to RCS files with non-trunk default branches.
2002-06-07 08:58:22 +00:00
darrenr
960bcab6dc resolve conflicts from import 2002-04-25 03:36:26 +00:00
darrenr
49c8a23224 Import IPFilter 3.4.26 2002-04-25 03:34:26 +00:00
darrenr
e783fd269e This commit was generated by cvs2svn to compensate for changes in r95419,
which included commits to RCS files with non-trunk default branches.
2002-04-25 03:34:26 +00:00
darrenr
c981967451 fix conflicts generated by import, completing import of ipf3.4.25 2002-03-19 11:48:16 +00:00
darrenr
8753e713f5 Import IPFilter 3.4.25 2002-03-19 11:45:24 +00:00
darrenr
fc5e0bb536 This commit was generated by cvs2svn to compensate for changes in r92688,
which included commits to RCS files with non-trunk default branches.
2002-03-19 11:45:24 +00:00
darrenr
5df9698551 Import IPFilter 3.4.25 2002-03-19 11:45:20 +00:00
darrenr
3140c087b9 This commit was generated by cvs2svn to compensate for changes in r92686,
which included commits to RCS files with non-trunk default branches.
2002-03-19 11:45:20 +00:00
darrenr
453a967eab fix conflicts created by import 2001-07-28 12:08:15 +00:00
darrenr
c51cd1facc Import IPFilter version 3.4.20 2001-07-28 11:59:33 +00:00
darrenr
99e3b6df83 This commit was generated by cvs2svn to compensate for changes in r80486,
which included commits to RCS files with non-trunk default branches.
2001-07-28 11:59:33 +00:00
darrenr
48b4ca8e6a fix conflicts 2001-02-04 14:26:56 +00:00
darrenr
5e62aa9b3d Import IP Filter update 2001-02-04 14:25:38 +00:00
darrenr
19fc1404db fix conflicts from rcsids 2000-10-26 12:47:40 +00:00
darrenr
7595d5ffce Import IP Filter 3.4.12 2000-10-26 12:45:54 +00:00
darrenr
464e3d57b8 fix conflicts 2000-07-19 13:56:18 +00:00
darrenr
90778a7160 Import v3.4.8 into -current 2000-07-19 13:52:47 +00:00
darrenr
e5c6607625 fix conflicts 2000-05-24 02:19:15 +00:00
darrenr
dda6755c7b Import IP Filter 3.4.4 into FreeBSD-current 2000-05-24 02:14:22 +00:00
darrenr
9a5646e13d This commit was generated by cvs2svn to compensate for changes in r60841,
which included commits to RCS files with non-trunk default branches.
2000-05-24 02:14:22 +00:00
peter
b4155d9e95 Remove files not in the v3_3_8 import. 2000-02-10 05:09:52 +00:00
peter
cf9ed6d8c9 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.
2000-02-10 03:17:51 +00:00
guido
1fa4f6782a Import of ipfilter 3.3.8
Approved by: jkh
2000-02-09 20:46:45 +00:00
guido
c3aa6ac872 Import of ipfilter 3.3.6 (freebsd relevant part)
Obtained from:	ftp://coombs.anu.edu.au/pub/net/firewall/ip-filter/ip_fil3.3.6.tar.gz
2000-01-13 18:30:37 +00:00
guido
0539756f3d Import of ipfilter 3.3.3 in anticipation of its revival.
More to come in the next days.
1999-11-08 20:51:23 +00:00
guido
9452e54400 This commit was generated by cvs2svn to compensate for changes in r53024,
which included commits to RCS files with non-trunk default branches.
1999-11-08 20:51:23 +00:00
nik
a2e08e8387 ipfstat is now in section 8 of the manual.
PR:		7791
Submitted by:	Stefan Eggers <seggers@semyam.dinoco.de>
1999-04-10 20:30:29 +00:00
billf
c0d05a5740 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
1998-12-30 04:09:21 +00:00