diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/conf/files | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 19280c08aac..a7bfd10454e 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.89 2001/07/06 14:00:30 jjbg Exp $ +# $OpenBSD: files.i386,v 1.90 2001/08/08 15:15:28 jjbg Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -38,7 +38,7 @@ file arch/i386/i386/sys_machdep.c file arch/i386/i386/trap.c file arch/i386/i386/vm_machdep.c file arch/i386/i386/dkcsum.c bios -file lib/libz/adler32.c !ppp_deflate & !ipcomp +file lib/libz/adler32.c !ppp_deflate & !ipsec file dev/cons.c file dev/cninit.c file arch/i386/i386/wscons_machdep.c diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 0511c71f46d..f6e25056ce8 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.82 2001/07/06 17:40:35 angelos Exp $ +# $OpenBSD: GENERIC,v 1.83 2001/08/08 15:15:28 jjbg Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -75,7 +75,6 @@ option IPSEC # IPsec option PPP_BSDCOMP # PPP BSD compression option PPP_DEFLATE #option MROUTING # Multicast router -#option IPCOMP # IPComp, requires IPsec pseudo-device pf 1 # packet filter pseudo-device pflog 1 # pf log if diff --git a/sys/conf/files b/sys/conf/files index ade27a48576..9c553a09e2a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.218 2001/08/03 15:15:09 mickey Exp $ +# $OpenBSD: files,v 1.219 2001/08/08 15:15:28 jjbg Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -569,7 +569,7 @@ file net/if_ppp.c ppp needs-count file net/ppp_tty.c ppp file net/bsd-comp.c ppp_bsdcomp file net/ppp-deflate.c ppp_deflate -file net/zlib.c ppp_deflate | ipcomp +file net/zlib.c ppp_deflate | ipsec file net/if_tokensubr.c token needs-flag file net/if_tun.c tun needs-count file net/if_bridge.c bridge needs-count @@ -632,7 +632,7 @@ file netinet/ipsec_input.c (inet | inet6) & ipsec file netinet/ipsec_output.c (inet | inet6) & ipsec file netinet/ip_esp.c inet & ipsec file netinet/ip_ah.c inet & ipsec -file netinet/ip_ipcomp.c inet & ipsec & ipcomp +file netinet/ip_ipcomp.c inet & ipsec file crypto/rijndael.c (inet & ipsec) | crypto | uvm_swap_encrypt file crypto/rmd160.c (inet & ipsec) | crypto file crypto/sha1.c (inet & ipsec) | crypto @@ -648,7 +648,7 @@ file crypto/criov.c (inet & ipsec) | crypto file crypto/cryptosoft.c (inet & ipsec) | crypto file crypto/cryptombuf.c (inet & ipsec) | crypto file crypto/xform.c (inet & ipsec) | crypto -file crypto/deflate.c ipcomp & crypto +file crypto/deflate.c (inet & ipsec) | crypto file netatalk/aarp.c netatalk file netatalk/at_control.c netatalk file netatalk/at_proto.c netatalk |