From owner-cvs-all@FreeBSD.ORG Tue Jul 3 12:06:04 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8B86916A41F; Tue, 3 Jul 2007 12:06:04 +0000 (UTC) (envelope-from mlaier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7901E13C48A; Tue, 3 Jul 2007 12:06:04 +0000 (UTC) (envelope-from mlaier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l63C645J038339; Tue, 3 Jul 2007 12:06:04 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l63C64Jw038338; Tue, 3 Jul 2007 12:06:04 GMT (envelope-from mlaier) Message-Id: <200707031206.l63C64Jw038338@repoman.freebsd.org> From: Max Laier Date: Tue, 3 Jul 2007 12:06:03 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: OPENBSD Cc: Subject: cvs commit: src/sys/contrib/pf - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 03 Jul 2007 12:06:04 -0000 mlaier 2007-07-03 12:06:03 UTC FreeBSD src repository src/sys/contrib/pf - Imported sources Update of /home/ncvs/src/sys/contrib/pf In directory repoman.freebsd.org:/tmp/cvs-serv38249 Log Message: Import pf from OpenBSD 4.1 Status: Vendor Tag: OPENBSD Release Tags: pf_openbsd_4_1 C src/sys/contrib/pf/net/if_pfsync.c C src/sys/contrib/pf/net/pf_ioctl.c C src/sys/contrib/pf/net/if_pflog.h C src/sys/contrib/pf/net/pfvar.h C src/sys/contrib/pf/net/if_pflog.c C src/sys/contrib/pf/net/if_pfsync.h C src/sys/contrib/pf/net/pf_norm.c C src/sys/contrib/pf/net/pf.c N src/sys/contrib/pf/net/pf_ruleset.c C src/sys/contrib/pf/net/pf_table.c C src/sys/contrib/pf/net/pf_osfp.c C src/sys/contrib/pf/net/pf_if.c U src/sys/contrib/pf/netinet/in4_cksum.c 11 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf