From owner-cvs-all@FreeBSD.ORG Thu Jun 17 16:53:29 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5010E16A4CE; Thu, 17 Jun 2004 16:53:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49D5643D1F; Thu, 17 Jun 2004 16:53:29 +0000 (GMT) (envelope-from mlaier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5HGqbD8037300; Thu, 17 Jun 2004 16:52:37 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5HGqaTr037299; Thu, 17 Jun 2004 16:52:36 GMT (envelope-from mlaier) Message-Id: <200406171652.i5HGqaTr037299@repoman.freebsd.org> From: Max Laier Date: Thu, 17 Jun 2004 16:52:36 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: OPENBSD Subject: cvs commit: src/sys/contrib/pf/net - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2004 16:53:29 -0000 mlaier 2004-06-17 16:52:35 UTC FreeBSD src repository src/sys/contrib/pf/net - Imported sources Update of /home/ncvs/src/sys/contrib/pf/net In directory repoman.freebsd.org:/tmp/cvs-serv36617 Log Message: Import OpenBSD stable branch. Status: Vendor Tag: OPENBSD Release Tags: pf_openbsd_3_5_001 U src/sys/contrib/pf/net/pf_if.c U src/sys/contrib/pf/net/if_pflog.h U src/sys/contrib/pf/net/if_pfsync.c U src/sys/contrib/pf/net/if_pfsync.h C src/sys/contrib/pf/net/pf.c C src/sys/contrib/pf/net/pf_ioctl.c C src/sys/contrib/pf/net/pf_norm.c U src/sys/contrib/pf/net/pf_osfp.c U src/sys/contrib/pf/net/pf_table.c U src/sys/contrib/pf/net/pfvar.h U src/sys/contrib/pf/net/if_pflog.c 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf/net