From owner-cvs-src@FreeBSD.ORG Thu Oct 18 21:42:54 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4BD016A41B; Thu, 18 Oct 2007 21:42:54 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D454613C469; Thu, 18 Oct 2007 21:42:54 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ILgs8J015589; Thu, 18 Oct 2007 21:42:54 GMT (envelope-from darrenr@repoman.freebsd.org) Received: (from darrenr@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ILgsGd015588; Thu, 18 Oct 2007 21:42:54 GMT (envelope-from darrenr) Message-Id: <200710182142.l9ILgsGd015588@repoman.freebsd.org> From: Darren Reed Date: Thu, 18 Oct 2007 21:42:54 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: DARRENR Cc: Subject: cvs commit: src/sys/contrib/ipfilter/netinet - Imported sources X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2007 21:42:55 -0000 darrenr 2007-10-18 21:42:54 UTC FreeBSD src repository src/sys/contrib/ipfilter/netinet - Imported sources Update of /home/ncvs/src/sys/contrib/ipfilter/netinet In directory repoman.freebsd.org:/tmp/cvs-serv15525 Log Message: Import IPFilter 4.1.28 Status: Vendor Tag: DARRENR Release Tags: v4-1-28 C src/sys/contrib/ipfilter/netinet/ip_nat.h C src/sys/contrib/ipfilter/netinet/ip_fil.h C src/sys/contrib/ipfilter/netinet/ip_sync.c U src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c U src/sys/contrib/ipfilter/netinet/QNX_OCL.txt U src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c C src/sys/contrib/ipfilter/netinet/fil.c U src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c C src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c C src/sys/contrib/ipfilter/netinet/ip_htable.c U src/sys/contrib/ipfilter/netinet/ip_pool.h C src/sys/contrib/ipfilter/netinet/ip_state.c U src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c U src/sys/contrib/ipfilter/netinet/ip_auth.h C src/sys/contrib/ipfilter/netinet/ip_log.c U src/sys/contrib/ipfilter/netinet/ip_lookup.c C src/sys/contrib/ipfilter/netinet/ipl.h C src/sys/contrib/ipfilter/netinet/ip_proxy.c U src/sys/contrib/ipfilter/netinet/ip_scan.c U src/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE U src/sys/contrib/ipfilter/netinet/ip_frag.h U src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c U src/sys/contrib/ipfilter/netinet/ip_htable.h U src/sys/contrib/ipfilter/netinet/ip_pool.c C src/sys/contrib/ipfilter/netinet/ip_state.h C src/sys/contrib/ipfilter/netinet/ip_auth.c C src/sys/contrib/ipfilter/netinet/mlfk_ipl.c U src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c C src/sys/contrib/ipfilter/netinet/ip_nat.c U src/sys/contrib/ipfilter/netinet/ip_sync.h U src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c C src/sys/contrib/ipfilter/netinet/ip_compat.h C src/sys/contrib/ipfilter/netinet/ip_frag.c U src/sys/contrib/ipfilter/netinet/ip_scan.h U src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c U src/sys/contrib/ipfilter/netinet/ip_lookup.h U src/sys/contrib/ipfilter/netinet/ip_proxy.h 16 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDARRENR:yesterday -jDARRENR src/sys/contrib/ipfilter/netinet