From owner-cvs-all@FreeBSD.ORG Mon Jun 21 22:48:02 2004 Return-Path: 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 1008D16A4CE; Mon, 21 Jun 2004 22:48:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0628843D54; Mon, 21 Jun 2004 22:48:02 +0000 (GMT) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5LMm1Is053434; Mon, 21 Jun 2004 22:48:01 GMT (envelope-from darrenr@repoman.freebsd.org) Received: (from darrenr@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5LMm1Q8053433; Mon, 21 Jun 2004 22:48:01 GMT (envelope-from darrenr) Message-Id: <200406212248.i5LMm1Q8053433@repoman.freebsd.org> From: Darren Reed Date: Mon, 21 Jun 2004 22:48:01 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: DARRENR Subject: cvs commit: src/contrib/ipfilter - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 22:48:02 -0000 darrenr 2004-06-21 22:48:01 UTC FreeBSD src repository src/contrib/ipfilter - Imported sources Update of /home/ncvs/src/contrib/ipfilter In directory repoman.freebsd.org:/tmp/cvs-serv53412 Log Message: Import ipfilter 3.4.35 onto vendor branch Status: Vendor Tag: DARRENR Release Tags: v3-4-35 U src/contrib/ipfilter/BNF U src/contrib/ipfilter/BugReport U src/contrib/ipfilter/FAQ.FreeBSD U src/contrib/ipfilter/HISTORY U src/contrib/ipfilter/IMPORTANT U src/contrib/ipfilter/INST.FreeBSD-2.2 U src/contrib/ipfilter/INSTALL.FreeBSD U src/contrib/ipfilter/INSTALL.xBSD U src/contrib/ipfilter/IPF.KANJI U src/contrib/ipfilter/IPFILTER.LICENCE C src/contrib/ipfilter/Makefile U src/contrib/ipfilter/NAT.FreeBSD U src/contrib/ipfilter/QNX_OCL.txt U src/contrib/ipfilter/README U src/contrib/ipfilter/UPGRADE_NOTICE U src/contrib/ipfilter/Y2K U src/contrib/ipfilter/bpf.h U src/contrib/ipfilter/bsdinstall U src/contrib/ipfilter/common.c U src/contrib/ipfilter/facpri.c U src/contrib/ipfilter/facpri.h C src/contrib/ipfilter/fil.c U src/contrib/ipfilter/fils.c U src/contrib/ipfilter/inet_addr.c C src/contrib/ipfilter/ip_auth.c U src/contrib/ipfilter/ip_auth.h C src/contrib/ipfilter/ip_compat.h C src/contrib/ipfilter/ip_fil.c C src/contrib/ipfilter/ip_fil.h C src/contrib/ipfilter/ip_frag.c C src/contrib/ipfilter/ip_frag.h C src/contrib/ipfilter/ip_ftp_pxy.c U src/contrib/ipfilter/ip_h323_pxy.c U src/contrib/ipfilter/ip_ipsec_pxy.c U src/contrib/ipfilter/ip_lfil.c C src/contrib/ipfilter/ip_log.c C src/contrib/ipfilter/ip_nat.c C src/contrib/ipfilter/ip_nat.h U src/contrib/ipfilter/ip_netbios_pxy.c U src/contrib/ipfilter/ip_proxy.c U src/contrib/ipfilter/ip_proxy.h C src/contrib/ipfilter/ip_raudio_pxy.c C src/contrib/ipfilter/ip_rcmd_pxy.c U src/contrib/ipfilter/ip_sfil.c C src/contrib/ipfilter/ip_state.c C src/contrib/ipfilter/ip_state.h U src/contrib/ipfilter/ipf.c U src/contrib/ipfilter/ipf.h U src/contrib/ipfilter/ipfs.c U src/contrib/ipfilter/ipft_ef.c U src/contrib/ipfilter/ipft_hx.c U src/contrib/ipfilter/ipft_pc.c U src/contrib/ipfilter/ipft_sn.c U src/contrib/ipfilter/ipft_td.c U src/contrib/ipfilter/ipft_tx.c C src/contrib/ipfilter/ipl.h C src/contrib/ipfilter/ipmon.c U src/contrib/ipfilter/ipnat.c U src/contrib/ipfilter/ipt.c U src/contrib/ipfilter/ipt.h U src/contrib/ipfilter/kmem.c U src/contrib/ipfilter/kmem.h U src/contrib/ipfilter/misc.c U src/contrib/ipfilter/mkfilters U src/contrib/ipfilter/ml_ipl.c U src/contrib/ipfilter/mlf_ipl.c U src/contrib/ipfilter/mlfk_ipl.c U src/contrib/ipfilter/mli_ipl.c U src/contrib/ipfilter/mln_ipl.c U src/contrib/ipfilter/mls_ipl.c U src/contrib/ipfilter/natparse.c U src/contrib/ipfilter/opt.c U src/contrib/ipfilter/parse.c U src/contrib/ipfilter/pcap.h U src/contrib/ipfilter/printnat.c U src/contrib/ipfilter/relay.c U src/contrib/ipfilter/printstate.c U src/contrib/ipfilter/snoop.h U src/contrib/ipfilter/todo U src/contrib/ipfilter/BSD/Makefile U src/contrib/ipfilter/BSD/Makefile.ipsend U src/contrib/ipfilter/BSD/kupgrade U src/contrib/ipfilter/BSD/make-devices U src/contrib/ipfilter/FWTK/Index U src/contrib/ipfilter/FWTK/README U src/contrib/ipfilter/FWTK/README.ipfilter U src/contrib/ipfilter/FWTK/ftp-gw.diff U src/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt U src/contrib/ipfilter/FWTK/fwtk_transparent.diff U src/contrib/ipfilter/FWTK/fwtkp U src/contrib/ipfilter/FWTK/tproxy.diff U src/contrib/ipfilter/FreeBSD/conf.c.diffs U src/contrib/ipfilter/FreeBSD/files.diffs U src/contrib/ipfilter/FreeBSD/files.newconf.diffs U src/contrib/ipfilter/FreeBSD/files.oldconf.diffs U src/contrib/ipfilter/FreeBSD/filez.diffs U src/contrib/ipfilter/FreeBSD/in_proto.c.diffs U src/contrib/ipfilter/FreeBSD/ip_input.c.diffs U src/contrib/ipfilter/FreeBSD/ip_output.c.diffs U src/contrib/ipfilter/FreeBSD/kinstall U src/contrib/ipfilter/FreeBSD/minstall U src/contrib/ipfilter/FreeBSD/unkinstall U src/contrib/ipfilter/FreeBSD/unminstall U src/contrib/ipfilter/FreeBSD-2.2/files.diffs U src/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs U src/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs U src/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs U src/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs U src/contrib/ipfilter/FreeBSD-2.2/kinstall U src/contrib/ipfilter/FreeBSD-2.2/minstall U src/contrib/ipfilter/FreeBSD-2.2/unkinstall U src/contrib/ipfilter/FreeBSD-2.2/unminstall U src/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 U src/contrib/ipfilter/FreeBSD-3/kinstall U src/contrib/ipfilter/FreeBSD-3/unkinstall U src/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4 U src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 U src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 U src/contrib/ipfilter/FreeBSD-4.0/kinstall U src/contrib/ipfilter/FreeBSD-4.0/unkinstall U src/contrib/ipfilter/etc/protocols U src/contrib/ipfilter/etc/services U src/contrib/ipfilter/iplang/BNF U src/contrib/ipfilter/iplang/Makefile U src/contrib/ipfilter/iplang/iplang.h U src/contrib/ipfilter/iplang/iplang.tst U src/contrib/ipfilter/iplang/iplang_l.l U src/contrib/ipfilter/iplang/iplang_y.y U src/contrib/ipfilter/ipsd/Makefile U src/contrib/ipfilter/ipsd/README U src/contrib/ipfilter/ipsd/ipsd.c U src/contrib/ipfilter/ipsd/ipsd.h U src/contrib/ipfilter/ipsd/ipsdr.c U src/contrib/ipfilter/ipsd/linux.h U src/contrib/ipfilter/ipsd/sbpf.c U src/contrib/ipfilter/ipsd/sdlpi.c U src/contrib/ipfilter/ipsd/slinux.c U src/contrib/ipfilter/ipsd/snit.c U src/contrib/ipfilter/ipsd/Celler/ip_compat.h U src/contrib/ipfilter/ipsend/44arp.c U src/contrib/ipfilter/ipsend/Crashable U src/contrib/ipfilter/ipsend/Makefile U src/contrib/ipfilter/ipsend/README U src/contrib/ipfilter/ipsend/arp.c U src/contrib/ipfilter/ipsend/dlcommon.c U src/contrib/ipfilter/ipsend/dltest.h U src/contrib/ipfilter/ipsend/hpux.c U src/contrib/ipfilter/ipsend/in_var.h U src/contrib/ipfilter/ipsend/ip.c U src/contrib/ipfilter/ipsend/ip_var.h U src/contrib/ipfilter/ipsend/ipresend.1 U src/contrib/ipfilter/ipsend/ipresend.c U src/contrib/ipfilter/ipsend/ipsend.1 C src/contrib/ipfilter/ipsend/ipsend.5 C src/contrib/ipfilter/ipsend/ipsend.c U src/contrib/ipfilter/ipsend/ipsend.h U src/contrib/ipfilter/ipsend/ipsopt.c U src/contrib/ipfilter/ipsend/iptest.1 U src/contrib/ipfilter/ipsend/iptest.c U src/contrib/ipfilter/ipsend/iptests.c U src/contrib/ipfilter/ipsend/larp.c U src/contrib/ipfilter/ipsend/linux.h U src/contrib/ipfilter/ipsend/lsock.c U src/contrib/ipfilter/ipsend/resend.c U src/contrib/ipfilter/ipsend/sbpf.c U src/contrib/ipfilter/ipsend/sdlpi.c U src/contrib/ipfilter/ipsend/sirix.c U src/contrib/ipfilter/ipsend/slinux.c U src/contrib/ipfilter/ipsend/snit.c U src/contrib/ipfilter/ipsend/sock.c U src/contrib/ipfilter/ipsend/tcpip.h U src/contrib/ipfilter/ipsend/ultrix.c U src/contrib/ipfilter/ipsend/.OLD/ip_compat.h U src/contrib/ipfilter/l4check/Makefile U src/contrib/ipfilter/l4check/http.check U src/contrib/ipfilter/l4check/http.ok U src/contrib/ipfilter/l4check/l4check.c U src/contrib/ipfilter/l4check/l4check.conf U src/contrib/ipfilter/man/Makefile U src/contrib/ipfilter/man/ipf.4 C src/contrib/ipfilter/man/ipf.5 C src/contrib/ipfilter/man/ipf.8 U src/contrib/ipfilter/man/ipfilter.5 U src/contrib/ipfilter/man/ipfs.8 C src/contrib/ipfilter/man/ipfstat.8 C src/contrib/ipfilter/man/ipftest.1 U src/contrib/ipfilter/man/ipl.4 C src/contrib/ipfilter/man/ipmon.8 U src/contrib/ipfilter/man/ipnat.4 U src/contrib/ipfilter/man/ipnat.5 U src/contrib/ipfilter/man/ipnat.8 U src/contrib/ipfilter/man/mkfilters.1 U src/contrib/ipfilter/perl/Ipfanaly.pl U src/contrib/ipfilter/perl/Isbgraph U src/contrib/ipfilter/perl/LICENSE U src/contrib/ipfilter/perl/Services U src/contrib/ipfilter/perl/ipf-mrtg.pl U src/contrib/ipfilter/perl/logfilter.pl U src/contrib/ipfilter/perl/plog U src/contrib/ipfilter/rules/BASIC.NAT U src/contrib/ipfilter/rules/BASIC_1.FW U src/contrib/ipfilter/rules/BASIC_2.FW U src/contrib/ipfilter/rules/example.1 U src/contrib/ipfilter/rules/example.10 U src/contrib/ipfilter/rules/example.11 U src/contrib/ipfilter/rules/example.12 U src/contrib/ipfilter/rules/example.13 U src/contrib/ipfilter/rules/example.2 U src/contrib/ipfilter/rules/example.3 U src/contrib/ipfilter/rules/example.4 U src/contrib/ipfilter/rules/example.5 U src/contrib/ipfilter/rules/example.6 U src/contrib/ipfilter/rules/example.7 U src/contrib/ipfilter/rules/example.8 U src/contrib/ipfilter/rules/example.9 U src/contrib/ipfilter/rules/example.sr U src/contrib/ipfilter/rules/firewall U src/contrib/ipfilter/rules/ftp-proxy U src/contrib/ipfilter/rules/ftppxy U src/contrib/ipfilter/rules/nat-setup U src/contrib/ipfilter/rules/nat.eg U src/contrib/ipfilter/rules/server U src/contrib/ipfilter/rules/tcpstate U src/contrib/ipfilter/samples/Makefile U src/contrib/ipfilter/samples/ipfilter-pb.gif U src/contrib/ipfilter/samples/proxy.c U src/contrib/ipfilter/samples/userauth.c U src/contrib/ipfilter/test/Makefile N src/contrib/ipfilter/test/README.TXT U src/contrib/ipfilter/test/dotest U src/contrib/ipfilter/test/dotest6 U src/contrib/ipfilter/test/hextest U src/contrib/ipfilter/test/intest U src/contrib/ipfilter/test/itest U src/contrib/ipfilter/test/logtest U src/contrib/ipfilter/test/mhtest U src/contrib/ipfilter/test/mtest U src/contrib/ipfilter/test/natipftest U src/contrib/ipfilter/test/nattest N src/contrib/ipfilter/test/vfycksum.pl U src/contrib/ipfilter/test/expected/f1 U src/contrib/ipfilter/test/expected/f10 U src/contrib/ipfilter/test/expected/f11 U src/contrib/ipfilter/test/expected/f12 U src/contrib/ipfilter/test/expected/f13 U src/contrib/ipfilter/test/expected/f14 U src/contrib/ipfilter/test/expected/f15 U src/contrib/ipfilter/test/expected/f16 U src/contrib/ipfilter/test/expected/f17 U src/contrib/ipfilter/test/expected/f2 U src/contrib/ipfilter/test/expected/f3 U src/contrib/ipfilter/test/expected/f4 U src/contrib/ipfilter/test/expected/f5 U src/contrib/ipfilter/test/expected/f6 U src/contrib/ipfilter/test/expected/f7 U src/contrib/ipfilter/test/expected/f8 U src/contrib/ipfilter/test/expected/f9 U src/contrib/ipfilter/test/expected/i1 U src/contrib/ipfilter/test/expected/i10 U src/contrib/ipfilter/test/expected/i11 U src/contrib/ipfilter/test/expected/i12 U src/contrib/ipfilter/test/expected/i2 U src/contrib/ipfilter/test/expected/i3 U src/contrib/ipfilter/test/expected/i4 U src/contrib/ipfilter/test/expected/i5 U src/contrib/ipfilter/test/expected/i6 U src/contrib/ipfilter/test/expected/i7 U src/contrib/ipfilter/test/expected/i8 U src/contrib/ipfilter/test/expected/i9 U src/contrib/ipfilter/test/expected/in1 U src/contrib/ipfilter/test/expected/in2 U src/contrib/ipfilter/test/expected/in3 U src/contrib/ipfilter/test/expected/in4 U src/contrib/ipfilter/test/expected/ipv6.1 U src/contrib/ipfilter/test/expected/ipv6.2 U src/contrib/ipfilter/test/expected/ipv6.3 U src/contrib/ipfilter/test/expected/l1 U src/contrib/ipfilter/test/expected/l1.b U src/contrib/ipfilter/test/expected/n1 U src/contrib/ipfilter/test/expected/n2 U src/contrib/ipfilter/test/expected/n3 U src/contrib/ipfilter/test/expected/n4 U src/contrib/ipfilter/test/expected/n5 U src/contrib/ipfilter/test/expected/n6 U src/contrib/ipfilter/test/expected/n7 U src/contrib/ipfilter/test/expected/ni1 N src/contrib/ipfilter/test/expected/ni10 N src/contrib/ipfilter/test/expected/ni11 U src/contrib/ipfilter/test/expected/ni2 U src/contrib/ipfilter/test/expected/ni3 U src/contrib/ipfilter/test/expected/ni4 U src/contrib/ipfilter/test/expected/ni5 N src/contrib/ipfilter/test/expected/ni7 N src/contrib/ipfilter/test/expected/ni8 U src/contrib/ipfilter/test/input/f1 U src/contrib/ipfilter/test/input/f10 U src/contrib/ipfilter/test/input/f11 U src/contrib/ipfilter/test/input/f12 U src/contrib/ipfilter/test/input/f13 U src/contrib/ipfilter/test/input/f14 U src/contrib/ipfilter/test/input/f15 U src/contrib/ipfilter/test/input/f16 U src/contrib/ipfilter/test/input/f17 U src/contrib/ipfilter/test/input/f2 U src/contrib/ipfilter/test/input/f3 U src/contrib/ipfilter/test/input/f4 U src/contrib/ipfilter/test/input/f5 U src/contrib/ipfilter/test/input/f6 U src/contrib/ipfilter/test/input/f7 U src/contrib/ipfilter/test/input/f8 U src/contrib/ipfilter/test/input/f9 U src/contrib/ipfilter/test/input/ipv6.1 U src/contrib/ipfilter/test/input/ipv6.2 U src/contrib/ipfilter/test/input/ipv6.3 U src/contrib/ipfilter/test/input/l1 U src/contrib/ipfilter/test/input/n1 U src/contrib/ipfilter/test/input/n2 U src/contrib/ipfilter/test/input/n3 U src/contrib/ipfilter/test/input/n4 U src/contrib/ipfilter/test/input/n5 U src/contrib/ipfilter/test/input/n6 U src/contrib/ipfilter/test/input/n7 U src/contrib/ipfilter/test/input/ni1 N src/contrib/ipfilter/test/input/ni10 N src/contrib/ipfilter/test/input/ni11 U src/contrib/ipfilter/test/input/ni2 U src/contrib/ipfilter/test/input/ni3 U src/contrib/ipfilter/test/input/ni4 U src/contrib/ipfilter/test/input/ni5 N src/contrib/ipfilter/test/input/ni7 N src/contrib/ipfilter/test/input/ni8 U src/contrib/ipfilter/test/regress/f1 U src/contrib/ipfilter/test/regress/f10 U src/contrib/ipfilter/test/regress/f11 U src/contrib/ipfilter/test/regress/f12 U src/contrib/ipfilter/test/regress/f13 U src/contrib/ipfilter/test/regress/f14 U src/contrib/ipfilter/test/regress/f15 U src/contrib/ipfilter/test/regress/f16 U src/contrib/ipfilter/test/regress/f17 U src/contrib/ipfilter/test/regress/f2 U src/contrib/ipfilter/test/regress/f3 U src/contrib/ipfilter/test/regress/f4 U src/contrib/ipfilter/test/regress/f5 U src/contrib/ipfilter/test/regress/f6 U src/contrib/ipfilter/test/regress/f7 U src/contrib/ipfilter/test/regress/f8 U src/contrib/ipfilter/test/regress/f9 U src/contrib/ipfilter/test/regress/i1 U src/contrib/ipfilter/test/regress/i10 U src/contrib/ipfilter/test/regress/i11 U src/contrib/ipfilter/test/regress/i12 U src/contrib/ipfilter/test/regress/i2 U src/contrib/ipfilter/test/regress/i3 U src/contrib/ipfilter/test/regress/i4 U src/contrib/ipfilter/test/regress/i5 U src/contrib/ipfilter/test/regress/i6 U src/contrib/ipfilter/test/regress/i7 U src/contrib/ipfilter/test/regress/i8 U src/contrib/ipfilter/test/regress/i9 U src/contrib/ipfilter/test/regress/in1 U src/contrib/ipfilter/test/regress/in2 U src/contrib/ipfilter/test/regress/in3 U src/contrib/ipfilter/test/regress/in4 U src/contrib/ipfilter/test/regress/ipv6.1 U src/contrib/ipfilter/test/regress/ipv6.2 U src/contrib/ipfilter/test/regress/ipv6.3 U src/contrib/ipfilter/test/regress/l1 U src/contrib/ipfilter/test/regress/n1 U src/contrib/ipfilter/test/regress/n2 U src/contrib/ipfilter/test/regress/n3 U src/contrib/ipfilter/test/regress/n4 U src/contrib/ipfilter/test/regress/n5 U src/contrib/ipfilter/test/regress/n6 U src/contrib/ipfilter/test/regress/n7 U src/contrib/ipfilter/test/regress/ni1.ipf U src/contrib/ipfilter/test/regress/ni1.nat N src/contrib/ipfilter/test/regress/ni10.ipf N src/contrib/ipfilter/test/regress/ni10.nat N src/contrib/ipfilter/test/regress/ni11.ipf N src/contrib/ipfilter/test/regress/ni11.nat U src/contrib/ipfilter/test/regress/ni2.ipf U src/contrib/ipfilter/test/regress/ni2.nat U src/contrib/ipfilter/test/regress/ni3.ipf U src/contrib/ipfilter/test/regress/ni3.nat U src/contrib/ipfilter/test/regress/ni4.ipf U src/contrib/ipfilter/test/regress/ni4.nat U src/contrib/ipfilter/test/regress/ni5.ipf U src/contrib/ipfilter/test/regress/ni5.nat N src/contrib/ipfilter/test/regress/ni7.ipf N src/contrib/ipfilter/test/regress/ni7.nat N src/contrib/ipfilter/test/regress/ni8.ipf N src/contrib/ipfilter/test/regress/ni8.nat 25 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDARRENR:yesterday -jDARRENR src/contrib/ipfilter