From owner-cvs-all@FreeBSD.ORG  Sun Mar 28 11:31:49 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 8989916A4CE; Sun, 28 Mar 2004 11:31:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 830EA43D1F; Sun, 28 Mar 2004 11:31:49 -0800 (PST)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2SJVnGe086559;
	Sun, 28 Mar 2004 11:31:49 -0800 (PST)
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2SJVnQc086555;
	Sun, 28 Mar 2004 11:31:49 -0800 (PST)
	(envelope-from mlaier)
Message-Id: <200403281931.i2SJVnQc086555@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Sun, 28 Mar 2004 11:31:49 -0800 (PST)
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 - 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 <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Mar 2004 19:31:49 -0000

mlaier      2004/03/28 11:31:49 PST

  FreeBSD src repository

  src/sys/contrib/pf - Imported sources
  Update of /home/ncvs/src/sys/contrib/pf
  In directory repoman.freebsd.org:/tmp/cvs-serv85327
  
  Log Message:
  Import two fixes from OpenBSD's stable branch:
  - Fix binat for incoming connections when a netblock (not just a single
    address) is used for source in the binat rule. closes PR 3535, reported by
    Karl O.Pinc. ok henning@, cedric@
  
  - Fix a problem related to empty anchor rulesets, which could cause a kernel
    panic.
  
  Approved by:	bms(mentor)
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_4_001
  		
  U src/sys/contrib/pf/net/if_pflog.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
  U 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/netinet/in4_cksum.c
  
  2 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf