Date: Tue, 3 Jul 2007 12:39:51 +0000 (UTC) From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: Max Laier <mlaier@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/pf - Imported sources Message-ID: <20070703123857.L31116@maildrop.int.zabbadoz.net> In-Reply-To: <200707031222.l63CM5TI040284@repoman.freebsd.org> References: <200707031222.l63CM5TI040284@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 3 Jul 2007, Max Laier wrote: > 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 though it looks this is private to pf why did you decide to import (parts of) libevent? > 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 > > -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT Software is harder than hardware so better get it right the first time.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070703123857.L31116>