Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Mar 2002 14:31:55 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 7996 for review
Message-ID:  <200203192231.g2JMVtK38294@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7996

Change 7996 by peter@peter_daintree on 2002/03/19 14:31:39

	IFC @7995

Affected files ...

... //depot/projects/ia64/contrib/ipfilter/BNF#2 integrate
... //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#2 integrate
... //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#2 integrate
... //depot/projects/ia64/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate
... //depot/projects/ia64/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate
... //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#1 branch
... //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate
... //depot/projects/ia64/contrib/ipfilter/FreeBSD/kinstall#2 integrate
... //depot/projects/ia64/contrib/ipfilter/HISTORY#2 integrate
... //depot/projects/ia64/contrib/ipfilter/INSTALL.FreeBSD#2 integrate
... //depot/projects/ia64/contrib/ipfilter/IPFILTER.LICENCE#2 integrate
... //depot/projects/ia64/contrib/ipfilter/Makefile#2 integrate
... //depot/projects/ia64/contrib/ipfilter/common.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/etc/protocols#2 integrate
... //depot/projects/ia64/contrib/ipfilter/fils.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/inet_addr.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ip_ipsec_pxy.c#1 branch
... //depot/projects/ia64/contrib/ipfilter/ip_lfil.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ip_netbios_pxy.c#1 branch
... //depot/projects/ia64/contrib/ipfilter/ip_sfil.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipf.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipf.h#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipfs.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipft_ef.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipft_hx.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipft_pc.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipft_sn.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipft_td.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipft_tx.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/iplang/iplang_y.y#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipmon.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipnat.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/44arp.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/arp.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/ip.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/ipresend.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/ipsend.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/ipsopt.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/iptest.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/iptests.c#3 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/lsock.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/resend.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/sbpf.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/sirix.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#3 integrate
... //depot/projects/ia64/contrib/ipfilter/ipt.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/kmem.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/kmem.h#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/Makefile#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipf.4#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipfilter.5#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipfs.8#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipl.4#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#2 integrate
... //depot/projects/ia64/contrib/ipfilter/man/ipnat.8#1 branch
... //depot/projects/ia64/contrib/ipfilter/misc.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/mlf_ipl.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/mli_ipl.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/mln_ipl.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/natparse.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/opt.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/parse.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/printnat.c#1 branch
... //depot/projects/ia64/contrib/ipfilter/printstate.c#1 branch
... //depot/projects/ia64/contrib/ipfilter/samples/Makefile#2 integrate
... //depot/projects/ia64/contrib/ipfilter/samples/proxy.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/solaris.c#2 integrate
... //depot/projects/ia64/contrib/ipfilter/test/Makefile#2 integrate
... //depot/projects/ia64/contrib/ipfilter/test/expected/f15#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/expected/f16#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/expected/l1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/expected/l1.b#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/expected/ni1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/expected/ni2#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/input/f15#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/input/f16#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/input/ipf6-1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/input/l1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/input/ni1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/input/ni2#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/logtest#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/mtest#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/natipftest#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/f15#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/f16#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/ipf6-1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/l1#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/ni1.ipf#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/ni1.nat#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/ni2.ipf#1 branch
... //depot/projects/ia64/contrib/ipfilter/test/regress/ni2.nat#1 branch
... //depot/projects/ia64/contrib/ipfilter/todo#2 integrate
... //depot/projects/ia64/crypto/openssh/servconf.c#3 integrate
... //depot/projects/ia64/lib/libstand/Makefile#5 integrate
... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#6 integrate
... //depot/projects/ia64/sbin/Makefile#4 integrate
... //depot/projects/ia64/sbin/disklabel/disklabel.5#2 integrate
... //depot/projects/ia64/sbin/disklabel/disklabel.c#5 integrate
... //depot/projects/ia64/sbin/dmesg/dmesg.c#2 integrate
... //depot/projects/ia64/sbin/ipfstat/Makefile#3 integrate
... //depot/projects/ia64/sbin/ipnat/Makefile#3 integrate
... //depot/projects/ia64/sbin/newfs/Makefile#4 integrate
... //depot/projects/ia64/sbin/newfs/mkfs.c#4 integrate
... //depot/projects/ia64/sbin/newfs/newfs.c#5 integrate
... //depot/projects/ia64/sbin/newfs/newfs.h#1 branch
... //depot/projects/ia64/sbin/newfs/ref.test#1 branch
... //depot/projects/ia64/sbin/newfs/runtest00.sh#1 branch
... //depot/projects/ia64/sbin/newfs/runtest01.sh#1 branch
... //depot/projects/ia64/sys/contrib/dev/fla/fla.c#2 integrate
... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate
... //depot/projects/ia64/sys/dev/ccd/ccd.c#5 integrate
... //depot/projects/ia64/sys/dev/usb/uhci.c#4 integrate
... //depot/projects/ia64/sys/fs/deadfs/dead_vnops.c#2 integrate
... //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#2 integrate
... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#5 integrate
... //depot/projects/ia64/sys/fs/fdescfs/fdesc.h#2 integrate
... //depot/projects/ia64/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
... //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
... //depot/projects/ia64/sys/fs/fifofs/fifo.h#2 integrate
... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#5 integrate
... //depot/projects/ia64/sys/fs/hpfs/hpfs.h#4 integrate
... //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#5 integrate
... //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#6 integrate
... //depot/projects/ia64/sys/fs/msdosfs/denode.h#2 integrate
... //depot/projects/ia64/sys/fs/msdosfs/direntry.h#2 integrate
... //depot/projects/ia64/sys/fs/msdosfs/fat.h#3 integrate
... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
... //depot/projects/ia64/sys/fs/msdosfs/msdosfsmount.h#3 integrate
... //depot/projects/ia64/sys/fs/ntfs/ntfs_ihash.h#2 integrate
... //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#5 integrate
... //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.h#2 integrate
... //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#5 integrate
... //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#4 integrate
... //depot/projects/ia64/sys/fs/portalfs/portal_vfsops.c#4 integrate
... //depot/projects/ia64/sys/fs/portalfs/portal_vnops.c#3 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#4 integrate
... //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#3 integrate
... //depot/projects/ia64/sys/fs/umapfs/umap.h#2 integrate
... //depot/projects/ia64/sys/fs/umapfs/umap_subr.c#2 integrate
... //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#3 integrate
... //depot/projects/ia64/sys/fs/umapfs/umap_vnops.c#2 integrate
... //depot/projects/ia64/sys/fs/unionfs/union.h#2 integrate
... //depot/projects/ia64/sys/fs/unionfs/union_subr.c#3 integrate
... //depot/projects/ia64/sys/fs/unionfs/union_vfsops.c#3 integrate
... //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#3 integrate
... //depot/projects/ia64/sys/geom/geom_dev.c#3 integrate
... //depot/projects/ia64/sys/kern/imgact_aout.c#3 integrate
... //depot/projects/ia64/sys/kern/imgact_elf.c#3 integrate
... //depot/projects/ia64/sys/kern/imgact_gzip.c#2 integrate
... //depot/projects/ia64/sys/kern/inflate.c#2 integrate
... //depot/projects/ia64/sys/kern/kern_acct.c#3 integrate
... //depot/projects/ia64/sys/kern/kern_clock.c#5 integrate
... //depot/projects/ia64/sys/kern/kern_descrip.c#9 integrate
... //depot/projects/ia64/sys/kern/kern_exec.c#6 integrate
... //depot/projects/ia64/sys/kern/kern_exit.c#5 integrate
... //depot/projects/ia64/sys/kern/kern_intr.c#5 integrate
... //depot/projects/ia64/sys/kern/kern_ktrace.c#4 integrate
... //depot/projects/ia64/sys/kern/kern_linker.c#8 integrate
... //depot/projects/ia64/sys/kern/kern_lockf.c#3 integrate
... //depot/projects/ia64/sys/kern/kern_malloc.c#4 integrate
... //depot/projects/ia64/sys/kern/kern_mutex.c#4 integrate
... //depot/projects/ia64/sys/kern/kern_proc.c#4 integrate
... //depot/projects/ia64/sys/kern/kern_resource.c#4 integrate
... //depot/projects/ia64/sys/kern/kern_sig.c#5 integrate
... //depot/projects/ia64/sys/kern/kern_synch.c#5 integrate
... //depot/projects/ia64/sys/kern/kern_tc.c#3 integrate
... //depot/projects/ia64/sys/kern/kern_time.c#3 integrate
... //depot/projects/ia64/sys/kern/kern_timeout.c#2 integrate
... //depot/projects/ia64/sys/kern/makesyscalls.sh#3 integrate
... //depot/projects/ia64/sys/kern/subr_autoconf.c#2 integrate
... //depot/projects/ia64/sys/kern/subr_diskmbr.c#4 integrate
... //depot/projects/ia64/sys/kern/subr_diskslice.c#4 integrate
... //depot/projects/ia64/sys/kern/subr_prf.c#6 integrate
... //depot/projects/ia64/sys/kern/subr_prof.c#3 integrate
... //depot/projects/ia64/sys/kern/subr_smp.c#4 integrate
... //depot/projects/ia64/sys/kern/sys_generic.c#7 integrate
... //depot/projects/ia64/sys/kern/sysv_msg.c#3 integrate
... //depot/projects/ia64/sys/kern/sysv_sem.c#5 integrate
... //depot/projects/ia64/sys/kern/sysv_shm.c#3 integrate
... //depot/projects/ia64/sys/kern/tty.c#6 integrate
... //depot/projects/ia64/sys/kern/tty_compat.c#2 integrate
... //depot/projects/ia64/sys/kern/tty_pty.c#3 integrate
... //depot/projects/ia64/sys/kern/tty_subr.c#2 integrate
... //depot/projects/ia64/sys/kern/tty_tty.c#3 integrate
... //depot/projects/ia64/sys/kern/uipc_domain.c#3 integrate
... //depot/projects/ia64/sys/kern/uipc_mbuf2.c#2 integrate
... //depot/projects/ia64/sys/kern/uipc_syscalls.c#5 integrate
... //depot/projects/ia64/sys/kern/uipc_usrreq.c#7 integrate
... //depot/projects/ia64/sys/kern/vfs_bio.c#10 integrate
... //depot/projects/ia64/sys/kern/vfs_cache.c#4 integrate
... //depot/projects/ia64/sys/kern/vfs_cluster.c#5 integrate
... //depot/projects/ia64/sys/kern/vfs_default.c#4 integrate
... //depot/projects/ia64/sys/kern/vfs_export.c#3 integrate
... //depot/projects/ia64/sys/kern/vfs_subr.c#5 integrate
... //depot/projects/ia64/sys/kern/vfs_syscalls.c#6 integrate
... //depot/projects/ia64/sys/kern/vfs_vnops.c#7 integrate
... //depot/projects/ia64/sys/net/bpf.c#5 integrate
... //depot/projects/ia64/sys/net/bpf.h#2 integrate
... //depot/projects/ia64/sys/net/bpf_filter.c#3 integrate
... //depot/projects/ia64/sys/net/bsd_comp.c#2 integrate
... //depot/projects/ia64/sys/net/ethernet.h#3 integrate
... //depot/projects/ia64/sys/net/fddi.h#2 integrate
... //depot/projects/ia64/sys/net/if.c#4 integrate
... //depot/projects/ia64/sys/net/if.h#5 integrate
... //depot/projects/ia64/sys/net/if_arc.h#3 integrate
... //depot/projects/ia64/sys/net/if_arcsubr.c#2 integrate
... //depot/projects/ia64/sys/net/if_atm.h#2 integrate
... //depot/projects/ia64/sys/net/if_dl.h#2 integrate
... //depot/projects/ia64/sys/net/if_ethersubr.c#6 integrate
... //depot/projects/ia64/sys/net/if_faith.c#4 integrate
... //depot/projects/ia64/sys/net/if_fddisubr.c#2 integrate
... //depot/projects/ia64/sys/net/if_gif.c#4 integrate
... //depot/projects/ia64/sys/net/if_gif.h#3 integrate
... //depot/projects/ia64/sys/net/if_media.c#2 integrate
... //depot/projects/ia64/sys/net/if_media.h#2 integrate
... //depot/projects/ia64/sys/net/if_ppp.c#3 integrate
... //depot/projects/ia64/sys/net/if_pppvar.h#3 integrate
... //depot/projects/ia64/sys/net/if_sl.c#3 integrate
... //depot/projects/ia64/sys/net/if_stf.c#5 integrate
... //depot/projects/ia64/sys/net/if_stf.h#2 integrate
... //depot/projects/ia64/sys/net/if_tap.c#4 integrate
... //depot/projects/ia64/sys/net/if_var.h#5 integrate
... //depot/projects/ia64/sys/net/intrq.h#3 integrate
... //depot/projects/ia64/sys/net/net_osdep.h#2 integrate
... //depot/projects/ia64/sys/net/netisr.h#3 integrate
... //depot/projects/ia64/sys/net/pfil.c#2 integrate
... //depot/projects/ia64/sys/net/pfil.h#2 integrate
... //depot/projects/ia64/sys/net/ppp_comp.h#2 integrate
... //depot/projects/ia64/sys/net/ppp_deflate.c#2 integrate
... //depot/projects/ia64/sys/net/ppp_tty.c#3 integrate
... //depot/projects/ia64/sys/net/radix.c#2 integrate
... //depot/projects/ia64/sys/net/radix.h#2 integrate
... //depot/projects/ia64/sys/net/raw_cb.h#2 integrate
... //depot/projects/ia64/sys/net/route.c#3 integrate
... //depot/projects/ia64/sys/net/route.h#4 integrate
... //depot/projects/ia64/sys/net/rtsock.c#3 integrate
... //depot/projects/ia64/sys/net/slcompress.h#2 integrate
... //depot/projects/ia64/sys/netinet/icmp6.h#2 integrate
... //depot/projects/ia64/sys/netinet/icmp_var.h#4 integrate
... //depot/projects/ia64/sys/netinet/if_atm.h#2 integrate
... //depot/projects/ia64/sys/netinet/if_ether.c#4 integrate
... //depot/projects/ia64/sys/netinet/if_ether.h#2 integrate
... //depot/projects/ia64/sys/netinet/if_fddi.h#2 integrate
... //depot/projects/ia64/sys/netinet/igmp.c#2 integrate
... //depot/projects/ia64/sys/netinet/igmp_var.h#2 integrate
... //depot/projects/ia64/sys/netinet/in.c#3 integrate
... //depot/projects/ia64/sys/netinet/in.h#5 integrate
... //depot/projects/ia64/sys/netinet/in_gif.h#3 integrate
... //depot/projects/ia64/sys/netinet/in_pcb.c#8 integrate
... //depot/projects/ia64/sys/netinet/in_pcb.h#5 integrate
... //depot/projects/ia64/sys/netinet/in_proto.c#2 integrate
... //depot/projects/ia64/sys/netinet/in_rmx.c#2 integrate
... //depot/projects/ia64/sys/netinet/in_systm.h#2 integrate
... //depot/projects/ia64/sys/netinet/in_var.h#2 integrate
... //depot/projects/ia64/sys/netinet/ip_ecn.h#2 integrate
... //depot/projects/ia64/sys/netinet/ip_encap.c#2 integrate
... //depot/projects/ia64/sys/netinet/ip_encap.h#2 integrate
... //depot/projects/ia64/sys/netinet/ip_fw.h#4 integrate
... //depot/projects/ia64/sys/netinet/ip_icmp.c#5 integrate
... //depot/projects/ia64/sys/netinet/ip_icmp.h#2 integrate
... //depot/projects/ia64/sys/netinet/ip_id.c#2 integrate
... //depot/projects/ia64/sys/netinet/ip_input.c#6 integrate
... //depot/projects/ia64/sys/netinet/ip_mroute.c#4 integrate
... //depot/projects/ia64/sys/netinet/ip_mroute.h#2 integrate
... //depot/projects/ia64/sys/netinet/ip_output.c#6 integrate
... //depot/projects/ia64/sys/netinet/ip_var.h#3 integrate
... //depot/projects/ia64/sys/netinet/tcp_input.c#6 integrate
... //depot/projects/ia64/sys/netinet/tcp_subr.c#5 integrate
... //depot/projects/ia64/sys/netinet/tcp_timer.h#2 integrate
... //depot/projects/ia64/sys/netinet/tcp_usrreq.c#4 integrate
... //depot/projects/ia64/sys/netinet/tcp_var.h#4 integrate
... //depot/projects/ia64/sys/netinet/udp_usrreq.c#4 integrate
... //depot/projects/ia64/sys/netinet/udp_var.h#2 integrate
... //depot/projects/ia64/sys/netinet6/icmp6.c#2 integrate
... //depot/projects/ia64/sys/netinet6/in6.h#3 integrate
... //depot/projects/ia64/sys/netinet6/ip6_forward.c#3 integrate
... //depot/projects/ia64/sys/netinet6/ip6_input.c#3 integrate
... //depot/projects/ia64/sys/netinet6/ip6_output.c#3 integrate
... //depot/projects/ia64/sys/netinet6/ip6protosw.h#2 integrate
... //depot/projects/ia64/sys/posix4/aio.h#2 integrate
... //depot/projects/ia64/sys/posix4/mqueue.h#2 integrate
... //depot/projects/ia64/sys/posix4/posix4.h#2 integrate
... //depot/projects/ia64/sys/posix4/sched.h#2 integrate
... //depot/projects/ia64/sys/posix4/semaphore.h#2 integrate
... //depot/projects/ia64/sys/sys/acct.h#2 integrate
... //depot/projects/ia64/sys/sys/acl.h#3 integrate
... //depot/projects/ia64/sys/sys/bio.h#5 integrate
... //depot/projects/ia64/sys/sys/buf.h#6 integrate
... //depot/projects/ia64/sys/sys/callout.h#2 integrate
... //depot/projects/ia64/sys/sys/conf.h#6 integrate
... //depot/projects/ia64/sys/sys/cons.h#3 integrate
... //depot/projects/ia64/sys/sys/disk.h#3 integrate
... //depot/projects/ia64/sys/sys/disklabel.h#6 integrate
... //depot/projects/ia64/sys/sys/diskslice.h#2 integrate
... //depot/projects/ia64/sys/sys/domain.h#2 integrate
... //depot/projects/ia64/sys/sys/errno.h#3 integrate
... //depot/projects/ia64/sys/sys/event.h#3 integrate
... //depot/projects/ia64/sys/sys/eventhandler.h#2 integrate
... //depot/projects/ia64/sys/sys/exec.h#2 integrate
... //depot/projects/ia64/sys/sys/fcntl.h#3 integrate
... //depot/projects/ia64/sys/sys/file.h#5 integrate
... //depot/projects/ia64/sys/sys/filedesc.h#3 integrate
... //depot/projects/ia64/sys/sys/imgact.h#3 integrate
... //depot/projects/ia64/sys/sys/imgact_aout.h#3 integrate
... //depot/projects/ia64/sys/sys/imgact_elf.h#2 integrate
... //depot/projects/ia64/sys/sys/inflate.h#2 integrate
... //depot/projects/ia64/sys/sys/interrupt.h#3 integrate
... //depot/projects/ia64/sys/sys/ioccom.h#2 integrate
... //depot/projects/ia64/sys/sys/ipc.h#3 integrate
... //depot/projects/ia64/sys/sys/jail.h#4 integrate
... //depot/projects/ia64/sys/sys/kernel.h#5 integrate
... //depot/projects/ia64/sys/sys/kthread.h#2 integrate
... //depot/projects/ia64/sys/sys/ktrace.h#2 integrate
... //depot/projects/ia64/sys/sys/libkern.h#3 integrate
... //depot/projects/ia64/sys/sys/lockf.h#2 integrate
... //depot/projects/ia64/sys/sys/lockmgr.h#3 integrate
... //depot/projects/ia64/sys/sys/malloc.h#4 integrate
... //depot/projects/ia64/sys/sys/md5.h#2 integrate
... //depot/projects/ia64/sys/sys/mman.h#2 integrate
... //depot/projects/ia64/sys/sys/mount.h#5 integrate
... //depot/projects/ia64/sys/sys/msg.h#2 integrate
... //depot/projects/ia64/sys/sys/msgbuf.h#2 integrate
... //depot/projects/ia64/sys/sys/namei.h#3 integrate
... //depot/projects/ia64/sys/sys/param.h#6 integrate
... //depot/projects/ia64/sys/sys/poll.h#3 integrate
... //depot/projects/ia64/sys/sys/proc.h#7 integrate
... //depot/projects/ia64/sys/sys/protosw.h#2 integrate
... //depot/projects/ia64/sys/sys/queue.h#3 integrate
... //depot/projects/ia64/sys/sys/regression.h#2 integrate
... //depot/projects/ia64/sys/sys/resource.h#2 integrate
... //depot/projects/ia64/sys/sys/resourcevar.h#3 integrate
... //depot/projects/ia64/sys/sys/rtprio.h#3 integrate
... //depot/projects/ia64/sys/sys/selinfo.h#4 integrate
... //depot/projects/ia64/sys/sys/sem.h#2 integrate
... //depot/projects/ia64/sys/sys/shm.h#2 integrate
... //depot/projects/ia64/sys/sys/signal.h#4 integrate
... //depot/projects/ia64/sys/sys/signalvar.h#3 integrate
... //depot/projects/ia64/sys/sys/socket.h#3 integrate
... //depot/projects/ia64/sys/sys/socketvar.h#6 integrate
... //depot/projects/ia64/sys/sys/soundcard.h#2 integrate
... //depot/projects/ia64/sys/sys/stat.h#3 integrate
... //depot/projects/ia64/sys/sys/sysctl.h#4 integrate
... //depot/projects/ia64/sys/sys/sysent.h#4 integrate
... //depot/projects/ia64/sys/sys/syslog.h#2 integrate
... //depot/projects/ia64/sys/sys/sysproto.h#4 integrate
... //depot/projects/ia64/sys/sys/systm.h#6 integrate
... //depot/projects/ia64/sys/sys/termios.h#2 integrate
... //depot/projects/ia64/sys/sys/time.h#3 integrate
... //depot/projects/ia64/sys/sys/timeb.h#3 integrate
... //depot/projects/ia64/sys/sys/timepps.h#2 integrate
... //depot/projects/ia64/sys/sys/times.h#2 integrate
... //depot/projects/ia64/sys/sys/timetc.h#3 integrate
... //depot/projects/ia64/sys/sys/timex.h#2 integrate
... //depot/projects/ia64/sys/sys/tty.h#2 integrate
... //depot/projects/ia64/sys/sys/types.h#6 integrate
... //depot/projects/ia64/sys/sys/uio.h#2 integrate
... //depot/projects/ia64/sys/sys/un.h#2 integrate
... //depot/projects/ia64/sys/sys/user.h#3 integrate
... //depot/projects/ia64/sys/sys/vnode.h#6 integrate
... //depot/projects/ia64/sys/sys/wait.h#2 integrate
... //depot/projects/ia64/sys/vm/default_pager.c#3 integrate
... //depot/projects/ia64/sys/vm/device_pager.c#3 integrate
... //depot/projects/ia64/sys/vm/pmap.h#4 integrate
... //depot/projects/ia64/sys/vm/swap_pager.c#5 integrate
... //depot/projects/ia64/sys/vm/swap_pager.h#3 integrate
... //depot/projects/ia64/sys/vm/vm_extern.h#4 integrate
... //depot/projects/ia64/sys/vm/vm_fault.c#7 integrate
... //depot/projects/ia64/sys/vm/vm_glue.c#8 integrate
... //depot/projects/ia64/sys/vm/vm_init.c#4 integrate
... //depot/projects/ia64/sys/vm/vm_mmap.c#4 integrate
... //depot/projects/ia64/sys/vm/vm_pageout.c#7 integrate
... //depot/projects/ia64/sys/vm/vm_pageout.h#4 integrate
... //depot/projects/ia64/sys/vm/vm_pager.c#5 integrate
... //depot/projects/ia64/sys/vm/vm_pager.h#3 integrate
... //depot/projects/ia64/sys/vm/vm_swap.c#4 integrate
... //depot/projects/ia64/sys/vm/vnode_pager.c#7 integrate
... //depot/projects/ia64/sys/vm/vnode_pager.h#3 integrate

Differences ...

==== //depot/projects/ia64/contrib/ipfilter/BNF#2 (text+ko) ====

@@ -2,27 +2,29 @@
 	      [ proto ] [ ip ] [ group ].
 
 insert	= "@" decnumber .
-action	= block | "pass" | log | "count" | skip | auth | call .
+action	= block | "no-match" | "pass" | log | "count" | skip | auth | call .
 in-out	= "in" | "out" .
-options	= [ log ] [ "quick" ] [ "on" interface-name [ dup ] [ froute ] ] .
+options	= [ log ] [ "quick" ] [ "on" interface-name [ dup ] [ froute ]
+          [ via ] ] .
 tos	= "tos" decnumber | "tos" hexnumber .
 ttl	= "ttl" decnumber .
 proto	= "proto" protocol .
 ip	= srcdst [ flags ] [ with withopt ] [ icmp ] [ keep ] .
 group	= [ "head" decnumber ] [ "group" decnumber ] .
 
-block	= "block" [ reutrn-icmp[return-code] | "return-rst" ] .
+block	= "block" [ return-icmp[return-code] | "return-rst" ] .
 auth	= "auth" | "preauth" .
 log	= "log" [ "body" ] [ "first" ] [ "or-block" ] [ "level" loglevel ] .
 call	= "call" [ "now" ] function-name .
 skip	= "skip" decnumber .
 dup	= "dup-to" interface-name[":"ipaddr] .
+via	= "in-via" interface-name | "out-via" interface-name .
 froute	= "fastroute" | "to" interface-name [ ":" ipaddr ] .
 protocol = "tcp/udp" | "udp" | "tcp" | "icmp" | decnumber .
 srcdst	= "all" | fromto .
 fromto	= "from" object "to" object .
 
-reutrn-icmp = "return-icmp" | "return-icmp-as-dest" .
+return-icmp = "return-icmp" | "return-icmp-as-dest" .
 loglevel = facility"."priority | priority .
 object	= addr [ port-comp | port-range ] .
 addr	= "any" | nummask | host-name [ "mask" ipaddr | "mask" hexnumber ] .
@@ -32,7 +34,8 @@
 with	= "with" | "and" .
 icmp	= "icmp-type" icmp-type [ "code" decnumber ] .
 return-code = "("icmp-code")" .
-keep	= "keep" "state" | "keep" "frags" .
+keep	= "keep" "state" | "keep" "frags" | "keep" "state-age" state-age .
+state-age = decnmber [ "/" decnumber ] .
 
 nummask	= host-name [ "/" decnumber ] .
 host-name = ipaddr | hostname | "any" .

==== //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#2 (text+ko) ====

@@ -8,7 +8,7 @@
 BINDEST=/usr/sbin
 SBINDEST=/sbin
 MANDIR=/usr/share/man
-CC=cc -Wall -Wuninitialized -Wstrict-prototypes -Werror -O
+CC=cc -Wall -Wstrict-prototypes -Wuninitialized -O
 CFLAGS=-g -I$(TOP)
 #
 # For NetBSD/FreeBSD
@@ -39,22 +39,23 @@
 #
 MODOBJS=ip_fil.o fil_k.o ml_ipl.o ip_nat.o ip_frag.o ip_state.o ip_proxy.o \
 	ip_auth.o ip_log.o
-DFLAGS=$(IPFLKM) $(IPFLOG) $(DEF) $(DLKM)
+DFLAGS=$(IPFLKM) $(DEF) $(DLKM)
 IPF=ipf.o parse.o common.o opt.o facpri.o
 IPT=ipt.o parse.o common.o fil.o ipft_sn.o ipft_ef.o ipft_td.o ipft_pc.o \
     opt.o ipft_tx.o misc.o ip_frag_u.o ip_state_u.o ip_nat_u.o ip_proxy_u.o \
-    ip_auth_u.o ipft_hx.o ip_fil_u.o natparse.o facpri.o
-IPNAT=ipnat.o kmem.o natparse.o common.o
-FILS=fils.o parse.o kmem.o opt.o facpri.o common.o
+    ip_auth_u.o ipft_hx.o ip_fil_u.o ip_log_u.o natparse.o facpri.o \
+    printnat.o printstate.o
+IPNAT=ipnat.o kmem.o natparse.o common.o printnat.o
+FILS=fils.o parse.o kmem.o opt.o facpri.o common.o printstate.o
 
 build all: ipf ipfs ipfstat ipftest ipmon ipnat $(LKM)
 
 ipfstat: $(FILS)
-	$(CC) $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) $(FILS) \
-	-o $@ $(LIBS) $(STATETOP_LIB)
+	$(CC) -static $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \
+		$(FILS) -o $@ $(LIBS) $(STATETOP_LIB) -lkvm
 
 ipf: $(IPF)
-	$(CC) $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS)
+	$(CC) -static $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS)
 	/bin/rm -f $(TOP)/ipf
 	ln -s `pwd`/ipf $(TOP)
 
@@ -64,10 +65,10 @@
 	ln -s `pwd`/ipftest $(TOP)
 
 ipnat: $(IPNAT)
-	$(CC) $(DEBUG) $(CFLAGS) $(IPNAT) -o $@ $(LIBS)
+	$(CC) -static $(DEBUG) $(CFLAGS) $(IPNAT) -o $@ $(LIBS) -lkvm
 
 ipfs: ipfs.o
-	$(CC) $(DEBUG) $(CFLAGS) ipfs.o -o $@ $(LIBS)
+	$(CC) -static $(DEBUG) $(CFLAGS) ipfs.o -o $@ $(LIBS)
 
 tests:
 	(cd test; make )
@@ -107,6 +108,14 @@
 	$(TOP)/ip_compat.h
 	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/natparse.c -o $@
 
+printnat.o: $(TOP)/printnat.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_nat.h \
+	$(TOP)/ip_compat.h $(TOP)/ip_proxy.h
+	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/printnat.c -o $@
+
+printstate.o: $(TOP)/printstate.c $(TOP)/ip_fil.h $(TOP)/ipf.h \
+	$(TOP)/ip_state.h $(TOP)/ip_compat.h
+	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/printstate.c -o $@
+
 ipft_sn.o: $(TOP)/ipft_sn.c $(TOP)/ipt.h $(TOP)/ipf.h $(TOP)/ip_fil.h \
 	$(TOP)/snoop.h
 	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_sn.c -o $@
@@ -130,7 +139,8 @@
 	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ip_nat.c -o $@
 
 ip_proxy_u.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \
-	$(TOP)/ip_fil.h $(TOP)/ip_ftp_pxy.c  $(TOP)/ip_nat.h
+	$(TOP)/ip_fil.h $(TOP)/ip_ftp_pxy.c $(TOP)/ip_rcmd_pxy.c \
+	$(TOP)/ip_raudio_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_nat.h
 	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ip_proxy.c -o $@
 
 ip_frag_u.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h \
@@ -148,6 +158,9 @@
 ip_fil_u.o: $(TOP)/$(IPFILC) $(TOP)/ip_fil.h $(TOP)/ip_compat.h
 	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/$(IPFILC) -o $@
 
+ip_log_u.o: $(TOP)/ip_log.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h
+	$(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ip_log.c -o $@
+
 if_ipl.o: $(MODOBJS) 
 	ld -r $(MODOBJS) -o $(LKM)
 	${RM} -f if_ipl
@@ -170,7 +183,7 @@
 
 ip_proxy.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \
 	$(TOP)/ip_fil.h $(TOP)/ip_ftp_pxy.c $(TOP)/ip_raudio_pxy.c \
-	$(TOP)/ip_nat.h
+	$(TOP)/ip_rcmd_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_nat.h
 	$(CC) $(DEBUG) $(CFLAGS) $(DFLAGS) -c $(TOP)/ip_proxy.c -o $@
 
 ip_auth.o: $(TOP)/ip_auth.c $(TOP)/ip_auth.h $(TOP)/ip_compat.h \
@@ -207,6 +220,8 @@
 
 ipmon: $(TOP)/ipmon.c
 	$(CC) $(DEBUG) $(CFLAGS) $(LOGFAC) $(TOP)/ipmon.c -o $@ $(LIBS)
+	/bin/rm -f $(TOP)/ipmon
+	ln -s `pwd`/ipmon $(TOP)
 
 clean:
 	${RM} -f *.core *.o ipt fils ipf ipfstat ipftest ipmon if_ipl ipnat \
@@ -231,10 +246,20 @@
 	-if [ -d /modules -a -f ipf.ko ] ; then \
 		cp ipf.ko /modules; \
 	fi
-	-$(INSTALL) -cs -g wheel -m 755 -o root ipf $(SBINDEST)
-	-$(INSTALL) -cs -g wheel -m 755 -o root ipfs $(SBINDEST)
-	-$(INSTALL) -cs -g wheel -m 755 -o root ipnat $(SBINDEST)
-	-$(INSTALL) -cs -g wheel -m 755 -o root ipfstat $(SBINDEST)
-	-$(INSTALL) -cs -g wheel -m 755 -o root ipmon $(BINDEST)
-	-$(INSTALL) -cs -g wheel -m 755 -o root ipftest $(BINDEST)
+	@for i in ipf:$(SBINDEST) ipfs:$(SBINDEST) ipnat:$(SBINDEST) \
+	    ipfstat:$(SBINDEST) ipftest:$(SBINDEST) ipmon:$(BINDEST); do \
+		def="`expr $$i : '[^:]*:\(.*\)'`"; \
+		p="`expr $$i : '\([^:]*\):.*'`"; \
+		for d in $(BINDEST) $(SBINDEST); do \
+			if [ -f $$d/$$i ] ; then \
+				echo "$(INSTALL) -cs -g wheel -m 755 -o root $$p $$d"; \
+				$(INSTALL) -cs -g wheel -m 755 -o root $$p $$d; \
+				dd=$$d; \
+			fi; \
+		done; \
+		if [ -z "$$dd" ] ; then \
+			echo $(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \
+			$(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \
+		fi \
+	done
 	(cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP))

==== //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ====

@@ -9,13 +9,17 @@
 dir=`pwd`
 karch=`uname -m`
 archdir="/sys/arch/$karch"
+ipfdir=/sys/netinet
+if [ -d /sys/contrib/ipfilter ] ; then
+	ipfdir=/sys/contrib/ipfilter/netinet
+fi
 confdir="$archdir/conf"
  
 echo -n "Installing "
-for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_ftp_pxy.c ip_rcmd_pxy.c ip_raudio_pxy.c ; do
+for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_*_pxy.c ; do
 	echo -n "$i "
-	cp $i /sys/netinet/
-	chmod 644 /sys/netinet/$i
+	cp $i $ipfdir
+	chmod 644 $ipfdir/$i
 done
 echo ""
 if [ -f /sys/netinet/ip_fil_compat.h ] ; then

==== //depot/projects/ia64/contrib/ipfilter/FreeBSD-2.2/kinstall#2 (text+ko) ====

@@ -9,11 +9,17 @@
 if ( $dir =~ */FreeBSD* ) cd ..
 echo -n "Installing "
 foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \
-	   ip_proxy.[ch] ip_{ftp,rcmd}_pxy.c mlf_ipl.c ipl.h ip_compat.h \
+	   ip_proxy.[ch] ip_*_pxy.c mlf_ipl.c ipl.h ip_compat.h \
 	   ip_auth.[ch] ip_log.c)
 	echo -n "$i ";
 	cp $i /sys/netinet
 	chmod 644 /sys/netinet/$i
+	switch ( $i )
+	case *.h:
+		/bin/cp $i /usr/include/netinet/$i
+		chmod 644 /usr/include/netinet/$i
+		breaksw
+	endsw
 end
 echo ""
 echo "Copying /usr/include/osreldate.h to /sys/sys"

==== //depot/projects/ia64/contrib/ipfilter/FreeBSD-3/kinstall#2 (text+ko) ====

@@ -9,11 +9,17 @@
 if ( $dir =~ */FreeBSD* ) cd ..
 echo -n "Installing "
 foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \
-	   ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c mlf_ipl.c ipl.h \
+	   ip_proxy.[ch] ip_*_pxy.c mlf_ipl.c ipl.h \
 	   ip_compat.h ip_auth.[ch] ip_log.c)
 	echo -n "$i ";
 	cp $i /sys/netinet
 	chmod 644 /sys/netinet/$i
+	switch ( $i )
+	case *.h:
+		/bin/cp $i /usr/include/netinet/$i
+		chmod 644 /usr/include/netinet/$i
+		breaksw
+	endsw
 end
 echo ""
 echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h"

==== //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/kinstall#2 (text+ko) ====

@@ -2,27 +2,38 @@
 #
 set dir=`pwd`
 set karch=`uname -m`
+set ipfdir=/sys/netinet
 set krev=`uname -r|sed -e 's/\([0-9\.]*\)-.*/\1/'`
 if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch"
 if ( -d /sys/$karch ) set archdir="/sys/$karch"
+if ( -d /sys/contrib/ipfilter ) set ipfdir=/sys/contrib/ipfilter/netinet
 set confdir="$archdir/conf"
 
 if ( $dir =~ */FreeBSD* ) cd ..
 echo -n "Installing "
 foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \
-	   ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c mlf_ipl.c mlfk_ipl.c \
+	   ip_proxy.[ch] ip_*_pxy.c mlf_ipl.c mlfk_ipl.c \
 	   ipl.h ip_compat.h ip_auth.[ch] ip_log.c)
 	echo -n "$i ";
-	cp $i /sys/netinet
-	chmod 644 /sys/netinet/$i
+	cp $i $ipfdir
+	chmod 644 $ipfdir/$i
+	switch ( $i )
+	case *.h:
+		/bin/cp $i /usr/include/netinet/$i
+		chmod 644 /usr/include/netinet/$i
+		breaksw
+	endsw
 end
 echo ""
 echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h"
 ln -s /usr/include/osreldate.h /sys/sys/osreldate.h
 
-echo ""
-echo "Patching ip6_input.c and ip6_output.c"
-cat FreeBSD-4.0/ipv6-patch-$krev | (cd /sys/netinet6; patch)
+patchfile=FreeBSd-4.0/ipv6-patch-$krev
+if ( -f $patchfile ) then
+	echo ""
+	echo "Patching ip6_input.c and ip6_output.c"
+	cat $patchfile | (cd /sys/netinet6; patch)
+endif
 
 set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1`
 echo -n "Kernel configuration to update [$config] "

==== //depot/projects/ia64/contrib/ipfilter/FreeBSD/kinstall#2 (text+ko) ====

@@ -9,10 +9,16 @@
 if ( $dir =~ */FreeBSD ) cd ..
 echo -n "Installing "
 foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \
-	   ip_proxy.[ch] ip_auth.[ch] ip_{ftp,rcmd}_pxy.c ip_compat.h ip_log.c)
+	   ip_proxy.[ch] ip_auth.[ch] ip_*_pxy.c ip_compat.h ip_log.c)
 	echo -n "$i ";
 	cp $i /sys/netinet
 	chmod 644 /sys/netinet/$i
+	switch ( $i )
+	case *.h:
+		/bin/cp $i /usr/include/netinet/$i
+		chmod 644 /usr/include/netinet/$i
+		breaksw
+	endsw
 end
 echo ""
 grep iplopen $archdir/$karch/conf.c >& /dev/null

==== //depot/projects/ia64/contrib/ipfilter/HISTORY#2 (text+ko) ====

@@ -22,6 +22,219 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+3.4.25	13/03/2002 - Released
+
+retain rule # in state information
+
+log the direction of a packet so ipmon gets it right rather than incorrectly
+deriving it from the rule flags
+
+add #ifdef for IPFILTER_LOGSIZE (put options IPFILTER_LOGSIZE=16384 in BSD
+kernel config files to increase that buffer size)
+
+recognise return-* rules differently to block in ipftest
+
+fix bug in ipmon output for solaris
+
+add regression testing for skip rules, logging and using head/group
+
+fix output of ipmon: was displaying large unsigned ints rather than -1
+when no rules matched.
+
+make logging code compile into ipftest and add -l command line option to
+dump binary log file (read with ipmon -f) when it finishes.
+
+protect rule # and group # from interference when checking accounting rules
+
+add regression testing for log output (text) from ipmon.
+
+document -b command line option for ipmon
+ 
+fix double-quick in Solaris startup script
+
+3.4.24	01/03/2002 - Released
+
+fix how files are installed on SunOS5
+
+fix some minor problems in SunOS5 ipfboot script
+
+by default, compile all OpenBSD tools in 3.0 for IPv6
+
+fix NULL-pointer dereference in NAT code
+
+make a better attempt at replacing the appropriate binaries on BSD systems
+
+always print IPv6 icmp-types as a number
+
+impose some rules about what "skip" can be used with
+
+fix parsing problems with "keep state" and "keep state-age"
+
+Try to read as much data as is in the log device in ipmon
+
+remove some redundant checks when searching for rdr/nat rules
+
+fix bug in handling of ACCT with FTP proxy
+
+increase array size for interface names, using LIFNAMSIZ
+
+include H.323 proxy from QNX
+
+3.4.23	16/01/2002 - Released
+
+Include patches to install IPFilter into OpenBSD 3.0, both for just kernel
+compiles and complete system builds.
+
+Fix bug in automatic flushing of state table which would cause it to hang
+in an infinite loop bug introduced in 3.4.20.
+
+Modify the sample proxy (samples/proxy.c) so that it ads a NAT mapping for
+the outgoing connection to make it look like it comes from the real source.
+
+Only support ICMPv6 with IPv6.
+
+Move ipnat.1 to ipnat.8
+
+Enhance ipmon to print textual ICMP[v6] types and subtypes where possible.
+
+Make it possible to do IPv6 regression testing with ipftest.
+
+Use kvm library for kmem access, rather than trying to do it manually with
+open/lseek/read.
+
+Fix diffs for ip_input.c on BSDOS so it doesn't crash with fastroute.
+
+Remove Berkeley advertising licence clause. Reference:
+ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+
+Add more regression tests: ICMPv6 neighbour discovery, ICMP time exceeded
+and fragmentation required.
+
+Fix ipfboot script on Solaris to deal with no nameservers or no route to
+them in a clean manner.
+
+Support per-rule set timeouts for non-TCP NAT and state
+
+Add netbios proxy
+
+Add ICMPv6 stateful checking, including handling multicast destination
+addresses for neighbour discovery.
+
+Fix problems with internals of ICMP messages for MTU discovery and
+unreachables not being correctly adjust on little endian boxes.
+
+Add "in-via" and "out-via" to filtering rules grammar.  It is now possible
+to bind a rule to both incoming and outgoing interfaces, in both forward
+and reverse directions (4 directions in total).  allows for asymetric flows
+through a firewall.
+
+Fix ipfstat and ipnat for working on crash dumps.
+
+Don't let USE_INET6 stay defined for SunOS4
+
+Count things we see for each interface on solaris.
+
+Include <netinet/icmp6.h> when compiling with USE_INET6 defined and
+also include a whole bunch of #define's to make sure the symbols expected
+can be used.
+
+Fix up fastroute on BSD systems.
+
+Make fastrouting work for IPv6 just a bit better.  doesn't split up big
+packets into fragments like the IPv4 one does.  You can now do a
+"to <if>:<ipv6_addr>"
+
+Remove some of the differences between user-space and kernel-space code
+that is internal to ipfilter.
+
+Call ipfr_slowtimer() after each packet is processed in ipftest to artificially
+create the illusion of passing time and include the expire functions in the
+code compiled for user-space.
+
+Fix issues with the IPSec proxy not working or leading to a system crash.
+
+Junk all processing of SPIs and special handling for ESP.
+
+Add "no-match" as a filter rule action (resets _LAST_ match)
+
+Add hack to workaround problems with Cassini interface cards on
+Solaris and VLANs
+
+Add some protocols to etc/protocols
+
+3.4.22	03/12/2001 - Released
+
+various openbsd changes
+
+sorting based on IP numbers for ipfstat top output
+
+fix various IPv6 code & compile problems
+
+modify ip_fil.c to be more netbsd friendly
+
+fix fastroute bug where it modified a packet post-sending
+
+fix get_unit() - don't understand why it was broken.
+
+add FI_IGNOREPKT and don't count so marked packets when doing stats or
+state/nat.
+
+extend the interface name saved to log output
+
+make proxies capable of extending the matching done on a packet with a
+particular nat session
+
+change interfaces inside NAT & state code to accomodate redesign to allow
+IPsec proxy to work.
+
+fix bug when free'ing loaded rules that results in a memory leak
+(only an issue with "ipf -rf -", not flush)
+
+make ipftest capable of loading > 1 file or rules, making it now possible
+to load both NAT & filter rules
+
+fix hex input for ipftest to allow interface name & direction to work
+
+show ipsec proxy details in ipnat output
+
+if OPT_HEX is set in opts, print a packet out as hex
+
+don't modify b_next or preseve it or preserve b_prev for solaris
+
+fix up kinstall scripts to install all the files everywhere they need to
+
+fix overflowing of bits in ip_off inside iptest
+
+make userauth and proxy in samples directory compile
+
+fix minimum size when doing a pullup for ESP & ICMPv6
+
+3.4.21	24/10/2001 - Released
+
+include ipsec proxy
+
+make state work for non-tcp/udp/icmp in a very simple way
+
+include diffs for ipv6 firewall on openbsd-2.9
+
+add compatibility filter wrapper for NetBSD-current
+
+fix command line option problems with ipfs
+
+if we fill the state table and a automated flush doesn't purge any
+expiring entries, remove all entries idle for more than half a day
+
+fix bug with sending resets/icmp errors where the pointer to the data
+section of the packet was not being set (BSD only)
+
+split out validating ftp commands and responses into different halves,
+one for each of server & client.
+
+do not compile in STATETOP support for specific architectures
+
+fix INSTALL.FreeBSD to no longer provide directions and properly direct
+people to the right file for the right version of FreeBSD.
+
 3.4.20	24/07/2001 - Released
 
 adjust NAT hashing to give a better spread across the table

==== //depot/projects/ia64/contrib/ipfilter/INSTALL.FreeBSD#2 (text+ko) ====

@@ -1,51 +1,7 @@
 
-***  IF you are using FreeBSD 2.2.x,  see the file "INST.FreeBSD-2.2"  ***
-*** IF you are using FreeBSD 3 or later, see the file "INST.FreeBSD-3" ***
-***                  in the "FreeBSD-3" directory                      ***
-
-
-To build a kernel for use with the loadable kernel module, follow these
-steps:
-	1. do "make freebsd"
-
-	2. do "make install-bsd"
-	   (probably has to be done as root)
-
-	3.  run "FreeBSD/minstall" as root
-
-	4. build a new kernel
-
-	5. install and reboot with the new kernel
-
-	6. use modload(8) to load the packet filter with:
-		modload if_ipl.o
-
-	7. do "modstat" to confirm that it has been loaded successfully.
-
-There is no need to use mknod to create the device in /dev;
-- upon loading the module, it will create itself with the correct values,
-  under the name (IPL_NAME) from the Makefile.  It will also remove itself
-  from /dev when it is modunload'd.
-
-To build a kernel with the IP filter, follow these steps:
-
-	1. do "make freebsd"
-
-	2. do "make install-bsd"
-	   (probably has to be done as root)
-
-	3.  run "FreeBSD/kinstall" as root
-
-	4. build a new kernel
-
-	5. create devices for IP Filter as follows (assuming it was
-           installed into the device table as char dev 20):
-	      mknod /dev/ipl c 20 0
-	      mknod /dev/ipnat c 20 1
-	      mknod /dev/ipstate c 20 2
-	      mknod /dev/ipauth c 20 3
-
-	6. install and reboot with the new kernel
+*** IF you are using FreeBSD 2.2.x, see the file "INST.FreeBSD-2.2"  ***
+*** IF you are using FreeBSD 3.x, see the file "FreeBSD-3/INST.FreeBSD-3" ***
+*** IF you are using FreeBSD 4.x, see the file "FreeBSD-4.0/INST.FreeBSD-4" ***
 
 Darren Reed
 darrenr@pobox.com

==== //depot/projects/ia64/contrib/ipfilter/IPFILTER.LICENCE#2 (text+ko) ====

@@ -1,4 +1,4 @@
-Copyright (C) 1993-2001 by Darren Reed.
+Copyright (C) 1993-2002 by Darren Reed.
 
 The author accepts no responsibility for the use of this software and
 provides it on an ``as is'' basis without express or implied warranty.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203192231.g2JMVtK38294>