From owner-cvs-src@FreeBSD.ORG  Wed Mar  1 21:40:15 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 737AA16A420;
	Wed,  1 Mar 2006 21:40:15 +0000 (GMT)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F13843D5E;
	Wed,  1 Mar 2006 21:40:15 +0000 (GMT)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k21LeFBj073677;
	Wed, 1 Mar 2006 21:40:15 GMT
	(envelope-from wkoszek@repoman.freebsd.org)
Received: (from wkoszek@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21LeFAm073676;
	Wed, 1 Mar 2006 21:40:15 GMT (envelope-from wkoszek)
Message-Id: <200603012140.k21LeFAm073676@repoman.freebsd.org>
From: "Wojciech A. Koszek" <wkoszek@FreeBSD.org>
Date: Wed, 1 Mar 2006 21:40:14 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/modules Makefile src/sys/modules/crypto
 Makefile src/sys/modules/if_ppp Makefile src/sys/net ppp_deflate.c
 src/sys/opencrypto cryptodev.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Mar 2006 21:40:15 -0000

wkoszek     2006-03-01 21:40:14 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/modules          Makefile 
    sys/modules/crypto   Makefile 
    sys/modules/if_ppp   Makefile 
    sys/net              ppp_deflate.c 
    sys/opencrypto       cryptodev.c 
  Log:
  MFC:
    Connect zlib to the build.
  
    This patch fixes a problem, which exists if you have IPSEC in your kernel
    and want to have crypto support loaded as KLD. By moving zlib to separate
    module and adding MODULE_DEPEND directives, it is possible to use such
    configuration without complication. Otherwise, since IPSEC is linked with
    zlib (just like crypto.ko) you'll get following error:
  
            interface zlib.1 already present in the KLD 'kernel'!
  
    Approved by:    cognet (mentor)
  
  Approved by:    re (scottl)
  
  Revision    Changes    Path
  1.450.2.10  +2 -1      src/sys/modules/Makefile
  1.3.2.1     +0 -2      src/sys/modules/crypto/Makefile
  1.33.2.2    +1 -1      src/sys/modules/if_ppp/Makefile
  1.21.2.1    +2 -0      src/sys/net/ppp_deflate.c
  1.25.2.2    +1 -0      src/sys/opencrypto/cryptodev.c