summaryrefslogtreecommitdiff
path: root/sys/arch/pmax/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-05-30 02:12:57 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-05-30 02:12:57 +0000
commitb15a5a165339d99f4dd696f22eb53227671e1b7c (patch)
treedf0e361f461c1f4de76c81e5b9dc791ba6768ec8 /sys/arch/pmax/conf
parentd818215253f2f1d16376a6482ac14c27f16520a1 (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/arch/pmax/conf')
-rw-r--r--sys/arch/pmax/conf/GENERIC4
-rw-r--r--sys/arch/pmax/conf/GENERIC.NFS4
-rw-r--r--sys/arch/pmax/conf/GENERIC.rz05
3 files changed, 4 insertions, 9 deletions
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 15e3b09b8f2..a0cf6153c72 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.21 2001/05/17 00:57:57 pvalchev Exp $
+# $OpenBSD: GENERIC,v 1.22 2001/05/30 02:12:21 deraadt Exp $
#
# GENERIC kernel for the distribition simpleroot
#
@@ -69,8 +69,6 @@ option KERNFS # kernel data-structure filesystem
#option ISO # osi networking
#option TPIP
#option EON
-option IPFILTER # IP packet filter for security
-option IPFILTER_LOG # use /dev/ipl to log IPF
# compat stuff
#option COMPAT_ULTRIX # ultrix compatibility
diff --git a/sys/arch/pmax/conf/GENERIC.NFS b/sys/arch/pmax/conf/GENERIC.NFS
index a3076892eb1..0d9df5c2ba6 100644
--- a/sys/arch/pmax/conf/GENERIC.NFS
+++ b/sys/arch/pmax/conf/GENERIC.NFS
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC.NFS,v 1.9 2001/05/17 00:57:57 pvalchev Exp $
+# $OpenBSD: GENERIC.NFS,v 1.10 2001/05/30 02:12:21 deraadt Exp $
#
# GENERIC netboot / nfs root + swap kernel for the distribition simpleroot
#
@@ -67,8 +67,6 @@ option KERNFS # kernel data-structure filesystem
#option ISO # osi networking
#option TPIP
#option EON
-option IPFILTER # IP packet filter for security
-option IPFILTER_LOG # use /dev/ipl to log IPF
# compat stuff
#option COMPAT_ULTRIX # ultrix compatibility
diff --git a/sys/arch/pmax/conf/GENERIC.rz0 b/sys/arch/pmax/conf/GENERIC.rz0
index e643f54d639..eda9aebe999 100644
--- a/sys/arch/pmax/conf/GENERIC.rz0
+++ b/sys/arch/pmax/conf/GENERIC.rz0
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC.rz0,v 1.9 2001/05/17 00:57:58 pvalchev Exp $
+# $OpenBSD: GENERIC.rz0,v 1.10 2001/05/30 02:12:21 deraadt Exp $
#
# GENERIC kernel for the distribition simpleroot with root + swap hardcoded
# to rz0 - required for use with zip drives for instance
@@ -68,8 +68,7 @@ option KERNFS # kernel data-structure filesystem
#option ISO # osi networking
#option TPIP
#option EON
-option IPFILTER # IP packet filter for security
-option IPFILTER_LOG # use /dev/ipl to log IPF
+
# compat stuff
#option COMPAT_ULTRIX # ultrix compatibility