Commit Graph

46 Commits

Author SHA1 Message Date
Darren Reed
561e006b67 resolve conflicts 2000-08-13 05:00:44 +00:00
Darren Reed
3002dee911 This commit was generated by cvs2svn to compensate for changes in r64588,
which included commits to RCS files with non-trunk default branches.
2000-08-13 04:58:02 +00:00
Darren Reed
f345cd2b83 Import base ipfilter 3.4.9 into contrib dir. 2000-08-13 04:58:02 +00:00
Darren Reed
23053d8f2f actually commit merged diffs to the trunk 2000-07-19 23:10:29 +00:00
Archie Cobbs
75da303298 Fix breakage caused by ether_aton() prototype change.
PR:		bin/20033
2000-07-19 16:30:02 +00:00
Darren Reed
c0230397c7 fix conflicts 2000-07-19 13:56:18 +00:00
Darren Reed
02aea5e854 Import v3.4.8 into -current 2000-07-19 13:52:47 +00:00
Darren Reed
83a94a22b3 This commit was generated by cvs2svn to compensate for changes in r63516,
which included commits to RCS files with non-trunk default branches.
2000-07-19 13:52:47 +00:00
Darren Reed
6de9811ef7 define CSUM_DELAY_DATA to match merge 2000-05-26 07:28:03 +00:00
Darren Reed
f1beb78299 fix up #ifdef jungle for FreeBSD 2000-05-25 16:24:46 +00:00
Darren Reed
6774c05335 remove duplicate prototypes 2000-05-25 16:23:30 +00:00
Darren Reed
8312b3f4f7 fix conflicts 2000-05-24 02:19:15 +00:00
Darren Reed
933f6f74ee Import IP Filter 3.4.4 into FreeBSD-current 2000-05-24 02:14:22 +00:00
Darren Reed
5bca461d6f 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 Wemm
0decb68047 Remove files not in the v3_3_8 import. 2000-02-10 05:09:52 +00:00
Peter Wemm
96c630d7b2 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 van Rooij
14f80d3d7b Import of ipfilter 3.3.8
Approved by: jkh
2000-02-09 20:46:45 +00:00
Guido van Rooij
0f94bd564f This commit was generated by cvs2svn to compensate for changes in r57093,
which included commits to RCS files with non-trunk default branches.
2000-02-09 20:46:45 +00:00
Guido van Rooij
23a0caaf86 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 van Rooij
c41766e97e This commit was generated by cvs2svn to compensate for changes in r55924,
which included commits to RCS files with non-trunk default branches.
2000-01-13 18:30:37 +00:00
Guido van Rooij
c9bff7ba93 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 van Rooij
ee665f5a80 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 Clayton
5d5b393b9f 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
Bill Fumerola
0bda8fea7a 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
Bill Fumerola
b91c4c930a 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 Price
53315286b9 Comment out empty "BUGS" section.
PR:		8121
Submitted by:	Norihiro Kumagai <kuma@jp.freebsd.org>
1998-12-10 02:47:05 +00:00
Steve Price
0518ce8c9f 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 Price
b1f9d316fb 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
Jacques Vidrine
8d05cc8419 vmunix -> kernel
PR:		port/8543
Submitted by:	jkb@best.com
1998-11-16 04:25:03 +00:00
Bruce Evans
234e2f5964 Fixed the type of a signal handler. 1998-10-17 14:47:00 +00:00
Peter Wemm
dd21baedfd Merge 3.2.3 -> 3.2.7 changes into mainline. 1998-06-20 18:43:25 +00:00
Peter Wemm
9b632708fe 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 Wemm
847a1ab264 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
Joseph Koshy
68bf8f9eea Spelling fixes.
Submitted by: Josh Gilliam <josh@quick.net>
PR: 6880
1998-06-08 06:12:02 +00:00
Steve Price
32c2131395 Fix a bunch of spelling errors.
PR:		6856
Submitted by:	Josh Gilliam <josh@quick.net>
1998-06-04 21:06:07 +00:00
Joseph Koshy
9595a75afa Spelling corrections.
PR: 6829
Submitted by: Josh Gilliam <josh@quick.net>
1998-06-03 04:21:41 +00:00
Peter Wemm
6314ca637f Some tweaks to get this to compile for the userland tools. 1998-03-21 13:39:11 +00:00
Peter Wemm
f4b66beedb Import ipfilter 3.2.3 1998-03-21 10:04:55 +00:00
Peter Wemm
d2e0bd41f7 This commit was generated by cvs2svn to compensate for changes in r34739,
which included commits to RCS files with non-trunk default branches.
1998-03-21 10:04:55 +00:00
Steve Price
978b87426f Remove one last /etc/sysconfig reference.
PR:		3460
Pointed out by:	hoek@FreeBSD.org
1997-12-27 20:00:13 +00:00
Peter Wemm
af5dd3181a Import ipfilter 3.2.1 (update from 3.1.8) 1997-11-16 04:52:19 +00:00
Darren Reed
acdb2ce24a Import version 3.2alpha7
(they're currently in src/contrib/ipfilter/ipfilter/ by mistake, if someone
 from core would like to delete that directory with three files as I'm not
 meant to do that :)
1997-05-25 15:49:17 +00:00
Darren Reed
0eab801c99 Import version 3.2alpha7 1997-05-25 15:45:04 +00:00
Darren Reed
5a1a935563 Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2 1997-04-03 10:22:02 +00:00
Peter Wemm
b182e52bf6 reimport ipfilter v3.1.8 to get it onto the vendor branch again. 1997-03-02 15:40:21 +00:00
Darren Reed
b4ebec5bf8 Import IP Filter v3.1.7 into FreeBSD tree 1997-02-09 22:50:16 +00:00