Commit graph

65 commits

Author SHA1 Message Date
Bruce Evans 62601deb33 Fixed corruption of the vendor $Id$ to $FreeBSD$. Put $FreeBSD$ in
__FBSDID() and ifdefed away all vendor id stuff.

This file should never have left the vendor branch; it is now identical
with the vendor's version except for id fiddling.
2001-10-12 15:05:00 +00:00
Bruce Evans 6eabd84580 Compensate for "Compensate for header dethreading" by backing it out. 2001-10-10 17:48:44 +00:00
Darren Reed 7d2bc5ce77 fix conflicts created by import 2001-07-28 12:08:15 +00:00
Darren Reed 7d3ce0223a 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
Darren Reed dba82da1c8 Import IPFilter version 3.4.20 2001-07-28 11:59:33 +00:00
Darren Reed 56ff60d17c This commit was generated by cvs2svn to compensate for changes in r80484,
which included commits to RCS files with non-trunk default branches.
2001-07-28 11:59:32 +00:00
Darren Reed dd298e2f03 Import IPFilter version 3.4.20 2001-07-28 11:59:32 +00:00
Ruslan Ermilov 7879537eee Removed duplicate copies of files already present in sys/contrib/ipfilter.
Not objected to by:	-arch
2001-06-18 15:54:04 +00:00
Mark Murray 2888dd72bf Compensate for dethreaded headers.
(I have no religion about how this was done. Follow-up commits welcome)
2001-05-01 09:02:06 +00:00
Darren Reed f590526d0a fix conflicts 2001-02-04 14:26:56 +00:00
Darren Reed 84822a3b55 Import IP Filter update 2001-02-04 14:25:38 +00:00
Darren Reed ddd584a728 This commit was generated by cvs2svn to compensate for changes in r72003,
which included commits to RCS files with non-trunk default branches.
2001-02-04 14:25:38 +00:00
Alfred Perlstein 5af128b21e Adapt to new struct kinfo_proc and unbreak world.
Apologies to: darrenr who is maintainer
2000-12-14 23:35:57 +00:00
Darren Reed c91fbe3bb4 fix conflicts created by import 2000-10-29 08:08:32 +00:00
Darren Reed 801aabae69 Import IP Filter 3.4.13 into src/contrib, not src/contirb 2000-10-29 08:07:08 +00:00
Darren Reed 2bd1292fe1 This commit was generated by cvs2svn to compensate for changes in r67855,
which included commits to RCS files with non-trunk default branches.
2000-10-29 08:07:08 +00:00
Darren Reed 33fe2fbd37 fix conflicts from rcsids 2000-10-26 12:47:40 +00:00
Darren Reed 7aba7e7040 Import IP Filter 3.4.12 2000-10-26 12:45:54 +00:00
Darren Reed c5de53b9a7 This commit was generated by cvs2svn to compensate for changes in r67615,
which included commits to RCS files with non-trunk default branches.
2000-10-26 12:45:54 +00:00
Darren Reed 561e006b67 resolve conflicts 2000-08-13 05:00:44 +00:00
Darren Reed f345cd2b83 Import base ipfilter 3.4.9 into contrib dir. 2000-08-13 04:58:02 +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 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