From owner-svn-src-head@FreeBSD.ORG Wed Jun 10 20:44:13 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7542B1065673; Wed, 10 Jun 2009 20:44:13 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 49AE28FC12; Wed, 10 Jun 2009 20:44:13 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AKiD8V025320; Wed, 10 Jun 2009 20:44:13 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AKiDR8025319; Wed, 10 Jun 2009 20:44:13 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200906102044.n5AKiDR8025319@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 10 Jun 2009 20:44:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193949 - head/sys/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 20:44:13 -0000 Author: bz Date: Wed Jun 10 20:44:13 2009 New Revision: 193949 URL: http://svn.freebsd.org/changeset/base/193949 Log: IPsec depends on either IPv4 (inet) or IPv6 (inet6) so properly track dependencies and automatically disable building ipsec if neither of the two is in the kernel config. Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Jun 10 19:57:54 2009 (r193948) +++ head/sys/conf/files Wed Jun 10 20:44:13 2009 (r193949) @@ -2372,7 +2372,7 @@ netinet/ipfw/ip_fw_pfil.c optional ipfir netinet/ipfw/ip_fw_nat.c optional ipfirewall_nat netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet -netinet/ip_ipsec.c optional ipsec +netinet/ip_ipsec.c optional inet ipsec netinet/ip_mroute.c optional mrouting inet | mrouting inet6 netinet/ip_options.c optional inet netinet/ip_output.c optional inet @@ -2438,18 +2438,19 @@ netinet6/route6.c optional inet6 netinet6/scope6.c optional inet6 netinet6/sctp6_usrreq.c optional inet6 sctp netinet6/udp6_usrreq.c optional inet6 -netipsec/ipsec.c optional ipsec -netipsec/ipsec_input.c optional ipsec -netipsec/ipsec_mbuf.c optional ipsec -netipsec/ipsec_output.c optional ipsec -netipsec/key.c optional ipsec -netipsec/key_debug.c optional ipsec -netipsec/keysock.c optional ipsec -netipsec/xform_ah.c optional ipsec -netipsec/xform_esp.c optional ipsec -netipsec/xform_ipcomp.c optional ipsec -netipsec/xform_ipip.c optional ipsec -netipsec/xform_tcp.c optional ipsec tcp_signature +netipsec/ipsec.c optional ipsec inet | ipsec inet6 +netipsec/ipsec_input.c optional ipsec inet | ipsec inet6 +netipsec/ipsec_mbuf.c optional ipsec inet | ipsec inet6 +netipsec/ipsec_output.c optional ipsec inet | ipsec inet6 +netipsec/key.c optional ipsec inet | ipsec inet6 +netipsec/key_debug.c optional ipsec inet | ipsec inet6 +netipsec/keysock.c optional ipsec inet | ipsec inet6 +netipsec/xform_ah.c optional ipsec inet | ipsec inet6 +netipsec/xform_esp.c optional ipsec inet | ipsec inet6 +netipsec/xform_ipcomp.c optional ipsec inet | ipsec inet6 +netipsec/xform_ipip.c optional ipsec inet | ipsec inet6 +netipsec/xform_tcp.c optional ipsec inet tcp_signature | \ + ipsec inet6 tcp_signature netipx/ipx.c optional ipx netipx/ipx_cksum.c optional ipx netipx/ipx_input.c optional ipx