From owner-cvs-src@FreeBSD.ORG  Thu Mar 23 10:18:17 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 A233F16A41F;
	Thu, 23 Mar 2006 10:18:17 +0000 (UTC)
	(envelope-from maxim@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 58AC643D48;
	Thu, 23 Mar 2006 10:18:17 +0000 (GMT)
	(envelope-from maxim@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 k2NAIHZr061658;
	Thu, 23 Mar 2006 10:18:17 GMT
	(envelope-from maxim@repoman.freebsd.org)
Received: (from maxim@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NAIHsK061657;
	Thu, 23 Mar 2006 10:18:17 GMT (envelope-from maxim)
Message-Id: <200603231018.k2NAIHsK061657@repoman.freebsd.org>
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Thu, 23 Mar 2006 10:18:16 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4_8
Cc: 
Subject: cvs commit: src UPDATING src/contrib/opie opiepasswd.c
 src/sys/conf newvers.sh src/sys/netipsec xform_esp.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: Thu, 23 Mar 2006 10:18:17 -0000

maxim       2006-03-23 10:18:16 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4_8)
    .                    UPDATING 
    contrib/opie         opiepasswd.c 
    sys/conf             newvers.sh 
    sys/netipsec         xform_esp.c 
  Log:
  o Merge SA-06:11.ipsec, SA-06:12.opie.
  
  Approved by:    so (cperciva)
  
  Revision         Changes    Path
  1.73.2.80.2.43   +7 -0      src/UPDATING
  1.1.1.2.6.3.4.1  +9 -2      src/contrib/opie/opiepasswd.c
  1.44.2.29.2.40   +1 -1      src/sys/conf/newvers.sh
  1.2.2.2.2.1      +17 -0     src/sys/netipsec/xform_esp.c