50 Commits

Author SHA1 Message Date
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
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
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
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
billf
f59c1b8cea Remove bogus reference to mkfilters(1)
PR:		docs/7790
Submitted by:	Stefan Eggers seggers@semyam.dinoco.de
1998-12-29 03:57:15 +00:00
steve
9c97052383 Comment out empty "BUGS" section.
PR:		8121
Submitted by:	Norihiro Kumagai <kuma@jp.freebsd.org>
1998-12-10 02:47:05 +00:00
steve
cead30d23a Remove duplicate entries for -N and -S commandline switches.
PR:		8120
Submitted by:	Horihiro Kumagaio <kuma@jp.freebsd.org>
1998-12-10 02:43:29 +00:00
steve
4dc7618636 Typo fix: "whether on not" -> "whether or not".
PR:		8102
Submitted by:	Kazuo Horikawa <horikawa@jp.freebsd.org>
1998-12-10 02:30:52 +00:00
nectar
d032a7ae16 vmunix -> kernel
PR:		port/8543
Submitted by:	jkb@best.com
1998-11-16 04:25:03 +00:00
peter
e08eccffd4 Merge 3.2.3 -> 3.2.7 changes into mainline. 1998-06-20 18:43:25 +00:00
peter
9529c38ad8 Import trimmed version of ipfilter 3.2.7.
Obtained from:  Darren Reed via http://cheops.anu.edu.au/~avalon/
1998-06-20 18:29:38 +00:00
peter
b9ddfe987f This commit was generated by cvs2svn to compensate for changes in r37074,
which included commits to RCS files with non-trunk default branches.
1998-06-20 18:29:38 +00:00
jkoshy
75e70dcdb0 Spelling fixes.
Submitted by: Josh Gilliam <josh@quick.net>
PR: 6880
1998-06-08 06:12:02 +00:00
steve
260fa64a35 Fix a bunch of spelling errors.
PR:		6856
Submitted by:	Josh Gilliam <josh@quick.net>
1998-06-04 21:06:07 +00:00
jkoshy
15683e67b6 Spelling corrections.
PR: 6829
Submitted by: Josh Gilliam <josh@quick.net>
1998-06-03 04:21:41 +00:00
peter
58e3555d88 Import ipfilter 3.2.3 1998-03-21 10:04:55 +00:00
peter
594e73c310 Import ipfilter 3.2.1 (update from 3.1.8) 1997-11-16 04:52:19 +00:00
darrenr
e0610b5498 Import version 3.2alpha7 1997-05-25 15:45:04 +00:00
darrenr
d255035008 Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2 1997-04-03 10:22:02 +00:00
darrenr
cb8d46a179 Import IP Filter v3.1.7 into FreeBSD tree 1997-02-09 22:50:16 +00:00