PERFORCE change 128134 for review

Warner Losh imp at FreeBSD.org
Fri Oct 26 07:50:05 PDT 2007 

http://perforce.freebsd.org/chv.cgi?CH=128134

Change 128134 by imp at imp_paco-paco on 2007/10/26 14:49:26

	IFC @128108

Affected files ...

.. //depot/projects/arm/src/Makefile#12 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#30 integrate
.. //depot/projects/arm/src/UPDATING#22 integrate
.. //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/HISTORY#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/ipsend/sock.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/ipft_tx.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printnat.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printpacket.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/lib/printstate.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/radix.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/radix_ipf.h#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/Makefile#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/arm/src/contrib/ipfilter/test/test.format#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipf_y.y#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipfstat.c#5 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipmon.c#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat.c#3 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat_y.y#4 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/lexer.c#4 integrate
.. //depot/projects/arm/src/contrib/libpcap/pcap.h#4 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/FIXES#3 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/FREEBSD-upgrade#3 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/lib.c#3 integrate
.. //depot/projects/arm/src/contrib/one-true-awk/tran.c#2 integrate
.. //depot/projects/arm/src/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/arm/src/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/ssl.h#5 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/ssl_err.c#4 integrate
.. //depot/projects/arm/src/etc/Makefile#7 integrate
.. //depot/projects/arm/src/etc/cached.conf#2 delete
.. //depot/projects/arm/src/etc/nscd.conf#2 integrate
.. //depot/projects/arm/src/etc/rc.d/Makefile#12 integrate
.. //depot/projects/arm/src/etc/rc.d/amd#3 integrate
.. //depot/projects/arm/src/etc/rc.d/kerberos#3 integrate
.. //depot/projects/arm/src/etc/rc.d/named#2 integrate
.. //depot/projects/arm/src/etc/rc.d/nfslocking#6 delete
.. //depot/projects/arm/src/etc/rc.d/ppp#5 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/fortunes#15 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate
.. //depot/projects/arm/src/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#14 integrate
.. //depot/projects/arm/src/lib/libbsm/Makefile#6 integrate
.. //depot/projects/arm/src/lib/libc/arm/Symbol.map#5 integrate
.. //depot/projects/arm/src/lib/libc/ia64/Symbol.map#4 integrate
.. //depot/projects/arm/src/lib/libc/locale/iswctype.c#4 integrate
.. //depot/projects/arm/src/lib/libc/powerpc/Symbol.map#5 integrate
.. //depot/projects/arm/src/lib/libc/stdlib/atoi.3#3 integrate
.. //depot/projects/arm/src/lib/libc/sys/kldstat.2#2 integrate
.. //depot/projects/arm/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/arm/src/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/arm/src/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/arm/src/lib/libelf/elf_update.3#4 integrate
.. //depot/projects/arm/src/lib/libelf/gelf_getphdr.3#3 integrate
.. //depot/projects/arm/src/lib/libelf/gelf_newehdr.3#3 integrate
.. //depot/projects/arm/src/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/arm/src/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libstand/Makefile#5 integrate
.. //depot/projects/arm/src/lib/libstand/tftp.c#2 integrate
.. //depot/projects/arm/src/lib/libthr/libthr.3#2 integrate
.. //depot/projects/arm/src/lib/ncurses/ncurses/Makefile#7 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 integrate
.. //depot/projects/arm/src/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/arm/src/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/arm/src/sbin/gpt/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/gpt/add.c#3 integrate
.. //depot/projects/arm/src/sbin/gpt/boot.c#1 branch
.. //depot/projects/arm/src/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/arm/src/sbin/gpt/gpt.c#2 integrate
.. //depot/projects/arm/src/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/arm/src/sbin/gpt/show.c#2 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw.8#12 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#13 integrate
.. //depot/projects/arm/src/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/arm/src/sbin/mount/mount.8#6 integrate
.. //depot/projects/arm/src/share/man/man3/pthread.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_attr.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_attr_get_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cancel.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cleanup_pop.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cleanup_push.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_broadcast.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_init.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_signal.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_timedwait.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_wait.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_condattr.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_create.3#5 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_detach.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_equal.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_exit.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_getconcurrency.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_getspecific.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_join.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_key_create.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_key_delete.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_kill.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_main_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_multi_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_init.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_lock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_trylock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_unlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutexattr.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutexattr_getkind_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_once.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_resume_all_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_resume_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_init.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_rdlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_unlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_destroy.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_getpshared.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_init.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_schedparam.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_self.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_set_name_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_setspecific.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_sigmask.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_switch_add_np.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_testcancel.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/arm/src/share/man/man5/nsswitch.conf.5#3 integrate
.. //depot/projects/arm/src/share/man/man5/src.conf.5#12 integrate
.. //depot/projects/arm/src/share/man/man9/kproc.9#1 branch
.. //depot/projects/arm/src/share/man/man9/kthread.9#2 integrate
.. //depot/projects/arm/src/share/misc/committers-src.dot#8 integrate
.. //depot/projects/arm/src/share/mk/bsd.compat.mk#4 integrate
.. //depot/projects/arm/src/share/mk/bsd.lib.mk#9 integrate
.. //depot/projects/arm/src/share/mk/bsd.own.mk#16 integrate
.. //depot/projects/arm/src/share/mk/bsd.symver.mk#5 integrate
.. //depot/projects/arm/src/share/mk/version_gen.awk#5 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/msi.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#8 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#26 integrate
.. //depot/projects/arm/src/sys/amd64/include/clock.h#6 integrate
.. //depot/projects/arm/src/sys/amd64/isa/clock.c#15 integrate
.. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#18 integrate
.. //depot/projects/arm/src/sys/arm/arm/identcpu.c#14 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#8 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#22 integrate
.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#72 integrate
.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#45 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.at91#6 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.kb920x#7 integrate
.. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#13 integrate
.. //depot/projects/arm/src/sys/arm/include/armreg.h#7 integrate
.. //depot/projects/arm/src/sys/arm/include/cpuconf.h#8 integrate
.. //depot/projects/arm/src/sys/arm/include/cpufunc.h#10 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#10 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#45 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#13 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#23 integrate
.. //depot/projects/arm/src/sys/boot/common/ufsread.c#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/boot2/boot2.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/arm/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/arm/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/arm/src/sys/boot/i386/libi386/bioscd.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/devicename.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/loader/main.c#9 integrate
.. //depot/projects/arm/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/arm/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.c#5 integrate
.. //depot/projects/arm/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate
.. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosdisk.c#5 integrate
.. //depot/projects/arm/src/sys/boot/pc98/loader/main.c#6 integrate
.. //depot/projects/arm/src/sys/cam/cam_xpt.c#23 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_file.c#14 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#9 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#28 integrate
.. //depot/projects/arm/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/projects/arm/src/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#6 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#11 integrate
.. //depot/projects/arm/src/sys/conf/files#80 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#29 integrate
.. //depot/projects/arm/src/sys/conf/files.arm#9 integrate
.. //depot/projects/arm/src/sys/conf/files.i386#31 integrate
.. //depot/projects/arm/src/sys/conf/files.ia64#11 integrate
.. //depot/projects/arm/src/sys/conf/files.powerpc#17 integrate
.. //depot/projects/arm/src/sys/conf/files.sun4v#9 integrate
.. //depot/projects/arm/src/sys/conf/options.arm#24 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#9 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_htable.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.h#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.h#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ipl.h#6 integrate
.. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#12 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_table.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac.c#7 integrate
.. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#8 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#12 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_thermal.c#8 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#9 integrate
.. //depot/projects/arm/src/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ciss/ciss.c#18 integrate
.. //depot/projects/arm/src/sys/dev/fdc/fdc.c#10 integrate
.. //depot/projects/arm/src/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/arm/src/sys/dev/flash/at45d.c#14 integrate
.. //depot/projects/arm/src/sys/dev/hptmv/entry.c#10 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#13 integrate
.. //depot/projects/arm/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#33 integrate
.. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#20 integrate
.. //depot/projects/arm/src/sys/dev/md/md.c#10 integrate
.. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#14 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt.h#29 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#43 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#13 integrate
.. //depot/projects/arm/src/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/arm/src/sys/dev/ofw/ofw_disk.c#3 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#19 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#12 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/arm/src/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/arm/src/sys/dev/random/randomdev_soft.c#7 integrate
.. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#10 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#18 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/uchcom.c#1 branch
.. //depot/projects/arm/src/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb.c#10 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_port.h#12 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#39 integrate
.. //depot/projects/arm/src/sys/dev/utopia/utopia.c#4 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#10 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#20 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/denode.h#8 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#9 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_fat.c#7 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#22 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate
.. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#10 integrate
.. //depot/projects/arm/src/sys/geom/bde/g_bde.c#3 integrate
.. //depot/projects/arm/src/sys/geom/bde/g_bde_work.c#5 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli.c#20 integrate
.. //depot/projects/arm/src/sys/geom/journal/g_journal.c#6 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#21 integrate
.. //depot/projects/arm/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#26 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_volume.c#5 integrate
.. //depot/projects/arm/src/sys/i386/bios/apm.c#5 integrate
.. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#8 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#26 integrate
.. //depot/projects/arm/src/sys/i386/conf/PAE#9 integrate
.. //depot/projects/arm/src/sys/i386/i386/in_cksum.c#3 integrate
.. //depot/projects/arm/src/sys/i386/i386/msi.c#6 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#8 integrate
.. //depot/projects/arm/src/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/arm/src/sys/i386/include/clock.h#8 integrate
.. //depot/projects/arm/src/sys/i386/include/in_cksum.h#3 integrate
.. //depot/projects/arm/src/sys/i386/isa/clock.c#15 integrate
.. //depot/projects/arm/src/sys/kern/init_main.c#19 integrate
.. //depot/projects/arm/src/sys/kern/kern_acct.c#18 integrate
.. //depot/projects/arm/src/sys/kern/kern_alq.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_environment.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/arm/src/sys/kern/kern_exit.c#26 integrate
.. //depot/projects/arm/src/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/arm/src/sys/kern/kern_idle.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_intr.c#15 integrate
.. //depot/projects/arm/src/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/arm/src/sys/kern/kern_kthread.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_ktrace.c#16 integrate
.. //depot/projects/arm/src/sys/kern/kern_linker.c#13 integrate
.. //depot/projects/arm/src/sys/kern/kern_mbuf.c#17 integrate
.. //depot/projects/arm/src/sys/kern/kern_prot.c#13 integrate
.. //depot/projects/arm/src/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_sig.c#25 integrate
.. //depot/projects/arm/src/sys/kern/kern_sysctl.c#12 integrate
.. //depot/projects/arm/src/sys/kern/link_elf.c#9 integrate
.. //depot/projects/arm/src/sys/kern/link_elf_obj.c#8 integrate
.. //depot/projects/arm/src/sys/kern/sched_ule.c#28 integrate
.. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sys_pipe.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sys_socket.c#8 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#25 integrate
.. //depot/projects/arm/src/sys/kern/sysv_msg.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sysv_sem.c#11 integrate
.. //depot/projects/arm/src/sys/kern/sysv_shm.c#8 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mbuf2.c#4 integrate
.. //depot/projects/arm/src/sys/kern/uipc_sem.c#10 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#39 integrate
.. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#29 integrate
.. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#29 integrate
.. //depot/projects/arm/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/arm/src/sys/kern/vfs_aio.c#19 integrate
.. //depot/projects/arm/src/sys/kern/vfs_bio.c#23 integrate
.. //depot/projects/arm/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/arm/src/sys/kern/vfs_lookup.c#18 integrate
.. //depot/projects/arm/src/sys/kern/vfs_mount.c#34 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#38 integrate
.. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#33 integrate
.. //depot/projects/arm/src/sys/kern/vfs_vnops.c#17 integrate
.. //depot/projects/arm/src/sys/modules/Makefile#51 integrate
.. //depot/projects/arm/src/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/uchcom/Makefile#1 branch
.. //depot/projects/arm/src/sys/net/bpf.c#23 integrate
.. //depot/projects/arm/src/sys/net/bpf.h#8 integrate
.. //depot/projects/arm/src/sys/net/bsd_comp.c#4 integrate
.. //depot/projects/arm/src/sys/net/ethernet.h#10 integrate
.. //depot/projects/arm/src/sys/net/if.c#23 integrate
.. //depot/projects/arm/src/sys/net/if_atmsubr.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_bridge.c#37 integrate
.. //depot/projects/arm/src/sys/net/if_ethersubr.c#28 integrate
.. //depot/projects/arm/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_fwsubr.c#7 integrate
.. //depot/projects/arm/src/sys/net/if_gif.c#12 integrate
.. //depot/projects/arm/src/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_lagg.c#11 integrate
.. //depot/projects/arm/src/sys/net/if_ppp.c#13 integrate
.. //depot/projects/arm/src/sys/net/if_stf.c#10 integrate
.. //depot/projects/arm/src/sys/net/if_tun.c#10 integrate
.. //depot/projects/arm/src/sys/net/if_vlan.c#22 integrate
.. //depot/projects/arm/src/sys/net/route.c#8 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp_input.c#4 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp_output.c#6 integrate
.. //depot/projects/arm/src/sys/netgraph/netgraph.h#8 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_base.c#13 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_socket.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/ip.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_divert.c#14 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#39 integrate
.. //depot/projects/arm/src/sys/netinet/ip_icmp.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/ip_input.c#23 integrate
.. //depot/projects/arm/src/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#26 integrate
.. //depot/projects/arm/src/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#38 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_output.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#34 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#28 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#26 integrate
.. //depot/projects/arm/src/sys/netinet6/nd6.c#18 integrate
.. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#18 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_iod.c#3 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#9 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_nfsiod.c#6 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#16 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#16 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#12 integrate
.. //depot/projects/arm/src/sys/opencrypto/crypto.c#8 integrate
.. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#18 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/genassym.c#5 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/swtch.S#2 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/vm_machdep.c#8 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.c#20 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.h#10 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#14 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#16 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_worker.c#6 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_audit.c#3 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_framework.h#10 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_internal.h#6 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_net.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_pipe.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_posix_sem.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_process.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_socket.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_system.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_sysv_msg.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_sysv_sem.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_sysv_shm.c#6 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_vfs.c#11 integrate
.. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#12 integrate
.. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate
.. //depot/projects/arm/src/sys/security/mac_ifoff/mac_ifoff.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#11 integrate
.. //depot/projects/arm/src/sys/security/mac_mls/mac_mls.c#11 integrate
.. //depot/projects/arm/src/sys/security/mac_none/mac_none.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac_partition/mac_partition.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#9 integrate
.. //depot/projects/arm/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#10 integrate
.. //depot/projects/arm/src/sys/security/mac_test/mac_test.c#9 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/simdisk.c#3 integrate
.. //depot/projects/arm/src/sys/sys/apm.h#2 integrate
.. //depot/projects/arm/src/sys/sys/gpt.h#4 integrate
.. //depot/projects/arm/src/sys/sys/kthread.h#2 integrate
.. //depot/projects/arm/src/sys/sys/linker.h#5 integrate
.. //depot/projects/arm/src/sys/sys/param.h#37 integrate
.. //depot/projects/arm/src/sys/sys/pciio.h#3 integrate
.. //depot/projects/arm/src/sys/sys/priv.h#7 integrate
.. //depot/projects/arm/src/sys/sys/vnode.h#19 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#20 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#26 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#18 integrate
.. //depot/projects/arm/src/sys/vm/swap_pager.c#16 integrate
.. //depot/projects/arm/src/sys/vm/vm_map.c#18 integrate
.. //depot/projects/arm/src/sys/vm/vm_mmap.c#12 integrate
.. //depot/projects/arm/src/sys/vm/vm_object.c#24 integrate
.. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#14 integrate
.. //depot/projects/arm/src/sys/vm/vnode_pager.c#12 integrate
.. //depot/projects/arm/src/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/arm/src/usr.bin/awk/Makefile#4 integrate
.. //depot/projects/arm/src/usr.bin/awk/lib.c.diff#3 delete
.. //depot/projects/arm/src/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#18 integrate
.. //depot/projects/arm/src/usr.bin/lex/lib/Makefile#2 integrate
.. //depot/projects/arm/src/usr.bin/makewhatis/makewhatis.c#2 integrate
.. //depot/projects/arm/src/usr.bin/nfsstat/nfsstat.1#3 integrate
.. //depot/projects/arm/src/usr.bin/nfsstat/nfsstat.c#2 integrate
.. //depot/projects/arm/src/usr.bin/su/su.c#7 integrate
.. //depot/projects/arm/src/usr.sbin/adduser/adduser.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/adduser/adduser.sh#4 integrate
.. //depot/projects/arm/src/usr.sbin/adduser/rmuser.sh#2 integrate
.. //depot/projects/arm/src/usr.sbin/mountd/mountd.8#3 integrate
.. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#7 integrate
.. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/traceroute6/traceroute6.c#5 integrate

Differences ...

==== //depot/projects/arm/src/Makefile#12 (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:
 #
@@ -149,14 +149,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/arm/src/ObsoleteFiles.inc#30 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
+OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
@@ -579,11 +581,17 @@
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a   
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
 .endif
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig

==== //depot/projects/arm/src/UPDATING#22 (text+ko) ====

@@ -21,6 +21,27 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071024:
+	It has been decided that it is desirable to provide ABI
+	backwards compatibility to the FreeBSD 4/5/6 versions of the
+	PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+	broken with the introduction of PCI domain support (see the
+	20070930 entry). Unfortunately, this required the ABI of
+	PCIOCGETCONF to be broken again in order to be able to
+	provide backwards compatibility to the old version of that
+	IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+	again. As for prominent ports this affects neither pciutils
+	nor xorg-server this time, the hal port needs to be rebuilt
+	however.
+
+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 +934,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.511 2007/10/24 20:51:43 marius Exp $

==== //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#4 (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/arm/src/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/arm/src/contrib/ipfilter/HISTORY#4 (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/arm/src/contrib/ipfilter/Makefile#4 (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/arm/src/contrib/ipfilter/ip_fil.c#4 (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/arm/src/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/arm/src/contrib/ipfilter/ipsend/iptests.c#4 (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/arm/src/contrib/ipfilter/ipsend/sock.c#4 (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;

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

More information about the p4-projects mailing list