Received: by mail.netbsd.org (Postfix, from userid 605) id 6314914A389; Mon, 30 Jan 2012 16:05:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 13DD314A380 for ; Mon, 30 Jan 2012 16:05:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id N9jdFs-dVgCb for ; Mon, 30 Jan 2012 16:05:36 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 7998514A2BA for ; Mon, 30 Jan 2012 16:05:36 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id C5F42175DD; Mon, 30 Jan 2012 16:05:36 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Mon, 30 Jan 2012 16:05:36 +0000 From: "Darren Reed" Subject: CVS commit: src/sys/dist/ipf To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20120130160536.C5F42175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Darren Reed" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: darrenr Date: Mon Jan 30 16:05:36 UTC 2012 Update of /cvsroot/src/sys/dist/ipf In directory ivanova.netbsd.org:/tmp/cvs-serv15716 Log Message: Import IPFilter 5.1.1 Status: Vendor Tag: DARRENR Release Tags: v5-1-1 C src/sys/dist/ipf/netinet/ip_pptp_pxy.c C src/sys/dist/ipf/netinet/ip_raudio_pxy.c N src/sys/dist/ipf/netinet/ip_dstlist.c C src/sys/dist/ipf/netinet/ip_frag.h C src/sys/dist/ipf/netinet/ip_state.c N src/sys/dist/ipf/netinet/ip_tftp_pxy.c C src/sys/dist/ipf/netinet/ip_lookup.c C src/sys/dist/ipf/netinet/ip_fil_compat.c C src/sys/dist/ipf/netinet/ip_h323_pxy.c C src/sys/dist/ipf/netinet/ip_scan.c C src/sys/dist/ipf/netinet/ip_pool.h C src/sys/dist/ipf/netinet/ip_auth.h N src/sys/dist/ipf/netinet/radix_ipf.h C src/sys/dist/ipf/netinet/ip_log.c C src/sys/dist/ipf/netinet/ip_fil_netbsd.c C src/sys/dist/ipf/netinet/ip_irc_pxy.c N src/sys/dist/ipf/netinet/ip_nat6.c C src/sys/dist/ipf/netinet/ip_rpcb_pxy.c C src/sys/dist/ipf/netinet/ip_ftp_pxy.c C src/sys/dist/ipf/netinet/ip_proxy.c C src/sys/dist/ipf/netinet/ip_nat.h C src/sys/dist/ipf/netinet/ipl.h C src/sys/dist/ipf/netinet/ip_fil.h C src/sys/dist/ipf/netinet/ip_sync.c C src/sys/dist/ipf/netinet/ip_htable.c C src/sys/dist/ipf/netinet/ip_ipsec_pxy.c C src/sys/dist/ipf/netinet/ip_scan.h C src/sys/dist/ipf/netinet/ip_compat.h C src/sys/dist/ipf/netinet/ip_lookup.h N src/sys/dist/ipf/netinet/ip_dstlist.h C src/sys/dist/ipf/netinet/ip_frag.c C src/sys/dist/ipf/netinet/ip_state.h C src/sys/dist/ipf/netinet/ip_htable.h N src/sys/dist/ipf/netinet/ipf_rb.h C src/sys/dist/ipf/netinet/ip_proxy.h C src/sys/dist/ipf/netinet/ip_nat.c N src/sys/dist/ipf/netinet/ip_dns_pxy.c C src/sys/dist/ipf/netinet/ip_sync.h C src/sys/dist/ipf/netinet/ip_netbios_pxy.c C src/sys/dist/ipf/netinet/fil.c C src/sys/dist/ipf/netinet/ip_pool.c C src/sys/dist/ipf/netinet/ip_auth.c N src/sys/dist/ipf/netinet/radix_ipf.c C src/sys/dist/ipf/netinet/ip_rcmd_pxy.c 36 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDARRENR:yesterday -jDARRENR src/sys/dist/ipf