diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-05-30 02:12:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-05-30 02:12:57 +0000 |
| commit | b15a5a165339d99f4dd696f22eb53227671e1b7c (patch) | |
| tree | df0e361f461c1f4de76c81e5b9dc791ba6768ec8 /sys/conf | |
| parent | d818215253f2f1d16376a6482ac14c27f16520a1 (diff) | |
Remove ipf. Darren Reed has interpreted his (old, new, whichever)
licence in a way that makes ipf not free according to the rules we
established over 5 years ago, at www.openbsd.org/goals.html (and those
same basic rules govern the other *BSD projects too). Specifically,
Darren says that modified versions are not permitted. But software
which OpenBSD uses and redistributes must be free to all (be they
people or companies), for any purpose they wish to use it, including
modification, use, peeing on, or even integration into baby mulching
machines or atomic bombs to be dropped on Australia. Furthermore, we
know of a number of companies using ipf with modification like us, who
are now in the same situation, and we hope that some of them will work
with us to fill this gap that now exists in OpenBSD (temporarily, we
hope).
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/conf/files | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 5855f0bc42b..5abc542e1a2 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.75 2001/05/17 00:58:00 pvalchev Exp $ +# $OpenBSD: GENERIC,v 1.76 2001/05/30 02:12:22 deraadt Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -75,8 +75,6 @@ option IPSEC # IPsec #option EON # OSI tunneling over IP #option NETATALK # AppleTalk #option CCITT,LLC,HDLC # X.25 -option IPFILTER # IP packet filter for security -option IPFILTER_LOG # use /dev/ipl to log IPF option PPP_BSDCOMP # PPP BSD compression option PPP_DEFLATE #option MROUTING # Multicast router diff --git a/sys/conf/files b/sys/conf/files index 87fb7fb8914..bf5670f77ec 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.200 2001/05/15 02:40:34 millert Exp $ +# $OpenBSD: files,v 1.201 2001/05/30 02:12:22 deraadt Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -600,14 +600,6 @@ file netinet/tcp_timer.c inet file netinet/tcp_usrreq.c inet file netinet/udp_usrreq.c inet file netinet/ip_gre.c inet -file netinet/ip_fil.c ipfilter -file netinet/fil.c ipfilter -file netinet/ip_nat.c ipfilter -file netinet/ip_frag.c ipfilter -file netinet/ip_state.c ipfilter -file netinet/ip_proxy.c ipfilter -file netinet/ip_auth.c ipfilter -file netinet/ip_log.c ipfilter file netinet/ip_ipsp.c (inet | inet6) & (ipsec | tcp_signature) file netinet/ip_spd.c (inet | inet6) & (ipsec | tcp_signature) file netinet/ip_ipip.c inet | inet6 |