PERFORCE change 127908 for review
Kip Macy
kmacy at FreeBSD.org
Sun Oct 21 16:17:24 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127908
Change 127908 by kmacy at kmacy:storage:toestack on 2007/10/21 23:16:25
IFethng 127902
Affected files ...
.. //depot/projects/toestack/Makefile#2 integrate
.. //depot/projects/toestack/Makefile.inc1#4 integrate
.. //depot/projects/toestack/UPDATING#5 integrate
.. //depot/projects/toestack/contrib/ipfilter/BSD/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/HISTORY#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/ip_fil.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/ipsend/iptests.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/ipsend/sock.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/ipft_tx.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printnat.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printpacket.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/lib/printstate.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/radix.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/radix_ipf.h#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/Makefile#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/toestack/contrib/ipfilter/test/test.format#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipf_y.y#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipfstat.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipmon.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipnat.c#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/ipnat_y.y#2 integrate
.. //depot/projects/toestack/contrib/ipfilter/tools/lexer.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/CHANGES#2 integrate
.. //depot/projects/toestack/contrib/libpcap/CREDITS#2 integrate
.. //depot/projects/toestack/contrib/libpcap/FILES#2 integrate
.. //depot/projects/toestack/contrib/libpcap/INSTALL#2 delete
.. //depot/projects/toestack/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/toestack/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/toestack/contrib/libpcap/README.dag#2 integrate
.. //depot/projects/toestack/contrib/libpcap/TODO#2 integrate
.. //depot/projects/toestack/contrib/libpcap/VERSION#2 integrate
.. //depot/projects/toestack/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/config.h.in#2 integrate
.. //depot/projects/toestack/contrib/libpcap/configure#2 integrate
.. //depot/projects/toestack/contrib/libpcap/configure.in#2 integrate
.. //depot/projects/toestack/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/fad-win32.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/gencode.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/gencode.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/grammar.y#2 integrate
.. //depot/projects/toestack/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/lbl/gnuc.h#2 delete
.. //depot/projects/toestack/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/packaging/pcap.spec.in#1 branch
.. //depot/projects/toestack/contrib/libpcap/pcap-bpf.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-bpf.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-dag.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-dlpi.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-int.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-linux.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap-win32.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap.3#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pcap.h#2 integrate
.. //depot/projects/toestack/contrib/libpcap/pf.h#2 delete
.. //depot/projects/toestack/contrib/libpcap/savefile.c#2 integrate
.. //depot/projects/toestack/contrib/libpcap/scanner.l#2 integrate
.. //depot/projects/toestack/contrib/pf/pflogd/pflogd.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/CHANGES#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/CREDITS#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/FILES#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/INSTALL#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/Makefile.in#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/README#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/VERSION#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/addrtoname.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/af.c#1 branch
.. //depot/projects/toestack/contrib/tcpdump/af.h#1 branch
.. //depot/projects/toestack/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/configure#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/configure.in#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ieee802_11.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ieee802_11_radio.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/interface.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/llc.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/pf.h#2 delete
.. //depot/projects/toestack/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-atm.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-bgp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-chdlc.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ether.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-fddi.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ip.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ip6.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ipfc.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-isoclns.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-juniper.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-lane.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ldp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-llc.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-null.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-olsr.c#1 branch
.. //depot/projects/toestack/contrib/tcpdump/print-ospf.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-pflog.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-pim.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-rsvp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-sctp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-sll.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-token.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcpdump-stdinc.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcpdump.1#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tests/print-capX.out#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tests/print-capXX.out#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/tftp.h#1 branch
.. //depot/projects/toestack/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/toestack/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/sh.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/sh.lex.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/sh.proc.c#2 integrate
.. //depot/projects/toestack/contrib/tcsh/tc.const.c#2 integrate
.. //depot/projects/toestack/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/toestack/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/ssl.h#2 integrate
.. //depot/projects/toestack/crypto/openssl/ssl/ssl_err.c#2 integrate
.. //depot/projects/toestack/etc/Makefile#3 integrate
.. //depot/projects/toestack/etc/cached.conf#2 delete
.. //depot/projects/toestack/etc/defaults/rc.conf#6 integrate
.. //depot/projects/toestack/etc/nscd.conf#1 branch
.. //depot/projects/toestack/etc/rc.d/Makefile#5 integrate
.. //depot/projects/toestack/etc/rc.d/amd#2 integrate
.. //depot/projects/toestack/etc/rc.d/kerberos#2 integrate
.. //depot/projects/toestack/etc/rc.d/ppp#3 integrate
.. //depot/projects/toestack/etc/rc.d/sensorsd#2 delete
.. //depot/projects/toestack/etc/sensorsd.conf#2 delete
.. //depot/projects/toestack/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/toestack/games/fortune/datfiles/fortunes-o.real#2 integrate
.. //depot/projects/toestack/games/fortune/datfiles/limerick#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/toestack/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/toestack/lib/libbsm/Makefile#2 integrate
.. //depot/projects/toestack/lib/libc/arm/Symbol.map#2 integrate
.. //depot/projects/toestack/lib/libc/gen/sysctl.3#3 integrate
.. //depot/projects/toestack/lib/libc/ia64/Symbol.map#2 integrate
.. //depot/projects/toestack/lib/libc/locale/utf8.c#3 integrate
.. //depot/projects/toestack/lib/libc/net/nscache.c#2 integrate
.. //depot/projects/toestack/lib/libc/powerpc/Symbol.map#2 integrate
.. //depot/projects/toestack/lib/libc/stdlib/atoi.3#2 integrate
.. //depot/projects/toestack/lib/libelf/elf.3#2 integrate
.. //depot/projects/toestack/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/toestack/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/toestack/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/toestack/lib/libpcap/Makefile#2 integrate
.. //depot/projects/toestack/lib/libpcap/config.h#2 integrate
.. //depot/projects/toestack/lib/libstand/Makefile#2 integrate
.. //depot/projects/toestack/lib/libstand/tftp.c#2 integrate
.. //depot/projects/toestack/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/toestack/lib/libthr/thread/thr_pspinlock.c#2 integrate
.. //depot/projects/toestack/lib/ncurses/ncurses/Makefile#2 integrate
.. //depot/projects/toestack/libexec/rtld-elf/sparc64/reloc.c#2 integrate
.. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/toestack/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/toestack/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/toestack/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/toestack/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/toestack/sbin/mount/mount.8#2 integrate
.. //depot/projects/toestack/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/toestack/sbin/sysctl/sysctl.c#3 integrate
.. //depot/projects/toestack/share/man/man4/Makefile#3 integrate
.. //depot/projects/toestack/share/man/man4/coretemp.4#3 integrate
.. //depot/projects/toestack/share/man/man4/it.4#2 delete
.. //depot/projects/toestack/share/man/man4/lm.4#2 delete
.. //depot/projects/toestack/share/man/man5/nsswitch.conf.5#2 integrate
.. //depot/projects/toestack/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/toestack/share/man/man5/src.conf.5#3 integrate
.. //depot/projects/toestack/share/man/man9/Makefile#5 integrate
.. //depot/projects/toestack/share/man/man9/kproc.9#1 branch
.. //depot/projects/toestack/share/man/man9/kthread.9#2 integrate
.. //depot/projects/toestack/share/man/man9/sensor_attach.9#2 delete
.. //depot/projects/toestack/share/mk/bsd.compat.mk#3 integrate
.. //depot/projects/toestack/share/mk/bsd.cpu.mk#2 integrate
.. //depot/projects/toestack/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/toestack/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/toestack/share/mk/bsd.symver.mk#2 integrate
.. //depot/projects/toestack/share/mk/version_gen.awk#2 integrate
.. //depot/projects/toestack/share/termcap/termcap.src#2 integrate
.. //depot/projects/toestack/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/toestack/sys/amd64/conf/GENERIC.hints#3 integrate
.. //depot/projects/toestack/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/toestack/sys/arm/arm/cpufunc_asm_arm11.S#1 branch
.. //depot/projects/toestack/sys/arm/arm/cpufunc_asm_armv5.S#1 branch
.. //depot/projects/toestack/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch
.. //depot/projects/toestack/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/toestack/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/toestack/sys/arm/at91/at91_mcireg.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/toestack/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/toestack/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/toestack/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/toestack/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/toestack/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/toestack/sys/conf/files#5 integrate
.. //depot/projects/toestack/sys/conf/files.amd64#4 integrate
.. //depot/projects/toestack/sys/conf/files.i386#3 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/toestack/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/toestack/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/toestack/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_user_verbs.h#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_verbs.h#2 integrate
.. //depot/projects/toestack/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/toestack/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/toestack/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/toestack/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/toestack/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/toestack/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/toestack/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#8 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#10 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#6 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#7 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/toestack/sys/dev/cxgb/sys/cxgb_support.c#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_dbg.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.h#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cq.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_ev.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_mem.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 integrate
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_user.h#1 branch
.. //depot/projects/toestack/sys/dev/fdc/fdc.c#2 integrate
.. //depot/projects/toestack/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/toestack/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/toestack/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/toestack/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/toestack/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/toestack/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/toestack/sys/dev/ipmi/ipmi_ssif.c#2 integrate
.. //depot/projects/toestack/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/toestack/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/toestack/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/toestack/sys/dev/it/it.c#2 delete
.. //depot/projects/toestack/sys/dev/it/itvar.h#2 delete
.. //depot/projects/toestack/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/toestack/sys/dev/lm/lm78.c#2 delete
.. //depot/projects/toestack/sys/dev/lm/lm78_isa.c#2 delete
.. //depot/projects/toestack/sys/dev/lm/lm78var.h#2 delete
.. //depot/projects/toestack/sys/dev/md/md.c#2 integrate
.. //depot/projects/toestack/sys/dev/mmc/mmcsd.c#2 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/toestack/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/toestack/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/toestack/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_zyd.c#6 integrate
.. //depot/projects/toestack/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/uchcom.c#1 branch
.. //depot/projects/toestack/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/toestack/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/toestack/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/toestack/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/coda/coda_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/toestack/sys/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/toestack/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/toestack/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/toestack/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/toestack/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/toestack/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/toestack/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/toestack/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/toestack/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/toestack/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/toestack/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/toestack/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/toestack/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate
.. //depot/projects/toestack/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/toestack/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/toestack/sys/i386/conf/GENERIC.hints#3 integrate
.. //depot/projects/toestack/sys/i386/i386/in_cksum.c#2 integrate
.. //depot/projects/toestack/sys/i386/include/in_cksum.h#2 integrate
.. //depot/projects/toestack/sys/ia64/disasm/disasm.h#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/toestack/sys/kern/init_main.c#4 integrate
.. //depot/projects/toestack/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_sensors.c#2 delete
.. //depot/projects/toestack/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/toestack/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/toestack/sys/kern/subr_param.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/toestack/sys/kern/syscalls.master#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/toestack/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/toestack/sys/modules/Makefile#4 integrate
.. //depot/projects/toestack/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate
.. //depot/projects/toestack/sys/modules/it/Makefile#2 delete
.. //depot/projects/toestack/sys/modules/lm/Makefile#2 delete
.. //depot/projects/toestack/sys/modules/uchcom/Makefile#1 branch
.. //depot/projects/toestack/sys/net/bpf.h#2 integrate
.. //depot/projects/toestack/sys/net/ethernet.h#2 integrate
.. //depot/projects/toestack/sys/net/if_bridge.c#3 integrate
.. //depot/projects/toestack/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/toestack/sys/net/if_lagg.c#3 integrate
.. //depot/projects/toestack/sys/net/if_vlan.c#2 integrate
.. //depot/projects/toestack/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/toestack/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/toestack/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/toestack/sys/netinet/ip.h#2 integrate
.. //depot/projects/toestack/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/toestack/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_var.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/toestack/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/toestack/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/toestack/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/toestack/sys/opencrypto/crypto.c#2 integrate
.. //depot/projects/toestack/sys/pci/intpm.c#2 integrate
.. //depot/projects/toestack/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/toestack/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/toestack/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/toestack/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/toestack/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/toestack/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/toestack/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/toestack/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/toestack/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/toestack/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/toestack/sys/sys/apm.h#2 integrate
.. //depot/projects/toestack/sys/sys/gpt.h#2 integrate
.. //depot/projects/toestack/sys/sys/kthread.h#2 integrate
.. //depot/projects/toestack/sys/sys/linux_atomic.h#1 branch
.. //depot/projects/toestack/sys/sys/linux_compat.h#2 integrate
.. //depot/projects/toestack/sys/sys/linux_pci.h#1 branch
.. //depot/projects/toestack/sys/sys/param.h#5 integrate
.. //depot/projects/toestack/sys/sys/sensors.h#2 delete
.. //depot/projects/toestack/sys/sys/sysctl.h#3 integrate
.. //depot/projects/toestack/sys/sys/vnode.h#2 integrate
.. //depot/projects/toestack/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/toestack/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_object.c#3 integrate
.. //depot/projects/toestack/sys/vm/vm_param.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/toestack/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/toestack/usr.bin/fmt/fmt.c#2 integrate
.. //depot/projects/toestack/usr.bin/lex/lib/Makefile#2 integrate
.. //depot/projects/toestack/usr.bin/locate/locate/locate.rc#2 integrate
.. //depot/projects/toestack/usr.bin/locate/locate/updatedb.sh#2 integrate
.. //depot/projects/toestack/usr.bin/makewhatis/makewhatis.c#2 integrate
.. //depot/projects/toestack/usr.bin/netstat/sctp.c#3 integrate
.. //depot/projects/toestack/usr.bin/nfsstat/nfsstat.1#2 integrate
.. //depot/projects/toestack/usr.bin/nfsstat/nfsstat.c#2 integrate
.. //depot/projects/toestack/usr.bin/su/su.c#2 integrate
.. //depot/projects/toestack/usr.bin/systat/Makefile#3 integrate
.. //depot/projects/toestack/usr.bin/systat/cmdtab.c#3 integrate
.. //depot/projects/toestack/usr.bin/systat/extern.h#3 integrate
.. //depot/projects/toestack/usr.bin/systat/sensors.c#2 delete
.. //depot/projects/toestack/usr.bin/systat/systat.1#3 integrate
.. //depot/projects/toestack/usr.bin/tail/read.c#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#6 integrate
.. //depot/projects/toestack/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/toestack/usr.sbin/adduser/adduser.sh#2 integrate
.. //depot/projects/toestack/usr.sbin/adduser/rmuser.sh#2 integrate
.. //depot/projects/toestack/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/toestack/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/toestack/usr.sbin/pkg_install/lib/lib.h#2 integrate
.. //depot/projects/toestack/usr.sbin/sensorsd/Makefile#2 delete
.. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.8#2 delete
.. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.c#2 delete
.. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.conf.5#2 delete
.. //depot/projects/toestack/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/tcpdump/tcpdump/config.h#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/l2_packet.c#2 integrate
Differences ...
==== //depot/projects/toestack/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $
+# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
#
# The user-driven targets are:
#
@@ -147,14 +147,14 @@
.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
.if exists(${BW_CANONICALOBJDIR}/)
-rm -rf ${BW_CANONICALOBJDIR}/*
- chflags -R 0 ${BW_CANONICALOBJDIR}
+ -chflags -R 0 ${BW_CANONICALOBJDIR}
rm -rf ${BW_CANONICALOBJDIR}/*
.endif
# To be safe in this case, fall back to a 'make cleandir'
${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
.else
-rm -rf ${.OBJDIR}/*
- chflags -R 0 ${.OBJDIR}
+ -chflags -R 0 ${.OBJDIR}
rm -rf ${.OBJDIR}/*
.endif
==== //depot/projects/toestack/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.588 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -578,7 +578,12 @@
date echo egrep find grep install-info \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc zic; do \
- cp `which $$prog` ${INSTALLTMP}; \
+ if progpath=`which $$prog`; then \
+ cp $$progpath ${INSTALLTMP}; \
+ else \
+ echo "Required install tool $$prog not found" >&2; \
+ exit 1; \
+ fi; \
done
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
rm -rf ${INSTALLTMP}
==== //depot/projects/toestack/UPDATING#5 (text+ko) ====
@@ -21,6 +21,14 @@
developers choose to disable these features on build machines
to maximize performance.
+20071020:
+ The misnamed kthread_create() and friends have been renamed
+ to kproc_create() etc. Many of the callers already
+ used kproc_start()..
+ I will return kthread_create() and friends in a while
+ with implementations that actually create threads, not procs.
+ Renaming corresponds with version 800002.
+
20071010:
RELENG_7 branched.
@@ -913,4 +921,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $
==== //depot/projects/toestack/contrib/ipfilter/BSD/Makefile#2 (text+ko) ====
@@ -485,13 +485,21 @@
cp if_ipl.o /lkm; \
fi
-if [ -d /modules -a -f ipf.ko ] ; then \
- cp ipf.ko /modules; \
+ if [ -f /modules/ipl.ko ] ; then \
+ cp ipf.ko /modules/ipl.ko; \
+ else \
+ cp ipf.ko /modules; \
+ fi \
fi
-if [ -d /modules -a -f ipfrule.ko ] ; then \
cp ipfrule.ko /modules; \
fi
-if [ -d /boot/kernel -a -f ipf.ko ] ; then \
- cp ipf.ko /boot/kernel; \
+ if [ -f /boot/kernel/ipl.ko ] ; then \
+ cp ipf.ko /boot/kernel/ipl.ko; \
+ else \
+ cp ipf.ko /boot/kernel; \
+ fi \
fi
-if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \
cp ipfrule.ko /boot/kernel; \
==== //depot/projects/toestack/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ====
@@ -32,11 +32,15 @@
fi
if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
- echo "Please do a build of ipfilter and then run the following"
- echo "command to build extra files:"
- echo
- echo "make ip_rules.c"
- exit 1
+ echo "Trying to build ip_rules.c and ip_rules.h"
+ make ip_rules.c
+ if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
+ echo "Please do a build of ipfilter and then run the following"
+ echo "command to build extra files:"
+ echo
+ echo "make ip_rules.c"
+ exit 1
+ fi
fi
echo -n "Installing "
==== //depot/projects/toestack/contrib/ipfilter/HISTORY#2 (text+ko) ====
@@ -10,12 +10,110 @@
# and especially those who have found the time to port IP Filter to new
# platforms.
#
+4.1.28 - Release 16 October 2007
+
+backout changes (B1) & (B2) as they've caused NAT entries to persist for
+too long and possibly other side effects.
+
+Still need to compile in our own radix.c for Solaris as the one in S10U4
+has a different alignment of structure members (causes panic)
+
+keep state doesn't work with multicast/broadcast packets (makes UPnP easier)
+
+ippool -l may only lists every 2nd pool's contents
+
+4.1.27 - Released 29 September 2007
+
+SunOS5/replace script does not deal with i386 systems that have the
+i86/amd64 directory pair.
+
+make BSD/kupgrade try to build ip_rules.[ch] before complaining
+
+Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko
+
+Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs
+to drive 32bit cc builds differently for sparc/i386 now.
+
+Update instructions for rebuilding FreeBSD kernels
+
+Make the target "freebsd" work for building ipfilter
+
+destroying NAT entries for blocked packets can lead to NAT table entry leak,
+provide a counter of orphan'd NAT entries to track this problem.
+
+4.1.26 - Released 24 September 2007
+
+Fix build problem for Solaris prior to S10U4
+
+4.1.25 - Released 20 September 2007
+
+stepping through structures with ioctls can lead to the wrong things
+being free'd and panics
+
+if a NAT entry (such as an rdr) is created but the packet ends up being
+blocked, tear down the NAT entry.
+
+fix fragment cache preventing keep state from functioning
+
+fix handling of \ to indicate a continued line in .conf files
+
+include port ranges in the allowed input for ipf when using "port = ()"
+
+only advance TCP state for packets on the leading edge of the window. (B1)
+
+using ipnat -l can lead to memory corruption in high stress situations
+
+track TCP sequence numbers with NAT so that it can do timeout advances
+correctly inline with state
+
+ICMP checksums for some redirect'd packets are not adjusted correctly.
+
+IPv6 address components need to be explicitly cast to a 32bit pointer
+boundary so that compilers don't try to access them as two 64bit
+pieces (no guarantee is made that an Ipv6 address is on a 64bit
+aligned address)
+
+filling up the ipauth packet queue can lead to no more packets being
+processed.
+
+locking used to deref a nat entry causes a significant performance hit
+
+m_pulldown isn't properly handled, leading to possible panics with ICMPv6
+packets
+
+IPv6 fragment handling doesn't allow for "keep frag" to work
+
+build on Solaris10 Update4 with pfhooks in the kernel
+
+logging of Ipv6 packets with extension headers fix - Miroslaw Luc
+
+4.1.24 - Released 8 July 2007
+
+patch from Stuart Remphrey to address recursive mutex lock with TCP state
+
+add hash table bucket stats display to ipnat -s
+
+give ASSERT some teeth for user compiles
+
+initialising ipf_global, ipf_frcache, ipf_mutex should all be done very
+early on
+
+do some caddr_t cleanup, where possible
+
+fr_ref no longer tracks the number of children rules in a group for head rules
+
+make sure all BCOPY* have a value assigned to something
+
+fix possible use of icmp pointer after pullup makes it invalid
+
+resolve compile problems related to FreeBSD tree
+
4.1.23 - Released 31 May 2007
NAT was not always correctly fixing ICMP headers for errors
some TCP state steps when closing do not update timeouts, leading to
-them being removed prematurely.
+them being removed prematurely. (B2)
fix compilation problems for netbsd 4.99
==== //depot/projects/toestack/contrib/ipfilter/Makefile#2 (text+ko) ====
@@ -5,8 +5,8 @@
# provided that this notice is preserved and due credit is given
# to the original author and the contributors.
#
-# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7 2007/06/04 02:54:31 darrenr Exp $
-# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.8 2007/10/18 21:52:11 darrenr Exp $
+# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
#
SHELL=/bin/sh
BINDEST=/usr/local/bin
@@ -132,10 +132,7 @@
@echo "openbsd - compile for OpenBSD"
@echo "freebsd20 - compile for FreeBSD 2.0, 2.1 or earlier"
@echo "freebsd22 - compile for FreeBSD-2.2 or greater"
- @echo "freebsd3 - compile for FreeBSD-3.x"
- @echo "freebsd4 - compile for FreeBSD-4.x"
- @echo "freebsd5 - compile for FreeBSD-5.x"
- @echo "freebsd6 - compile for FreeBSD-6.x"
+ @echo "freebsd - compile for all other versions of FreeBSD"
@echo "bsd - compile for generic 4.4BSD systems"
@echo "bsdi - compile for BSD/OS"
@echo "irix - compile for SGI IRIX"
@@ -152,6 +149,7 @@
else echo test directory not present, sorry; fi
include:
+ -mkdir -p net netinet
if [ ! -f netinet/done ] ; then \
(cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \
(cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \
@@ -167,6 +165,9 @@
MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \
CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos
+freebsd:
+ make freebsd`uname -r|cut -c1`
+
freebsd22: include
make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)"
-rm -f BSD/$(CPUDIR)/ioconf.h
@@ -351,13 +352,9 @@
(cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..)
sunos5 solaris2: null
- (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..)
+ (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..)
(cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
-sunos5x86 solaris2x86: null
- (cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..)
- (cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
-
linux: include
(cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..)
(cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..)
@@ -374,7 +371,7 @@
(cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install)
install-sunos5: solaris null
- (cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install)
+ (cd SunOS5; $(MAKE) TOP=.. install)
install-aix:
(cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..)
==== //depot/projects/toestack/contrib/ipfilter/ip_fil.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
@@ -7,7 +7,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.16 2007/05/28 11:56:22 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $";
#endif
#ifndef SOLARIS
@@ -81,7 +81,7 @@
#include <sys/hashing.h>
# endif
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(SOLARIS2)
# include "radix_ipf.h"
#endif
#ifndef __osf__
@@ -390,7 +390,7 @@
*addr++ = '\0';
for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) {
- COPYIFNAME(ifp, ifname);
+ COPYIFNAME(v, ifp, ifname);
if (!strcmp(name, ifname)) {
if (addr != NULL)
fr_setifpaddr(ifp, addr);
@@ -429,6 +429,9 @@
}
ifp = ifneta[nifs - 1];
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ TAILQ_INIT(&ifp->if_addrlist);
+#endif
#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
==== //depot/projects/toestack/contrib/ipfilter/iplang/Makefile#2 (text+ko) ====
@@ -3,20 +3,21 @@
#
#CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O
CFLAGS=-I..
+CCARGS=$(DEBUG) -I. -I.. $(CFLAGS) -I$(DESTDIR) -I$(DESTDIR)/.. -I../ipsend
all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o
$(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c
- $(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
+ $(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
$(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c
- $(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
+ $(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
iplang_y.o: iplang_y.c
- $(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+ $(CC) $(CCARGS) $< -o $@
iplang_l.o: iplang_l.c
- $(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+ $(CC) $(CCARGS) $< -o $@
$(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h
lex iplang_l.l
==== //depot/projects/toestack/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13 2007/06/04 02:54:31 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
@@ -8,7 +8,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
@@ -22,6 +22,9 @@
#endif
#include <sys/time.h>
#if !defined(__osf__)
+# ifdef __NetBSD__
+# include <machine/lock.h>
+# endif
# define _KERNEL
# define KERNEL
# if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux)
@@ -1097,7 +1100,8 @@
struct tcpcb *tcbp, tcb;
struct tcpiphdr ti;
struct sockaddr_in sin;
- int fd, slen;
+ int fd;
+ socklen_t slen;
bzero((char *)&sin, sizeof(sin));
==== //depot/projects/toestack/contrib/ipfilter/ipsend/sock.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18 2007/06/04 02:54:31 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */
/*
* sock.c (C) 1995-1998 Darren Reed
*
@@ -7,7 +7,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
@@ -30,6 +30,9 @@
# include <sys/dir.h>
#endif
#if !defined(__osf__)
+# ifdef __NetBSD__
+# include <machine/lock.h>
+# endif
# define _KERNEL
# define KERNEL
# ifdef ultrix
@@ -385,7 +388,8 @@
{
struct sockaddr_in rsin, lsin;
struct tcpcb *t, tcb;
- int fd, nfd, len;
+ int fd, nfd;
+ socklen_t len;
printf("Dest. Port: %d\n", ti->ti_dport);
==== //depot/projects/toestack/contrib/ipfilter/l4check/Makefile#2 (text+ko) ====
@@ -4,7 +4,7 @@
all: l4check
l4check: l4check.c
- $(CC) -g -I.. $(CFLAGS) $(LIBS) l4check.c -o $@
+ $(CC) -g -I.. -Wall $(CFLAGS) $(LIBS) l4check.c -o $@
clean:
/bin/rm -f l4check
==== //depot/projects/toestack/contrib/ipfilter/l4check/l4check.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.3 2007/10/18 21:52:12 darrenr Exp $ */
/*
* (C)Copyright March, 2000 - Darren Reed.
@@ -27,6 +27,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list