PERFORCE change 94553 for review

Peter Wemm peter at FreeBSD.org
Mon Apr 3 19:54:20 UTC 2006


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

Change 94553 by peter at peter_daintree on 2006/04/03 19:53:30

	IFC @94550

Affected files ...

.. //depot/projects/hammer/MAINTAINERS#40 integrate
.. //depot/projects/hammer/Makefile.inc1#115 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#16 integrate
.. //depot/projects/hammer/bin/sh/builtins.def#6 integrate
.. //depot/projects/hammer/bin/sh/main.c#5 integrate
.. //depot/projects/hammer/bin/sh/mkbuiltins#7 integrate
.. //depot/projects/hammer/contrib/hostapd/config.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/config.h#3 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd.conf#3 integrate
.. //depot/projects/hammer/contrib/libreadline/CHANGELOG#4 integrate
.. //depot/projects/hammer/contrib/libreadline/CHANGES#4 integrate
.. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#5 integrate
.. //depot/projects/hammer/contrib/libreadline/INSTALL#4 integrate
.. //depot/projects/hammer/contrib/libreadline/MANIFEST#4 integrate
.. //depot/projects/hammer/contrib/libreadline/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/libreadline/NEWS#2 integrate
.. //depot/projects/hammer/contrib/libreadline/README#4 integrate
.. //depot/projects/hammer/contrib/libreadline/aclocal.m4#4 integrate
.. //depot/projects/hammer/contrib/libreadline/bind.c#5 integrate
.. //depot/projects/hammer/contrib/libreadline/callback.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/chardefs.h#4 integrate
.. //depot/projects/hammer/contrib/libreadline/complete.c#6 integrate
.. //depot/projects/hammer/contrib/libreadline/config.h.in#4 integrate
.. //depot/projects/hammer/contrib/libreadline/configure#4 integrate
.. //depot/projects/hammer/contrib/libreadline/configure.in#4 integrate
.. //depot/projects/hammer/contrib/libreadline/display.c#6 integrate
.. //depot/projects/hammer/contrib/libreadline/doc/readline.3#6 integrate
.. //depot/projects/hammer/contrib/libreadline/doc/rltech.texi#2 integrate
.. //depot/projects/hammer/contrib/libreadline/doc/rluser.texi#2 integrate
.. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texi#2 integrate
.. //depot/projects/hammer/contrib/libreadline/doc/version.texi#2 integrate
.. //depot/projects/hammer/contrib/libreadline/examples/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/libreadline/examples/histexamp.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/examples/rl.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/examples/rlcat.c#2 integrate
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe.c#2 delete
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/ChangeLog#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/README#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/config.h.in#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/configure#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/configure.in#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/extern.h#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/os.h#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/pty.c#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/rlfe.c#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlfe/screen.h#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rlptytest.c#1 branch
.. //depot/projects/hammer/contrib/libreadline/examples/rltest.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/examples/rlversion.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/funmap.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/histexpand.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/history.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/input.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/isearch.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/macro.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/mbutil.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/misc.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/readline.c#5 integrate
.. //depot/projects/hammer/contrib/libreadline/readline.h#6 integrate
.. //depot/projects/hammer/contrib/libreadline/rldefs.h#4 integrate
.. //depot/projects/hammer/contrib/libreadline/rlmbutil.h#3 integrate
.. //depot/projects/hammer/contrib/libreadline/rlprivate.h#4 integrate
.. //depot/projects/hammer/contrib/libreadline/rltty.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/search.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/shell.c#6 integrate
.. //depot/projects/hammer/contrib/libreadline/shlib/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/libreadline/signals.c#4 integrate
.. //depot/projects/hammer/contrib/libreadline/support/config.guess#4 integrate
.. //depot/projects/hammer/contrib/libreadline/support/shlib-install#4 integrate
.. //depot/projects/hammer/contrib/libreadline/support/shobj-conf#4 integrate
.. //depot/projects/hammer/contrib/libreadline/support/wcwidth.c#2 delete
.. //depot/projects/hammer/contrib/libreadline/terminal.c#6 integrate
.. //depot/projects/hammer/contrib/libreadline/text.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/tilde.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/tilde.h#3 integrate
.. //depot/projects/hammer/contrib/libreadline/undo.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/util.c#6 integrate
.. //depot/projects/hammer/contrib/libreadline/vi_keymap.c#3 integrate
.. //depot/projects/hammer/contrib/libreadline/vi_mode.c#6 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_class#2 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_control#2 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_user#2 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_warn#2 integrate
.. //depot/projects/hammer/contrib/pf/authpf/authpf.8#4 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#48 integrate
.. //depot/projects/hammer/etc/rc.d/ike#6 delete
.. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#9 integrate
.. //depot/projects/hammer/gnu/lib/libreadline/config.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdbserver/Makefile#2 delete
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete
.. //depot/projects/hammer/include/Makefile#56 integrate
.. //depot/projects/hammer/include/malloc_np.h#1 branch
.. //depot/projects/hammer/include/res_update.h#1 branch
.. //depot/projects/hammer/lib/libc/gdtoa/Symbol.map#2 integrate
.. //depot/projects/hammer/lib/libc/gen/tls.c#8 integrate
.. //depot/projects/hammer/lib/libc/include/namespace.h#10 integrate
.. //depot/projects/hammer/lib/libc/include/un-namespace.h#9 integrate
.. //depot/projects/hammer/lib/libc/locale/Symbol.map#2 integrate
.. //depot/projects/hammer/lib/libc/locale/utf8.c#12 integrate
.. //depot/projects/hammer/lib/libc/net/Symbol.map#3 integrate
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#28 integrate
.. //depot/projects/hammer/lib/libc/net/getnameinfo.c#6 integrate
.. //depot/projects/hammer/lib/libc/net/name6.c#21 integrate
.. //depot/projects/hammer/lib/libc/net/res_mkupdate.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/res_update.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/res_update.h#2 delete
.. //depot/projects/hammer/lib/libc/resolv/Symbol.map#2 integrate
.. //depot/projects/hammer/lib/libc/resolv/res_data.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/Symbol.map#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#21 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#14 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#17 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#11 integrate
.. //depot/projects/hammer/lib/libc/stdio/xprintf.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#16 integrate
.. //depot/projects/hammer/lib/libc/stdlib/Symbol.map#3 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.3#10 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#26 integrate
.. //depot/projects/hammer/lib/libpmc/pmclog.3#5 integrate
.. //depot/projects/hammer/lib/libpmc/pmclog.c#4 integrate
.. //depot/projects/hammer/lib/libpmc/pmclog.h#3 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#21 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_barrier.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_getprio.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#35 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#8 integrate
.. //depot/projects/hammer/lib/librt/sigev_thread.c#3 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#17 integrate
.. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#13 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#10 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_create.c#21 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#22 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#13 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#28 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#4 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#30 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#12 integrate
.. //depot/projects/hammer/lib/libthread_db/Makefile#7 integrate
.. //depot/projects/hammer/lib/libthread_db/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/Makefile#31 integrate
.. //depot/projects/hammer/lib/msun/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/alpha/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/msun/alpha/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/msun/amd64/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/arm/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/msun/arm/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/i387/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/msun/i387/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/ia64/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/msun/ia64/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/powerpc/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/msun/powerpc/Symbol.map#1 branch
.. //depot/projects/hammer/lib/msun/sparc64/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/msun/sparc64/Symbol.map#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#12 integrate
.. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#8 integrate
.. //depot/projects/hammer/libexec/rtld-elf/debug.h#4 integrate
.. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#12 integrate
.. //depot/projects/hammer/libexec/rtld-elf/i386/rtld_machdep.h#5 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.1#10 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.c#34 integrate
.. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#10 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#86 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#112 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#38 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#9 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#29 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#50 integrate
.. //depot/projects/hammer/sbin/mdconfig/Makefile#3 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#24 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.4#5 integrate
.. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#6 integrate
.. //depot/projects/hammer/share/man/man3/queue.3#8 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#82 integrate
.. //depot/projects/hammer/share/man/man4/amr.4#14 integrate
.. //depot/projects/hammer/share/man/man4/firewire.4#8 integrate
.. //depot/projects/hammer/share/man/man4/fwohci.4#11 integrate
.. //depot/projects/hammer/share/man/man4/hifn.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#9 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#10 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_sony.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_toshiba.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/padlock.4#2 integrate
.. //depot/projects/hammer/share/man/man4/mfi.4#1 branch
.. //depot/projects/hammer/share/man/man4/safe.4#6 integrate
.. //depot/projects/hammer/share/man/man4/scc.4#1 branch
.. //depot/projects/hammer/share/man/man4/uart.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ubsec.4#4 integrate
.. //depot/projects/hammer/share/man/man5/libmap.conf.5#11 integrate
.. //depot/projects/hammer/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/hammer/share/mk/bsd.own.mk#10 integrate
.. //depot/projects/hammer/sys/alpha/alpha/clock.c#14 integrate
.. //depot/projects/hammer/sys/alpha/include/cpu.h#12 integrate
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#45 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#148 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#88 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#32 integrate
.. //depot/projects/hammer/sys/boot/forth/beastie.4th#10 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#42 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#42 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#39 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#39 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#39 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#43 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#34 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#25 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#19 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#19 integrate
.. //depot/projects/hammer/sys/conf/NOTES#108 integrate
.. //depot/projects/hammer/sys/conf/files#141 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#17 integrate
.. //depot/projects/hammer/sys/conf/options#95 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#15 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#16 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#67 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#60 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#40 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#40 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#32 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-usb.c#3 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#23 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#34 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#20 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#43 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#14 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#9 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#58 integrate
.. //depot/projects/hammer/sys/dev/mfi/mfi.c#1 branch
.. //depot/projects/hammer/sys/dev/mfi/mfi_disk.c#1 branch
.. //depot/projects/hammer/sys/dev/mfi/mfi_ioctl.h#1 branch
.. //depot/projects/hammer/sys/dev/mfi/mfi_pci.c#1 branch
.. //depot/projects/hammer/sys/dev/mfi/mfireg.h#1 branch
.. //depot/projects/hammer/sys/dev/mfi/mfivar.h#1 branch
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#14 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.h#10 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#7 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#10 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#16 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#5 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_reg.h#3 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#42 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbreg.h#8 integrate
.. //depot/projects/hammer/sys/dev/puc/puc_ebus.c#8 integrate
.. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#10 integrate
.. //depot/projects/hammer/sys/dev/scc/scc_bfe.h#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_bfe_ebus.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_bfe_macio.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_bfe_sbus.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_bus.h#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_core.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_dev_sab82532.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_dev_z8530.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_if.m#1 branch
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#30 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#28 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#19 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#13 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus.h#10 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#10 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_scc.c#1 branch
.. //depot/projects/hammer/sys/dev/uart/uart_core.c#13 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu.h#7 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_powerpc.c#1 branch
.. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#11 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#11 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#12 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_tty.c#20 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#43 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli.h#5 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#31 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#24 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#16 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#10 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#10 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#8 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#13 integrate
.. //depot/projects/hammer/sys/i386/acpica/madt.c#17 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#45 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#82 integrate
.. //depot/projects/hammer/sys/i386/include/atomic.h#12 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_alq.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#58 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#39 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#71 integrate
.. //depot/projects/hammer/sys/kern/md5c.c#8 integrate
.. //depot/projects/hammer/sys/kern/serdev_if.m#1 branch
.. //depot/projects/hammer/sys/kern/subr_kdb.c#16 integrate
.. //depot/projects/hammer/sys/kern/subr_taskqueue.c#17 integrate
.. //depot/projects/hammer/sys/kern/subr_turnstile.c#20 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#54 integrate
.. //depot/projects/hammer/sys/kern/sysv_shm.c#24 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#66 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#41 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#54 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#41 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#68 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#47 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#21 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#70 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#103 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#59 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#42 integrate
.. //depot/projects/hammer/sys/modules/Makefile#98 integrate
.. //depot/projects/hammer/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/mfi/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/scc/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/uart/Makefile#10 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#25 integrate
.. //depot/projects/hammer/sys/net/if_ppp.c#27 integrate
.. //depot/projects/hammer/sys/net/raw_cb.c#10 integrate
.. //depot/projects/hammer/sys/net/raw_usrreq.c#13 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#31 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#29 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#16 integrate
.. //depot/projects/hammer/sys/netatm/atm_aal5.c#8 integrate
.. //depot/projects/hammer/sys/netatm/atm_proto.c#7 integrate
.. //depot/projects/hammer/sys/netatm/atm_socket.c#13 integrate
.. //depot/projects/hammer/sys/netatm/atm_usrreq.c#10 integrate
.. //depot/projects/hammer/sys/netatm/atm_var.h#9 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#16 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/ng_socket.c#22 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#39 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#26 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#32 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#40 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#60 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#55 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timer.c#19 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#36 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#34 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#40 integrate
.. //depot/projects/hammer/sys/netinet6/in6.h#15 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#23 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.h#9 integrate
.. //depot/projects/hammer/sys/netinet6/ipsec.c#18 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#23 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#21 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.c#11 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#13 integrate
.. //depot/projects/hammer/sys/netipsec/key_var.h#3 integrate
.. //depot/projects/hammer/sys/netipsec/keydb.h#6 integrate
.. //depot/projects/hammer/sys/netipsec/keysock.c#11 integrate
.. //depot/projects/hammer/sys/netipsec/xform.h#3 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ah.c#9 integrate
.. //depot/projects/hammer/sys/netipsec/xform_esp.c#10 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipip.c#9 integrate
.. //depot/projects/hammer/sys/netipsec/xform_tcp.c#4 integrate
.. //depot/projects/hammer/sys/netipx/README#6 integrate
.. //depot/projects/hammer/sys/netipx/ipx_input.c#10 integrate
.. //depot/projects/hammer/sys/netipx/ipx_pcb.c#8 integrate
.. //depot/projects/hammer/sys/netipx/ipx_pcb.h#5 integrate
.. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#9 integrate
.. //depot/projects/hammer/sys/netipx/spx_usrreq.c#18 integrate
.. //depot/projects/hammer/sys/netkey/keysock.c#15 integrate
.. //depot/projects/hammer/sys/netnatm/natm.c#19 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#43 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#30 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#21 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#9 integrate
.. //depot/projects/hammer/sys/powerpc/include/bus.h#13 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#46 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/clkbrd.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/clkbrdreg.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/include/asi.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/include/bus.h#20 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#44 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#18 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#12 integrate
.. //depot/projects/hammer/sys/sys/ata.h#16 integrate
.. //depot/projects/hammer/sys/sys/buf.h#28 integrate
.. //depot/projects/hammer/sys/sys/gmon.h#5 integrate
.. //depot/projects/hammer/sys/sys/linker.h#16 integrate
.. //depot/projects/hammer/sys/sys/mount.h#44 integrate
.. //depot/projects/hammer/sys/sys/param.h#76 integrate
.. //depot/projects/hammer/sys/sys/pmc.h#8 integrate
.. //depot/projects/hammer/sys/sys/pmckern.h#6 integrate
.. //depot/projects/hammer/sys/sys/pmclog.h#3 integrate
.. //depot/projects/hammer/sys/sys/protosw.h#12 integrate
.. //depot/projects/hammer/sys/sys/serial.h#4 integrate
.. //depot/projects/hammer/sys/sys/socketvar.h#33 integrate
.. //depot/projects/hammer/sys/sys/sx.h#6 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#28 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#53 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#12 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#43 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#59 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#36 integrate
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_MTREE#2 integrate
.. //depot/projects/hammer/tools/regression/bin/sh/errors/option-error.0#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/errors/redirection-error.0#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpdrop/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpdrop/tcpdrop.c#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpsocktimewait/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c#1 branch
.. //depot/projects/hammer/tools/regression/netipx/README#1 branch
.. //depot/projects/hammer/tools/regression/netipx/ipxdgramloopback/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c#1 branch
.. //depot/projects/hammer/tools/regression/netipx/ipxsocket/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netipx/ipxsocket/ipxsocket.c#1 branch
.. //depot/projects/hammer/tools/regression/netipx/spxabort/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netipx/spxabort/spxabort.c#1 branch
.. //depot/projects/hammer/tools/regression/netipx/spxloopback/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netipx/spxloopback/spxloopback.c#1 branch
.. //depot/projects/hammer/tools/tools/build_option_survey/collect_all_make_options.sh#2 delete
.. //depot/projects/hammer/tools/tools/build_option_survey/listallopts.sh#1 branch
.. //depot/projects/hammer/tools/tools/build_option_survey/mkhtml.sh#3 integrate
.. //depot/projects/hammer/tools/tools/build_option_survey/option_survey.sh#3 integrate
.. //depot/projects/hammer/tools/tools/build_option_survey/reduce.sh#2 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/FlashDevice.sub#4 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#29 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#23 integrate
.. //depot/projects/hammer/usr.bin/gcore/elfcore.c#6 integrate
.. //depot/projects/hammer/usr.bin/login/login.c#9 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#17 integrate
.. //depot/projects/hammer/usr.bin/tar/write.c#21 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#7 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#11 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#3 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#6 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/if.c#4 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#19 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#27 integrate

Differences ...

==== //depot/projects/hammer/MAINTAINERS#40 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $
+$FreeBSD: src/MAINTAINERS,v 1.130 2006/04/01 21:19:15 scottl Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -153,7 +153,6 @@
 gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch
 sbin/dhclient/Makefile.inc:MAINTAINER=     mbr
 sys/compat/svr4/Makefile:MAINTAINER=	newton at freebsd.org
-sys/dev/asr/MAINTAINER:MAINTAINER = obrien at freebsd, scott_long at btc.adaptec.com, mark_salyzyn at adaptec.com
 sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman <roger at freebsd.org>
 sys/modules/3dfx/Makefile:MAINTAINER=	cokane at FreeBSD.org
 sys/modules/bktr/bktr_mem/Makefile:MAINTAINER=	roger at freebsd.org

==== //depot/projects/hammer/Makefile.inc1#115 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.545 2006/03/31 14:10:35 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -821,6 +821,10 @@
 _mklocale=	usr.bin/mklocale
 .endif
 
+.if ${BOOTSTRAPPING} < 700015
+_gensnmptree=	usr.sbin/bsnmpd/gensnmptree
+.endif
+
 .if ${MK_RESCUE} != "no" && \
     ${BOOTSTRAPPING} < 600008
 _crunchgen=	usr.sbin/crunch/crunchgen
@@ -830,10 +834,6 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
-.if ${BOOTSTRAPPING} < 700014
-_gensnmptree=	usr.sbin/bsnmpd/gensnmptree
-.endif
-
 bootstrap-tools:
 .for _tool in \
     ${_strfile} \
@@ -848,8 +848,8 @@
     ${_mklocale} \
     usr.bin/rpcgen \
     usr.bin/xinstall \
+    ${_gensnmptree} \
     usr.sbin/config \
-    ${_gensnmptree} \
     ${_crunchgen} \
     ${_pwd_mkdb}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \

==== //depot/projects/hammer/ObsoleteFiles.inc#16 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.30 2006/03/13 09:28:46 harti Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.31 2006/03/28 18:28:33 simon 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.
 #
 
+# 20060328: remove redundant rc.d script
+OLD_FILES+=etc/rc.d/ike
 # 20060127: revert libdisk to static-only
 OLD_FILES+=usr/lib/libdisk.so
 # 20051215: rescue/nextboot.sh renamed to rescue/nextboot

==== //depot/projects/hammer/bin/sh/builtins.def#6 (text+ko) ====

@@ -32,17 +32,19 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD: src/bin/sh/builtins.def,v 1.18 2005/12/04 20:01:48 stefanf Exp $
+# $FreeBSD: src/bin/sh/builtins.def,v 1.19 2006/04/02 18:43:33 stefanf Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
-# of a C routine.  The -j flag, if present, specifies that this command
-# is to be excluded from systems without job control, and the -h flag,
-# if present specifies that this command is to be excluded from systems
-# based on the NO_HISTORY compile-time symbol.  The rest of the line
-# specifies the command name or names used to run the command.  The entry
-# for bltincmd, which is run when the user does not specify a command, must
-# come first.
+# of a C routine.
+# The -j flag specifies that this command is to be excluded from systems
+# without job control.
+# The -h flag specifies that this command is to be excluded from systems
+# based on the NO_HISTORY compile-time symbol.
+# The -s flag specifies that this is a POSIX 'special built-in' command.
+# The rest of the line specifies the command name or names used to run the
+# command.  The entry for bltincmd, which is run when the user does not specify
+# a command, must come first.
 #
 # NOTE: bltincmd must come first!
 
@@ -50,16 +52,16 @@
 aliascmd	alias
 bgcmd -j	bg
 bindcmd		bind
-breakcmd	break continue
+breakcmd	-s break -s continue
 cdcmd		cd chdir
 commandcmd	command
-dotcmd		.
+dotcmd		-s .
 echocmd		echo
-evalcmd		eval
-execcmd		exec
-exitcmd		exit
+evalcmd		-s eval
+execcmd		-s exec
+exitcmd		-s exit
 expcmd		exp let
-exportcmd	export readonly
+exportcmd	-s export -s readonly
 #exprcmd		expr
 falsecmd	false
 fgcmd -j	fg
@@ -72,18 +74,18 @@
 #printfcmd	printf
 pwdcmd		pwd
 readcmd		read
-returncmd	return
-setcmd		set
+returncmd	-s return
+setcmd		-s set
 setvarcmd	setvar
-shiftcmd	shift
+shiftcmd	-s shift
 testcmd		test [
-timescmd	times
-trapcmd		trap
-truecmd		: true
+timescmd	-s times
+trapcmd		-s trap
+truecmd		-s : true
 typecmd		type
 ulimitcmd	ulimit
 umaskcmd	umask
 unaliascmd	unalias
-unsetcmd	unset
+unsetcmd	-s unset
 waitcmd		wait
 wordexpcmd	wordexp

==== //depot/projects/hammer/bin/sh/main.c#5 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.27 2006/02/04 14:47:19 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $");
 
 #include <stdio.h>
 #include <signal.h>
@@ -316,19 +316,21 @@
 dotcmd(int argc, char **argv)
 {
 	struct strlist *sp;
+	char *fullname;
+
+	if (argc < 2)
+		error("missing filename");
+
 	exitstatus = 0;
 
 	for (sp = cmdenviron; sp ; sp = sp->next)
 		setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED);
 
-	if (argc >= 2) {		/* That's what SVR2 does */
-		char *fullname = find_dot_file(argv[1]);
-
-		setinputfile(fullname, 1);
-		commandname = fullname;
-		cmdloop(0);
-		popfile();
-	}
+	fullname = find_dot_file(argv[1]);
+	setinputfile(fullname, 1);
+	commandname = fullname;
+	cmdloop(0);
+	popfile();
 	return exitstatus;
 }
 

==== //depot/projects/hammer/bin/sh/mkbuiltins#7 (text+ko) ====

@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD: src/bin/sh/mkbuiltins,v 1.15 2005/08/13 08:09:22 stefanf Exp $
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.16 2006/04/02 18:43:33 stefanf Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
@@ -66,9 +66,14 @@
 
 const struct builtincmd builtincmd[] = {'
 awk '{	for (i = 2 ; i <= NF ; i++) {
-		printf "\t{ \"%s\", %d },\n",  $i, NR-1
+		if ($i == "-s") {
+			spc = 1;
+		} else {
+			printf "\t{ \"%s\", %d, %d },\n",  $i, NR-1, spc
+			spc = 0;
+		}
 	}}' $temp
-echo '	{ NULL, 0 }
+echo '	{ NULL, 0, 0 }
 };'
 
 exec > ${objdir}/builtins.h
@@ -85,6 +90,7 @@
 struct builtincmd {
       char *name;
       int code;
+      int special;
 };
 
 extern int (*const builtinfunc[])(int, char **);

==== //depot/projects/hammer/contrib/hostapd/config.c#4 (text+ko) ====

@@ -29,6 +29,7 @@
 #include "sha1.h"
 #include "eap.h"
 #include "radius_client.h"
+#include "ieee802_1x.h"		/* XXX for EAPOL_VERSION */
 
 
 static struct hostapd_config *hostapd_config_defaults(void)
@@ -60,6 +61,7 @@
 	conf->logger_stdout = (unsigned int) -1;
 
 	conf->auth_algs = HOSTAPD_AUTH_OPEN | HOSTAPD_AUTH_SHARED_KEY;
+	conf->eapol_version = EAPOL_VERSION;	/* NB: default version */
 
 	conf->wpa_group_rekey = 600;
 	conf->wpa_gmk_rekey = 86400;
@@ -855,6 +857,17 @@
 			}
 		} else if (strcmp(buf, "eapol_key_index_workaround") == 0) {
 			conf->eapol_key_index_workaround = atoi(pos);
+		} else if (strcmp(buf, "eapol_version") == 0) {
+			conf->eapol_version = atoi(pos);
+			if (conf->eapol_version < 1 ||
+			    conf->eapol_version > 2) {
+				printf("Line %d: invalid EAPOL "
+				       "version (%d): '%s'.\n",
+				       line, conf->eapol_version, pos);
+				errors++;
+			} else
+				wpa_printf(MSG_DEBUG, "eapol_version=%d",
+				   conf->eapol_version);
 #ifdef CONFIG_IAPP
 		} else if (strcmp(buf, "iapp_interface") == 0) {
 			conf->ieee802_11f = 1;

==== //depot/projects/hammer/contrib/hostapd/config.h#3 (text+ko) ====

@@ -73,6 +73,7 @@
 				* EAP Request-Identity */
 	size_t eap_req_id_text_len;
 	int eapol_key_index_workaround;
+	int eapol_version;
 
 	size_t default_wep_key_len;
 	int individual_wep_key_len;

==== //depot/projects/hammer/contrib/hostapd/hostapd.conf#3 (text+ko) ====

@@ -106,6 +106,14 @@
 # Require IEEE 802.1X authorization
 #ieee8021x=1
 
+# IEEE 802.1X/EAPOL version
+# hostapd is implemented based on IEEE Std 802.1X-2004 which defines EAPOL
+# version 2. However, there are some clients that do not handle
+# the new version number correctly (they seem to drop the frames completely).
+# In order to make hostapd interoperate with these clients, the version number
+# can be set to the older version (1) with this configuration value.
+#eapol_version=2
+
 # Optional displayable message sent with EAP Request-Identity. The first \0
 # in this string will be converted to ASCII-0 (nul). This can be used to
 # separate network info (comma separated list of attribute=value pairs); see,

==== //depot/projects/hammer/contrib/libreadline/CHANGELOG#4 (text+ko) ====

@@ -808,3 +808,113 @@
 	- new example from Harold Levy that wraps fgets replacement functions
 	  that call readline in a shared library that can be interposed with
 	  LD_PRELOAD
+
+				   7/27
+				   ----
+[readline-5.0 released]
+
+				   11/15
+				   -----
+examples/rlfe/{ChangeLog,Makefile.in,README,config.h.in,configure,configure.in,extern.h,os.h,pty.c,rlfe.c,screen.h}
+	- new version of rlfe, rlfe-0.4, from Per Bothner; now a standalone
+	  application
+
+				   11/16
+				   -----
+shlib/Makefile.in
+	- substitute TERMCAP_LIB in from configure
+
+configure.in
+	- if SHLIB_LIBS doesn't include a termcap library (curses, ncurses,
+	  termcap, termlib), append the value of $TERMCAP_LIB to it
+
+				   11/30
+				   -----
+configure.in
+	- take out change from 11/16; it doesn't work for some systems (e.g.,
+	  SunOS 4.x and Solaris 2.6)
+	- add support for --enable-purify configure argument
+	- pass TERMCAP_LIB in environment when calling shobj-conf
+
+examples/Makefile.in 
+	- add support for building examples with purify
+
+				 1/23/2005
+				 ---------
+configure.in
+        - set BUILD_DIR to contain backslashes to escape any spaces in the
+          directory name -- this is what make will accept in targets and
+          prerequisites, so it's better than trying to use double quotes
+
+				   2/25
+				   ----
+configure.in
+	- change check for sys/ptem.h to include sys/stream.h if present, to
+	  avoid the `present but cannot be compiled' messages on Solaris and
+	  SVR4.2 (does anyone still use SVR4.2?)
+
+				    5/7
+				    ---
+configure.in
+	- add cross-compiling support from the bash configure.in, which cygwin
+	  and mingw have apparently adopted
+	- add check for pwd.h, fcntl.h
+	- add checks for fcntl, kill system calls
+	- add checks for getpw{ent,nam,uid} C library functions
+	- pass a compile-time option through to Makefiles if cross-compiling
+
+config.h.in
+	- add HAVE_PWD_H for <pwd.h>, HAVE_FCNTL_H for <fcntl.h>
+	- add HAVE_FCNTL, HAVE_KILL for respective system calls
+	- add HAVE_GETPW{ENT,NAM,UID} for passwd functions
+
+Makefile.in,shlib/Makefile.in
+        - @CROSS_COMPILE@ is substituted into DEFS (equal to -DCROSS_COMPILING
+	  if bash is being cross-compiled)
+
+				    8/2
+				    ---
+examples/Makefile.in
+	- use $(READLINE_LIB) instead of -lreadline to get around MacOS X 10.4's
+	  preference for (incompatible) shared libraries over static libraries
+	  in the load path
+
+				   8/11
+				   ----
+support/shobj-conf
+	- new variable: SHLIB_LIBPREF, prefix for shared library name (defaults
+	  to `lib'
+	- new variable: SHLIB_DLLVERSION, used on Cygwin to set the library
+	  version number
+	- new variable: SHLIB_DOT, separator character between library name and
+	  suffix and version information (defaults to `.')
+	- new stanza for cygwin to generate windows-compatible dll
+
+support/shlib-install
+	- add new option `-b bindir' for systems like cygwin/windows that
+	  require it
+	- new stanza for cygwin that installs a dll into $bindir and an implied
+	  link library into $libdir
+
+configure.in
+	- substitute new variables from shobj-conf
+
+shlib/Makefile.in
+	- substitute bindir, SHLIB_DOT, SHLIB_LIBPREF, SHLIB_DLLVERSION from
+	  configure
+	- pass `-b $(bindir)' to shlib-install for install and uninstall targets
+	- library names now use $SHLIB_LIBPREF and $SHLIB_DOT
+
+INSTALL,README
+	- document new SHLIB_DOT, SHLIB_LIBPREF, and SHLIB_DLLVERSION variables
+
+				   10/4
+				   ----
+[readline-5.1-beta1 frozen]
+
+				   12/1
+				   ----
+configure.in
+	- changed release status to `release'
+
+[readline-5.1 frozen]

==== //depot/projects/hammer/contrib/libreadline/CHANGES#4 (text+ko) ====

@@ -1,3 +1,132 @@
+This document details the changes between this version, readline-5.1,
+and the previous version, readline-5.0.
+
+1.  Changes to Readline
+
+a.  Fixed a bug that caused multiliine prompts to be wrapped and displayed
+    incorrectly.
+
+b.  Fixed a bug that caused ^P/^N in emacs mode to fail to display the current
+    line correctly.
+
+c.  Fixed a problem in computing the number of invisible characters on the first
+    line of a prompt whose length exceeds the screen width.
+
+d.  Fixed vi-mode searching so that failure preserves the current line rather
+    than the last line in the history list.
+
+e.  Fixed the vi-mode `~' command (change-case) to have the correct behavior at
+    end-of-line when manipulating multibyte characters.
+
+f.  Fixed the vi-mode `r' command (change-char) to have the correct behavior at
+    end-of-line when manipulating multibyte characters.
+
+g.  Fixed multiple bugs in the redisplay of multibyte characters:  displaying
+    prompts longer than the screen width containing multibyte characters,
+
+h.  Fix the calculation of the number of physical characters in the prompt
+    string when it contains multibyte characters.
+
+i.  A non-zero value for the `rl_complete_suppress_append' variable now causes
+    no `/' to be appended to a directory name.
+
+j.  Fixed forward-word and backward-word to work when words contained
+    multibyte characters.
+
+k.  Fixed a bug in finding the delimiter of a `?' substring when performing
+    history expansion in a locale that supports multibyte characters.
+
+l.  Fixed a memory leak caused by not freeing the timestamp in a history entry.
+
+m.  Fixed a bug that caused "\M-x" style key bindings to not obey the setting
+    of the `convert-meta' variable.
+
+n.  Fixed saving and restoring primary prompt when prompting for incremental   
+    and non-incremental searches; search prompts now display multibyte
+    characters correctly.
+
+o.  Fixed a bug that caused keys originally bound to self-insert but shadowed
+    by a multi-character key sequence to not be inserted.
+
+p.  Fixed code so rl_prep_term_function and rl_deprep_term_function aren't
+    dereferenced if NULL (matching the documentation).
+
+q.  Extensive changes to readline to add enough state so that commands
+    requiring additional characters (searches, multi-key sequences, numeric
+    arguments, commands requiring an additional specifier character like
+    vi-mode change-char, etc.) work without synchronously waiting for
+    additional input.
+
+r.  Lots of changes so readline builds and runs on MinGW.
+
+s.  Readline no longer tries to modify the terminal settings when running in
+    callback mode.
+
+t.  The Readline display code no longer sets the location of the last invisible
+    character in the prompt if the \[\] sequence is empty.
+
+u.  The `change-case' command now correctly changes the case of multibyte
+    characters.
+
+v.  Changes to the shared library construction scripts to deal with Windows
+    DLL naming conventions for Cygwin.
+
+w.  Fixed the redisplay code to avoid core dumps resulting from a poorly-timed
+    SIGWINCH.
+
+x.  Fixed the non-incremental search code in vi mode to dispose of any current
+    undo list when copying a line from the history into the current editing
+    buffer.
+
+y.  Fixed a bug that caused reversing the incremental search direction to
+    not work correctly.  
+    
+z.  Fixed the vi-mode `U' command to only undo up to the first time insert mode
+    was entered, as Posix specifies.
+
+aa. Fixed a bug in the vi-mode `r' command that left the cursor in the wrong
+    place.
+
+bb. Fixed a redisplay bug caused by moving the cursor vertically to a line
+    with invisible characters in the prompt in a multibyte locale.
+
+cc. Fixed a bug that could cause the terminal special chars to be bound in the
+    wrong keymap in vi mode.
+
+2.  New Features in Readline
+
+a.  The key sequence sent by the keypad `delete' key is now automatically   
+    bound to delete-char.
+
+b.  A negative argument to menu-complete now cycles backward through the
+    completion list.
+
+c.  A new bindable readline variable:  bind-tty-special-chars.  If non-zero,
+    readline will bind the terminal special characters to their readline
+    equivalents when it's called (on by default).
+
+d.  New bindable command: vi-rubout.  Saves deleted text for possible  
+    reinsertion, as with any vi-mode `text modification' command; `X' is bound
+    to this in vi command mode.
+
+e.  If the rl_completion_query_items is set to a value < 0, readline never
+    asks the user whether or not to view the possible completions.
+
+f.  The `C-w' binding in incremental search now understands multibyte
+    characters.
+
+g.  New application-callable auxiliary function, rl_variable_value, returns 
+    a string corresponding to a readline variable's value.
+
+h.  When parsing inputrc files and variable binding commands, the parser
+    strips trailing whitespace from values assigned to boolean variables
+    before checking them.
+
+i.  A new external application-controllable variable that allows the LINES   

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


More information about the p4-projects mailing list