| #
369277 |
|
16-Feb-2021 |
cy |
MFC 57785538c6e0d7e8ca0f161ab95bae10fd304047 and
1e811efbc591699b872bea42b9de419c373199df:
57785538c6e0d7e8ca0f161ab95bae10fd304047)
Simplify the FreeBSD check using __FreeBSD__ compiler macro.
Rather than rely on __FreeBSD_version, defined in sys/param.h, use
__FreeBSD__ defined by the compiler.
Reported by: emaste
MFC after: 1 week
(cherry picked from commit 57785538c6e0d7e8ca0f161ab95bae10fd304047)
1e811efbc591699b872bea42b9de419c373199df:
Fix non-IPv6 build post 57785538c6e0d7e8ca0f161ab95bae10fd304047.
57785538c6e0d7e8ca0f161ab95bae10fd304047 change the test for FreeBSD
from __FreeBSD_version to __FreeBSD__. However this test was performed
before sys/param.h was included, therefore __FreeBSD_version was never
defined. As the test was never true opt_random_ip_id.h was never included.
Submitted by: bdragon
Reported by: bdragon
(cherry picked from commit 1e811efbc591699b872bea42b9de419c373199df)
Git Hash: 62607e8680e944f89cd7b5b7bca10698c66908b2
Git Author: cy@FreeBSD.org
|
| #
369274 |
|
16-Feb-2021 |
cy |
MFC 10990cb46027b4cc4339540b1217117863b2cd15:
Simplify FreeBSD check.
(cherry picked from commit 10990cb46027b4cc4339540b1217117863b2cd15)
Git Hash: 466d2c6aa08d17d2a8617242529ee0657e763e5f
Git Author: cy@FreeBSD.org
|
| #
369273 |
|
16-Feb-2021 |
cy |
MFC e673debe7db8ba95e4ee3b549d2570e71d19b596:
Simplify BSD macro tests.
All FreeBSD and NetBSD are BSD >= 199306 and have been for a long time.
(cherry picked from commit e673debe7db8ba95e4ee3b549d2570e71d19b596)
Git Hash: ba6bb2487a7e159556d8ef9ba773fb4fa65dd823
Git Author: cy@FreeBSD.org
|
| #
302408 |
|
07-Jul-2016 |
gjb |
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 merged
here.
Additional commits post-branch will follow.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation |
| #
288683 |
|
05-Oct-2015 |
ngie |
Revert r288682
I meant to do this on ^/user/ngie/more-tests
Pointyhat to: ngie (use svn info next time...)
|
| #
255332 |
|
06-Sep-2013 |
cy |
Update ipfilter 4.1.28 --> 5.1.2.
Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)
|
| #
204925 |
|
09-Mar-2010 |
ed |
Remove unneeded include of <sys/timeb.h>.
This header file should not be included by anything.
|
| #
191490 |
|
25-Apr-2009 |
bz |
Remove udp and tcp includes not needed here.
Tripped over by: a compile of an upcoming change
MFC after: 1 month
|
| #
161357 |
|
16-Aug-2006 |
guido |
Resolve conflicts
MFC after: 1 weeks
|
| #
153881 |
|
30-Dec-2005 |
guido |
Resolve conflicts (and believe me...you don't want to know).
|
| #
145519 |
|
25-Apr-2005 |
darrenr |
* 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.
|
| #
92691 |
|
19-Mar-2002 |
darrenr |
fix conflicts generated by import, completing import of ipf3.4.25
|
| #
80490 |
|
28-Jul-2001 |
darrenr |
fix conflicts created by import
|
| #
57109 |
|
10-Feb-2000 |
peter |
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.
|
| #
34752 |
|
21-Mar-1998 |
peter |
Some tweaks to get this to compile for the userland tools.
|
| #
31184 |
|
16-Nov-1997 |
peter |
This commit was generated by cvs2svn to compensate for changes in r31183,
which included commits to RCS files with non-trunk default branches.
|
| #
31183 |
|
16-Nov-1997 |
peter |
Import ipfilter 3.2.1 (update from 3.1.8)
|
| #
24583 |
|
03-Apr-1997 |
darrenr |
Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2
|
| #
22514 |
|
09-Feb-1997 |
darrenr |
Import IP Filter v3.1.7 into FreeBSD tree
|