From owner-cvs-all@FreeBSD.ORG Tue Jul 3 12:22:05 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 6C98416A421; Tue, 3 Jul 2007 12:22:05 +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 5DDBF13C4C1; Tue, 3 Jul 2007 12:22:05 +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 l63CM5GV040285; Tue, 3 Jul 2007 12:22:05 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l63CM5TI040284; Tue, 3 Jul 2007 12:22:05 GMT (envelope-from mlaier) Message-Id: <200707031222.l63CM5TI040284@repoman.freebsd.org> From: Max Laier Date: Tue, 3 Jul 2007 12:22:05 +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/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:22:05 -0000 mlaier 2007-07-03 12:22:04 UTC FreeBSD src repository src/contrib/pf - Imported sources Update of /home/ncvs/src/contrib/pf In directory repoman.freebsd.org:/tmp/cvs-serv40056 Log Message: Import pf userland from OpenBSD 4.1 and (for ftp-proxy) libevent 1.3b as a local lib. Status: Vendor Tag: OPENBSD Release Tags: pf_openbsd_4_1 N src/contrib/pf/ftp-proxy/filter.h C src/contrib/pf/ftp-proxy/ftp-proxy.c N src/contrib/pf/ftp-proxy/filter.c C src/contrib/pf/ftp-proxy/ftp-proxy.8 C src/contrib/pf/authpf/authpf.c C src/contrib/pf/authpf/authpf.8 U src/contrib/pf/authpf/pathnames.h N src/contrib/pf/tftp-proxy/filter.c N src/contrib/pf/tftp-proxy/tftp-proxy.c N src/contrib/pf/tftp-proxy/filter.h N src/contrib/pf/tftp-proxy/tftp-proxy.8 C src/contrib/pf/man/pf.conf.5 C src/contrib/pf/man/pf.os.5 C src/contrib/pf/man/pflog.4 C src/contrib/pf/man/pf.4 C src/contrib/pf/man/pfsync.4 N src/contrib/pf/libevent/event.h N src/contrib/pf/libevent/signal.c N src/contrib/pf/libevent/evsignal.h N src/contrib/pf/libevent/kqueue.c N src/contrib/pf/libevent/log.c N src/contrib/pf/libevent/evbuffer.c N src/contrib/pf/libevent/poll.c N src/contrib/pf/libevent/select.c N src/contrib/pf/libevent/buffer.c N src/contrib/pf/libevent/event.c N src/contrib/pf/libevent/event-internal.h N src/contrib/pf/libevent/log.h U src/contrib/pf/pflogd/privsep_fdpass.c C src/contrib/pf/pflogd/pflogd.c C src/contrib/pf/pflogd/privsep.c C src/contrib/pf/pflogd/pflogd.8 U src/contrib/pf/pflogd/pflogd.h C src/contrib/pf/pfctl/pfctl_altq.c U src/contrib/pf/pfctl/pfctl_qstats.c U src/contrib/pf/pfctl/pfctl_osfp.c C src/contrib/pf/pfctl/pfctl_optimize.c C src/contrib/pf/pfctl/pfctl_parser.h C src/contrib/pf/pfctl/pfctl.8 C src/contrib/pf/pfctl/pf_print_state.c C src/contrib/pf/pfctl/pfctl.h C src/contrib/pf/pfctl/pfctl_table.c C src/contrib/pf/pfctl/pfctl.c C src/contrib/pf/pfctl/pfctl_parser.c C src/contrib/pf/pfctl/parse.y U src/contrib/pf/pfctl/pfctl_radix.c 22 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD src/contrib/pf