svn commit: r209334 - in user/jmallett/octeon: . bin/cp bin/date bin/getfacl bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/gdtoa contrib/llvm contrib/sendmail/mail.local contrib/tzco...

Sat Jun 19 10:06:48 UTC 2010

Author: jmallett
Date: Sat Jun 19 10:06:46 2010
New Revision: 209334
URL: http://svn.freebsd.org/changeset/base/209334

Log:
  Merge from head, mostly pick up jchandra's merging of things from my branch.

Added:
  user/jmallett/octeon/contrib/llvm/
     - copied from r209333, head/contrib/llvm/
  user/jmallett/octeon/contrib/wpa/hostapd/Makefile
     - copied unchanged from r209333, head/contrib/wpa/hostapd/Makefile
  user/jmallett/octeon/contrib/wpa/hostapd/driver_bsd.c
     - copied unchanged from r209333, head/contrib/wpa/hostapd/driver_bsd.c
  user/jmallett/octeon/contrib/wpa/hostapd/driver_hostap.c
     - copied unchanged from r209333, head/contrib/wpa/hostapd/driver_hostap.c
  user/jmallett/octeon/contrib/wpa/hostapd/driver_wired.c
     - copied unchanged from r209333, head/contrib/wpa/hostapd/driver_wired.c
  user/jmallett/octeon/contrib/wpa/hostapd/radiotap.c
     - copied unchanged from r209333, head/contrib/wpa/hostapd/radiotap.c
  user/jmallett/octeon/contrib/wpa/hostapd/radiotap.h
     - copied unchanged from r209333, head/contrib/wpa/hostapd/radiotap.h
  user/jmallett/octeon/contrib/wpa/hostapd/radiotap_iter.h
     - copied unchanged from r209333, head/contrib/wpa/hostapd/radiotap_iter.h
  user/jmallett/octeon/contrib/wpa/src/common/nl80211_copy.h
     - copied unchanged from r209333, head/contrib/wpa/src/common/nl80211_copy.h
  user/jmallett/octeon/contrib/wpa/src/common/wireless_copy.h
     - copied unchanged from r209333, head/contrib/wpa/src/common/wireless_copy.h
  user/jmallett/octeon/contrib/wpa/src/drivers/Makefile
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/Makefile
  user/jmallett/octeon/contrib/wpa/src/drivers/driver_ndis_.c
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/driver_ndis_.c
  user/jmallett/octeon/contrib/wpa/src/drivers/driver_ndiswrapper.c
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/driver_ndiswrapper.c
  user/jmallett/octeon/contrib/wpa/src/drivers/driver_wired.c
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/driver_wired.c
  user/jmallett/octeon/contrib/wpa/src/drivers/ndis_events.c
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/ndis_events.c
  user/jmallett/octeon/contrib/wpa/src/drivers/radiotap.c
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/radiotap.c
  user/jmallett/octeon/contrib/wpa/src/drivers/radiotap.h
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/radiotap.h
  user/jmallett/octeon/contrib/wpa/src/drivers/radiotap_iter.h
     - copied unchanged from r209333, head/contrib/wpa/src/drivers/radiotap_iter.h
  user/jmallett/octeon/contrib/wpa/src/l2_packet/Makefile
     - copied unchanged from r209333, head/contrib/wpa/src/l2_packet/Makefile
  user/jmallett/octeon/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
     - copied unchanged from r209333, head/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
  user/jmallett/octeon/contrib/wpa/src/l2_packet/l2_packet_ndis.c
     - copied unchanged from r209333, head/contrib/wpa/src/l2_packet/l2_packet_ndis.c
  user/jmallett/octeon/contrib/wpa/src/l2_packet/l2_packet_none.c
     - copied unchanged from r209333, head/contrib/wpa/src/l2_packet/l2_packet_none.c
  user/jmallett/octeon/contrib/wpa/src/utils/eloop_none.c
     - copied unchanged from r209333, head/contrib/wpa/src/utils/eloop_none.c
  user/jmallett/octeon/contrib/wpa/src/utils/eloop_win.c
     - copied unchanged from r209333, head/contrib/wpa/src/utils/eloop_win.c
  user/jmallett/octeon/contrib/wpa/src/utils/os_none.c
     - copied unchanged from r209333, head/contrib/wpa/src/utils/os_none.c
  user/jmallett/octeon/contrib/wpa/src/utils/os_win32.c
     - copied unchanged from r209333, head/contrib/wpa/src/utils/os_win32.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/Makefile
     - copied unchanged from r209333, head/contrib/wpa/wpa_supplicant/Makefile
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
     - copied unchanged from r209333, head/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/main_none.c
     - copied unchanged from r209333, head/contrib/wpa/wpa_supplicant/main_none.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/nmake.mak
     - copied unchanged from r209333, head/contrib/wpa/wpa_supplicant/nmake.mak
  user/jmallett/octeon/etc/periodic/daily/800.scrub-zfs
     - copied unchanged from r209333, head/etc/periodic/daily/800.scrub-zfs
  user/jmallett/octeon/lib/clang/
     - copied from r209333, head/lib/clang/
  user/jmallett/octeon/lib/libc/posix1e/acl_id_to_name.c
     - copied unchanged from r209333, head/lib/libc/posix1e/acl_id_to_name.c
  user/jmallett/octeon/lib/libedit/filecomplete.c
     - copied unchanged from r209333, head/lib/libedit/filecomplete.c
  user/jmallett/octeon/lib/libedit/filecomplete.h
     - copied unchanged from r209333, head/lib/libedit/filecomplete.h
  user/jmallett/octeon/share/man/man4/ng_patch.4
     - copied unchanged from r209333, head/share/man/man4/ng_patch.4
  user/jmallett/octeon/share/man/man7/c99.7
     - copied unchanged from r209333, head/share/man/man7/c99.7
  user/jmallett/octeon/share/mk/bsd.arch.inc.mk
     - copied unchanged from r209333, head/share/mk/bsd.arch.inc.mk
  user/jmallett/octeon/sys/arm/include/fdt.h
     - copied unchanged from r209333, head/sys/arm/include/fdt.h
  user/jmallett/octeon/sys/arm/include/ofw_machdep.h
     - copied unchanged from r209333, head/sys/arm/include/ofw_machdep.h
  user/jmallett/octeon/sys/dev/fdt/
     - copied from r209333, head/sys/dev/fdt/
  user/jmallett/octeon/sys/dev/uart/uart_bus_fdt.c
     - copied unchanged from r209333, head/sys/dev/uart/uart_bus_fdt.c
  user/jmallett/octeon/sys/dev/usb/controller/ehci_mv.c
     - copied unchanged from r209333, head/sys/dev/usb/controller/ehci_mv.c
  user/jmallett/octeon/sys/libkern/memchr.c
     - copied unchanged from r209333, head/sys/libkern/memchr.c
  user/jmallett/octeon/sys/modules/netgraph/patch/
     - copied from r209333, head/sys/modules/netgraph/patch/
  user/jmallett/octeon/sys/netgraph/ng_patch.c
     - copied unchanged from r209333, head/sys/netgraph/ng_patch.c
  user/jmallett/octeon/sys/netgraph/ng_patch.h
     - copied unchanged from r209333, head/sys/netgraph/ng_patch.h
  user/jmallett/octeon/sys/powerpc/powermac/smusat.c
     - copied unchanged from r209333, head/sys/powerpc/powermac/smusat.c
  user/jmallett/octeon/sys/tools/fdt/
     - copied from r209333, head/sys/tools/fdt/
  user/jmallett/octeon/sys/x86/x86/io_apic.c
     - copied unchanged from r209333, head/sys/x86/x86/io_apic.c
  user/jmallett/octeon/sys/x86/x86/mca.c
     - copied unchanged from r209333, head/sys/x86/x86/mca.c
  user/jmallett/octeon/sys/x86/x86/msi.c
     - copied unchanged from r209333, head/sys/x86/x86/msi.c
  user/jmallett/octeon/tools/build/options/WITHOUT_CLANG
     - copied unchanged from r209333, head/tools/build/options/WITHOUT_CLANG
  user/jmallett/octeon/tools/tools/vhba/
     - copied from r209333, head/tools/tools/vhba/
  user/jmallett/octeon/usr.bin/clang/
     - copied from r209333, head/usr.bin/clang/
Deleted:
  user/jmallett/octeon/contrib/wpa/hostapd/.gitignore
  user/jmallett/octeon/contrib/wpa/hostapd/doc/.gitignore
  user/jmallett/octeon/contrib/wpa/src/common/.gitignore
  user/jmallett/octeon/contrib/wpa/src/crypto/.gitignore
  user/jmallett/octeon/contrib/wpa/src/eap_common/.gitignore
  user/jmallett/octeon/contrib/wpa/src/eap_peer/.gitignore
  user/jmallett/octeon/contrib/wpa/src/eap_server/.gitignore
  user/jmallett/octeon/contrib/wpa/src/eapol_supp/.gitignore
  user/jmallett/octeon/contrib/wpa/src/hlr_auc_gw/.gitignore
  user/jmallett/octeon/contrib/wpa/src/radius/.gitignore
  user/jmallett/octeon/contrib/wpa/src/rsn_supp/.gitignore
  user/jmallett/octeon/contrib/wpa/src/tls/.gitignore
  user/jmallett/octeon/contrib/wpa/src/utils/.gitignore
  user/jmallett/octeon/contrib/wpa/src/wps/.gitignore
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/.gitignore
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/.gitignore
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore
  user/jmallett/octeon/sys/amd64/amd64/io_apic.c
  user/jmallett/octeon/sys/amd64/amd64/mca.c
  user/jmallett/octeon/sys/amd64/amd64/msi.c
  user/jmallett/octeon/sys/arm/mv/discovery/db78xxx.c
  user/jmallett/octeon/sys/arm/mv/kirkwood/db88f6xxx.c
  user/jmallett/octeon/sys/arm/mv/kirkwood/files.db88f6xxx
  user/jmallett/octeon/sys/arm/mv/obio.c
  user/jmallett/octeon/sys/dev/uart/uart_bus_mbus.c
  user/jmallett/octeon/sys/dev/uart/uart_cpu_mv.c
  user/jmallett/octeon/sys/dev/usb/controller/ehci_mbus.c
  user/jmallett/octeon/sys/i386/i386/io_apic.c
  user/jmallett/octeon/sys/i386/i386/mca.c
  user/jmallett/octeon/sys/i386/i386/msi.c
  user/jmallett/octeon/usr.bin/tftp/extern.h
  user/jmallett/octeon/usr.bin/tftp/tftpsubs.c
  user/jmallett/octeon/usr.bin/tftp/tftpsubs.h
  user/jmallett/octeon/usr.sbin/wpa/l2_packet.c
  user/jmallett/octeon/usr.sbin/wpa/wpa_supplicant/driver_wired.c
Modified:
  user/jmallett/octeon/Makefile
  user/jmallett/octeon/Makefile.inc1
  user/jmallett/octeon/bin/cp/cp.c
  user/jmallett/octeon/bin/date/date.1
  user/jmallett/octeon/bin/getfacl/getfacl.1
  user/jmallett/octeon/bin/sh/histedit.c
  user/jmallett/octeon/bin/sh/jobs.c
  user/jmallett/octeon/bin/sh/myhistedit.h
  user/jmallett/octeon/bin/sh/var.c
  user/jmallett/octeon/bin/sh/var.h
  user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  user/jmallett/octeon/contrib/gdtoa/hexnan.c
  user/jmallett/octeon/contrib/sendmail/mail.local/mail.local.8
  user/jmallett/octeon/contrib/tzcode/zic/zic.8
  user/jmallett/octeon/contrib/wpa/hostapd/ChangeLog
  user/jmallett/octeon/contrib/wpa/hostapd/README-WPS
  user/jmallett/octeon/contrib/wpa/hostapd/ap.h
  user/jmallett/octeon/contrib/wpa/hostapd/beacon.c
  user/jmallett/octeon/contrib/wpa/hostapd/config.c
  user/jmallett/octeon/contrib/wpa/hostapd/config.h
  user/jmallett/octeon/contrib/wpa/hostapd/ctrl_iface.c
  user/jmallett/octeon/contrib/wpa/hostapd/drivers.c
  user/jmallett/octeon/contrib/wpa/hostapd/hostapd.8
  user/jmallett/octeon/contrib/wpa/hostapd/hostapd.c
  user/jmallett/octeon/contrib/wpa/hostapd/hostapd.conf
  user/jmallett/octeon/contrib/wpa/hostapd/hostapd_cli.1
  user/jmallett/octeon/contrib/wpa/hostapd/hostapd_cli.c
  user/jmallett/octeon/contrib/wpa/hostapd/hw_features.c
  user/jmallett/octeon/contrib/wpa/hostapd/ieee802_11.c
  user/jmallett/octeon/contrib/wpa/hostapd/ieee802_1x.c
  user/jmallett/octeon/contrib/wpa/hostapd/preauth.c
  user/jmallett/octeon/contrib/wpa/hostapd/wme.c
  user/jmallett/octeon/contrib/wpa/hostapd/wme.h
  user/jmallett/octeon/contrib/wpa/hostapd/wpa.c
  user/jmallett/octeon/contrib/wpa/hostapd/wpa.h
  user/jmallett/octeon/contrib/wpa/hostapd/wpa_auth_i.h
  user/jmallett/octeon/contrib/wpa/hostapd/wpa_auth_ie.c
  user/jmallett/octeon/contrib/wpa/hostapd/wpa_ft.c
  user/jmallett/octeon/contrib/wpa/hostapd/wps_hostapd.c
  user/jmallett/octeon/contrib/wpa/hostapd/wps_hostapd.h
  user/jmallett/octeon/contrib/wpa/src/common/ieee802_11_common.c
  user/jmallett/octeon/contrib/wpa/src/common/ieee802_11_common.h
  user/jmallett/octeon/contrib/wpa/src/common/ieee802_11_defs.h
  user/jmallett/octeon/contrib/wpa/src/common/version.h
  user/jmallett/octeon/contrib/wpa/src/common/wpa_common.c
  user/jmallett/octeon/contrib/wpa/src/crypto/crypto_cryptoapi.c
  user/jmallett/octeon/contrib/wpa/src/crypto/crypto_gnutls.c
  user/jmallett/octeon/contrib/wpa/src/crypto/crypto_internal.c
  user/jmallett/octeon/contrib/wpa/src/crypto/dh_groups.c
  user/jmallett/octeon/contrib/wpa/src/crypto/ms_funcs.c
  user/jmallett/octeon/contrib/wpa/src/crypto/rc4.c
  user/jmallett/octeon/contrib/wpa/src/crypto/rc4.h
  user/jmallett/octeon/contrib/wpa/src/crypto/sha1.c
  user/jmallett/octeon/contrib/wpa/src/crypto/sha256.c
  user/jmallett/octeon/contrib/wpa/src/crypto/tls.h
  user/jmallett/octeon/contrib/wpa/src/crypto/tls_gnutls.c
  user/jmallett/octeon/contrib/wpa/src/crypto/tls_openssl.c
  user/jmallett/octeon/contrib/wpa/src/drivers/driver.h
  user/jmallett/octeon/contrib/wpa/src/drivers/driver_ndis.c
  user/jmallett/octeon/contrib/wpa/src/eap_common/eap_defs.h
  user/jmallett/octeon/contrib/wpa/src/eap_common/eap_fast_common.h
  user/jmallett/octeon/contrib/wpa/src/eap_common/eap_tlv_common.h
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_fast.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_gpsk.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_methods.h
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_sim.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_tls_common.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_tnc.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_ttls.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/eap_wsc.c
  user/jmallett/octeon/contrib/wpa/src/eap_peer/tncc.c
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap.c
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap_fast.c
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap_gpsk.c
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap_i.h
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap_tls_common.c
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap_tnc.c
  user/jmallett/octeon/contrib/wpa/src/eap_server/eap_ttls.c
  user/jmallett/octeon/contrib/wpa/src/eapol_supp/eapol_supp_sm.c
  user/jmallett/octeon/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c
  user/jmallett/octeon/contrib/wpa/src/radius/radius_client.c
  user/jmallett/octeon/contrib/wpa/src/radius/radius_server.c
  user/jmallett/octeon/contrib/wpa/src/rsn_supp/wpa.c
  user/jmallett/octeon/contrib/wpa/src/rsn_supp/wpa_ft.c
  user/jmallett/octeon/contrib/wpa/src/rsn_supp/wpa_i.h
  user/jmallett/octeon/contrib/wpa/src/tls/rsa.c
  user/jmallett/octeon/contrib/wpa/src/tls/tlsv1_client.c
  user/jmallett/octeon/contrib/wpa/src/tls/tlsv1_server_read.c
  user/jmallett/octeon/contrib/wpa/src/utils/base64.c
  user/jmallett/octeon/contrib/wpa/src/utils/common.c
  user/jmallett/octeon/contrib/wpa/src/utils/common.h
  user/jmallett/octeon/contrib/wpa/src/utils/os_unix.c
  user/jmallett/octeon/contrib/wpa/src/utils/wpa_debug.c
  user/jmallett/octeon/contrib/wpa/src/utils/wpa_debug.h
  user/jmallett/octeon/contrib/wpa/src/utils/wpabuf.c
  user/jmallett/octeon/contrib/wpa/src/wps/httpread.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps.h
  user/jmallett/octeon/contrib/wpa/src/wps/wps_attr_parse.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_common.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_enrollee.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_i.h
  user/jmallett/octeon/contrib/wpa/src/wps/wps_registrar.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_upnp.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_upnp_event.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_upnp_i.h
  user/jmallett/octeon/contrib/wpa/src/wps/wps_upnp_ssdp.c
  user/jmallett/octeon/contrib/wpa/src/wps/wps_upnp_web.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ChangeLog
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/README
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/README-WPS
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/defconfig
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/doc/porting.doxygen
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/eapol_test.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/events.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/mlme.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/scan.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/wpa_priv.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/wpa_supplicant.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/wpas_glue.c
  user/jmallett/octeon/contrib/wpa/wpa_supplicant/wps_supplicant.c
  user/jmallett/octeon/etc/Makefile
  user/jmallett/octeon/etc/login.conf
  user/jmallett/octeon/etc/mtree/BSD.include.dist
  user/jmallett/octeon/etc/namedb/named.root
  user/jmallett/octeon/etc/periodic/daily/Makefile
  user/jmallett/octeon/games/random/random.c
  user/jmallett/octeon/games/random/randomize_fd.c
  user/jmallett/octeon/gnu/lib/csu/Makefile
  user/jmallett/octeon/gnu/lib/libdialog/TESTS/check3.c
  user/jmallett/octeon/gnu/lib/libdialog/TESTS/menu3.c
  user/jmallett/octeon/gnu/lib/libdialog/TESTS/radio1.c
  user/jmallett/octeon/gnu/lib/libdialog/TESTS/radio3.c
  user/jmallett/octeon/gnu/usr.bin/Makefile
  user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc
  user/jmallett/octeon/include/histedit.h
  user/jmallett/octeon/lib/Makefile
  user/jmallett/octeon/lib/csu/i386-elf/crt1_s.S
  user/jmallett/octeon/lib/libarchive/archive_entry.3
  user/jmallett/octeon/lib/libarchive/archive_read.3
  user/jmallett/octeon/lib/libarchive/archive_read_disk.3
  user/jmallett/octeon/lib/libarchive/archive_util.3
  user/jmallett/octeon/lib/libarchive/archive_write.3
  user/jmallett/octeon/lib/libarchive/archive_write_disk.3
  user/jmallett/octeon/lib/libarchive/libarchive-formats.5
  user/jmallett/octeon/lib/libarchive/tar.5
  user/jmallett/octeon/lib/libc/gen/getcap.3
  user/jmallett/octeon/lib/libc/net/sctp_recvmsg.3
  user/jmallett/octeon/lib/libc/posix1e/Makefile.inc
  user/jmallett/octeon/lib/libc/posix1e/acl_entry.c
  user/jmallett/octeon/lib/libc/posix1e/acl_set.c
  user/jmallett/octeon/lib/libc/posix1e/acl_strip.c
  user/jmallett/octeon/lib/libc/posix1e/acl_support.c
  user/jmallett/octeon/lib/libc/posix1e/acl_support.h
  user/jmallett/octeon/lib/libc/posix1e/acl_to_text_nfs4.c
  user/jmallett/octeon/lib/libc/posix1e/acl_valid.c
  user/jmallett/octeon/lib/libc/stdlib/atexit.c
  user/jmallett/octeon/lib/libc/sys/flock.2
  user/jmallett/octeon/lib/libc/sys/getitimer.2
  user/jmallett/octeon/lib/libc/sys/getrusage.2
  user/jmallett/octeon/lib/libc/sys/mq_close.2
  user/jmallett/octeon/lib/libc/sys/mq_getattr.2
  user/jmallett/octeon/lib/libc/sys/mq_notify.2
  user/jmallett/octeon/lib/libc/sys/mq_open.2
  user/jmallett/octeon/lib/libc/sys/mq_receive.2
  user/jmallett/octeon/lib/libc/sys/mq_send.2
  user/jmallett/octeon/lib/libc/sys/mq_setattr.2
  user/jmallett/octeon/lib/libedit/Makefile
  user/jmallett/octeon/lib/libelf/elf_getbase.3
  user/jmallett/octeon/lib/libelf/elf_getbase.c
  user/jmallett/octeon/lib/libkse/Makefile
  user/jmallett/octeon/lib/libkse/arch/amd64/Makefile.inc
  user/jmallett/octeon/lib/libkse/arch/arm/Makefile.inc
  user/jmallett/octeon/lib/libkse/arch/i386/Makefile.inc
  user/jmallett/octeon/lib/libkse/arch/ia64/Makefile.inc
  user/jmallett/octeon/lib/libkse/arch/powerpc/Makefile.inc
  user/jmallett/octeon/lib/libkse/arch/sparc64/Makefile.inc
  user/jmallett/octeon/lib/libkse/support/Makefile.inc
  user/jmallett/octeon/lib/libkvm/kvm_proc.c
  user/jmallett/octeon/lib/liblzma/config.h
  user/jmallett/octeon/lib/libmemstat/memstat.c
  user/jmallett/octeon/lib/libmemstat/memstat.h
  user/jmallett/octeon/lib/libmemstat/memstat_internal.h
  user/jmallett/octeon/lib/libmemstat/memstat_uma.c
  user/jmallett/octeon/lib/libpmc/pmc.corei7.3
  user/jmallett/octeon/lib/libpmc/pmc.corei7uc.3
  user/jmallett/octeon/lib/libpmc/pmc.westmereuc.3
  user/jmallett/octeon/lib/libpmc/pmclog.c
  user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_seccreate.3
  user/jmallett/octeon/lib/msun/Symbol.map
  user/jmallett/octeon/lib/msun/man/atan2.3
  user/jmallett/octeon/lib/msun/src/math.h
  user/jmallett/octeon/lib/msun/src/s_isnan.c
  user/jmallett/octeon/libexec/rtld-elf/rtld.c
  user/jmallett/octeon/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  user/jmallett/octeon/release/scripts/ports-install.sh
  user/jmallett/octeon/sbin/camcontrol/modeedit.c
  user/jmallett/octeon/sbin/ccdconfig/ccdconfig.c
  user/jmallett/octeon/sbin/gbde/gbde.c
  user/jmallett/octeon/sbin/geom/class/part/geom_part.c
  user/jmallett/octeon/sbin/geom/class/part/gpart.8
  user/jmallett/octeon/sbin/geom/misc/subr.c
  user/jmallett/octeon/sbin/gvinum/gvinum.c
  user/jmallett/octeon/sbin/hastd/ebuf.c
  user/jmallett/octeon/sbin/hastd/hast_proto.c
  user/jmallett/octeon/sbin/hastd/hastd.c
  user/jmallett/octeon/sbin/hastd/metadata.c
  user/jmallett/octeon/sbin/hastd/nv.c
  user/jmallett/octeon/sbin/hastd/primary.c
  user/jmallett/octeon/sbin/hastd/secondary.c
  user/jmallett/octeon/sbin/iscontrol/config.c
  user/jmallett/octeon/sbin/ping6/ping6.c
  user/jmallett/octeon/share/examples/kld/syscall/test/call.c
  user/jmallett/octeon/share/man/man1/builtin.1
  user/jmallett/octeon/share/man/man4/Makefile
  user/jmallett/octeon/share/man/man4/ae.4
  user/jmallett/octeon/share/man/man4/bpf.4
  user/jmallett/octeon/share/man/man4/io.4
  user/jmallett/octeon/share/man/man4/textdump.4
  user/jmallett/octeon/share/man/man5/a.out.5
  user/jmallett/octeon/share/man/man5/periodic.conf.5
  user/jmallett/octeon/share/man/man5/src.conf.5
  user/jmallett/octeon/share/man/man5/stab.5
  user/jmallett/octeon/share/man/man7/Makefile
  user/jmallett/octeon/share/man/man9/bus_generic_new_pass.9
  user/jmallett/octeon/share/man/man9/bus_set_pass.9
  user/jmallett/octeon/share/man/man9/insmntque.9
  user/jmallett/octeon/share/man/man9/vfs_busy.9
  user/jmallett/octeon/share/man/man9/vfs_mountedfrom.9
  user/jmallett/octeon/share/man/man9/vfs_unbusy.9
  user/jmallett/octeon/share/misc/committers-ports.dot
  user/jmallett/octeon/share/misc/committers-src.dot
  user/jmallett/octeon/share/mk/bsd.own.mk
  user/jmallett/octeon/share/mk/sys.mk
  user/jmallett/octeon/share/termcap/termcap.5
  user/jmallett/octeon/sys/amd64/acpica/acpi_wakeup.c
  user/jmallett/octeon/sys/amd64/acpica/madt.c
  user/jmallett/octeon/sys/amd64/amd64/apic_vector.S
  user/jmallett/octeon/sys/amd64/amd64/cpu_switch.S
  user/jmallett/octeon/sys/amd64/amd64/fpu.c
  user/jmallett/octeon/sys/amd64/amd64/intr_machdep.c
  user/jmallett/octeon/sys/amd64/amd64/legacy.c
  user/jmallett/octeon/sys/amd64/amd64/machdep.c
  user/jmallett/octeon/sys/amd64/amd64/mp_machdep.c
  user/jmallett/octeon/sys/amd64/amd64/pmap.c
  user/jmallett/octeon/sys/amd64/amd64/trap.c
  user/jmallett/octeon/sys/amd64/amd64/vm_machdep.c
  user/jmallett/octeon/sys/amd64/conf/NOTES
  user/jmallett/octeon/sys/amd64/ia32/ia32_reg.c
  user/jmallett/octeon/sys/amd64/ia32/ia32_signal.c
  user/jmallett/octeon/sys/amd64/include/fpu.h
  user/jmallett/octeon/sys/amd64/include/mca.h
  user/jmallett/octeon/sys/amd64/include/pcb.h
  user/jmallett/octeon/sys/amd64/include/smp.h
  user/jmallett/octeon/sys/amd64/linux32/linux32_machdep.c
  user/jmallett/octeon/sys/arm/arm/nexus.c
  user/jmallett/octeon/sys/arm/arm/pmap.c
  user/jmallett/octeon/sys/arm/conf/DB-78XXX
  user/jmallett/octeon/sys/arm/conf/DB-88F5XXX
  user/jmallett/octeon/sys/arm/conf/DB-88F6XXX
  user/jmallett/octeon/sys/arm/conf/SHEEVAPLUG
  user/jmallett/octeon/sys/arm/include/metadata.h
  user/jmallett/octeon/sys/arm/mv/bus_space.c
  user/jmallett/octeon/sys/arm/mv/common.c
  user/jmallett/octeon/sys/arm/mv/discovery/discovery.c
  user/jmallett/octeon/sys/arm/mv/discovery/files.db78xxx
  user/jmallett/octeon/sys/arm/mv/files.mv
  user/jmallett/octeon/sys/arm/mv/gpio.c
  user/jmallett/octeon/sys/arm/mv/ic.c
  user/jmallett/octeon/sys/arm/mv/kirkwood/kirkwood.c
  user/jmallett/octeon/sys/arm/mv/kirkwood/sheevaplug.c
  user/jmallett/octeon/sys/arm/mv/kirkwood/std.db88f6xxx
  user/jmallett/octeon/sys/arm/mv/kirkwood/std.sheevaplug
  user/jmallett/octeon/sys/arm/mv/mv_machdep.c
  user/jmallett/octeon/sys/arm/mv/mv_pci.c
  user/jmallett/octeon/sys/arm/mv/mv_sata.c
  user/jmallett/octeon/sys/arm/mv/mvreg.h
  user/jmallett/octeon/sys/arm/mv/mvvar.h
  user/jmallett/octeon/sys/arm/mv/mvwin.h
  user/jmallett/octeon/sys/arm/mv/orion/db88f5xxx.c
  user/jmallett/octeon/sys/arm/mv/orion/orion.c
  user/jmallett/octeon/sys/arm/mv/rtc.c
  user/jmallett/octeon/sys/arm/mv/timer.c
  user/jmallett/octeon/sys/arm/mv/twsi.c
  user/jmallett/octeon/sys/boot/arm/uboot/Makefile
  user/jmallett/octeon/sys/boot/i386/boot0/Makefile
  user/jmallett/octeon/sys/boot/i386/btx/btx/Makefile
  user/jmallett/octeon/sys/boot/i386/btx/btxldr/Makefile
  user/jmallett/octeon/sys/boot/i386/cdboot/Makefile
  user/jmallett/octeon/sys/boot/i386/mbr/Makefile
  user/jmallett/octeon/sys/boot/i386/pmbr/Makefile
  user/jmallett/octeon/sys/boot/i386/pxeldr/Makefile
  user/jmallett/octeon/sys/boot/pc98/boot0.5/Makefile
  user/jmallett/octeon/sys/boot/pc98/boot0/Makefile
  user/jmallett/octeon/sys/boot/pc98/btx/btx/Makefile
  user/jmallett/octeon/sys/boot/pc98/btx/btxldr/Makefile
  user/jmallett/octeon/sys/boot/pc98/cdboot/Makefile
  user/jmallett/octeon/sys/boot/powerpc/uboot/Makefile
  user/jmallett/octeon/sys/boot/sparc64/boot1/Makefile
  user/jmallett/octeon/sys/boot/uboot/common/metadata.c
  user/jmallett/octeon/sys/cam/ata/ata_pmp.c
  user/jmallett/octeon/sys/cam/ata/ata_xpt.c
  user/jmallett/octeon/sys/cam/cam_debug.h
  user/jmallett/octeon/sys/cam/cam_periph.c
  user/jmallett/octeon/sys/cam/cam_xpt.c
  user/jmallett/octeon/sys/cam/cam_xpt_internal.h
  user/jmallett/octeon/sys/cam/scsi/scsi_all.c
  user/jmallett/octeon/sys/cam/scsi/scsi_all.h
  user/jmallett/octeon/sys/cam/scsi/scsi_cd.c
  user/jmallett/octeon/sys/cam/scsi/scsi_ch.h
  user/jmallett/octeon/sys/cam/scsi/scsi_da.c
  user/jmallett/octeon/sys/cam/scsi/scsi_xpt.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/jmallett/octeon/sys/cddl/dev/cyclic/cyclic.c
  user/jmallett/octeon/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  user/jmallett/octeon/sys/cddl/dev/dtrace/dtrace_debug.c
  user/jmallett/octeon/sys/cddl/dev/dtrace/dtrace_load.c
  user/jmallett/octeon/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  user/jmallett/octeon/sys/compat/linprocfs/linprocfs.c
  user/jmallett/octeon/sys/compat/ndis/subr_usbd.c
  user/jmallett/octeon/sys/conf/Makefile.arm
  user/jmallett/octeon/sys/conf/NOTES
  user/jmallett/octeon/sys/conf/files
  user/jmallett/octeon/sys/conf/files.amd64
  user/jmallett/octeon/sys/conf/files.arm
  user/jmallett/octeon/sys/conf/files.i386
  user/jmallett/octeon/sys/conf/files.pc98
  user/jmallett/octeon/sys/conf/files.powerpc
  user/jmallett/octeon/sys/conf/options
  user/jmallett/octeon/sys/conf/options.amd64
  user/jmallett/octeon/sys/conf/options.arm
  user/jmallett/octeon/sys/contrib/libfdt/libfdt_env.h
  user/jmallett/octeon/sys/crypto/via/padlock.c
  user/jmallett/octeon/sys/crypto/via/padlock.h
  user/jmallett/octeon/sys/crypto/via/padlock_cipher.c
  user/jmallett/octeon/sys/crypto/via/padlock_hash.c
  user/jmallett/octeon/sys/dev/acpi_support/acpi_asus.c
  user/jmallett/octeon/sys/dev/acpi_support/acpi_fujitsu.c
  user/jmallett/octeon/sys/dev/acpi_support/acpi_hp.c
  user/jmallett/octeon/sys/dev/acpi_support/acpi_ibm.c
  user/jmallett/octeon/sys/dev/acpica/acpi.c
  user/jmallett/octeon/sys/dev/acpica/acpi_cpu.c
  user/jmallett/octeon/sys/dev/acpica/acpi_dock.c
  user/jmallett/octeon/sys/dev/acpica/acpi_thermal.c
  user/jmallett/octeon/sys/dev/acpica/acpi_video.c
  user/jmallett/octeon/sys/dev/agp/agp_nvidia.c
  user/jmallett/octeon/sys/dev/ahci/ahci.c
  user/jmallett/octeon/sys/dev/ata/ata-all.h
  user/jmallett/octeon/sys/dev/ata/ata-lowlevel.c
  user/jmallett/octeon/sys/dev/ata/atapi-cam.c
  user/jmallett/octeon/sys/dev/ata/chipsets/ata-acerlabs.c
  user/jmallett/octeon/sys/dev/ata/chipsets/ata-intel.c
  user/jmallett/octeon/sys/dev/ata/chipsets/ata-serverworks.c
  user/jmallett/octeon/sys/dev/ath/if_ath.c
  user/jmallett/octeon/sys/dev/bge/if_bge.c
  user/jmallett/octeon/sys/dev/bge/if_bgereg.h
  user/jmallett/octeon/sys/dev/cas/if_cas.c
  user/jmallett/octeon/sys/dev/cxgb/cxgb_adapter.h
  user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c
  user/jmallett/octeon/sys/dev/cxgb/cxgb_sge.c
  user/jmallett/octeon/sys/dev/cxgb/ulp/tom/cxgb_vm.c
  user/jmallett/octeon/sys/dev/e1000/if_em.c
  user/jmallett/octeon/sys/dev/e1000/if_igb.c
  user/jmallett/octeon/sys/dev/e1000/if_igb.h
  user/jmallett/octeon/sys/dev/e1000/if_lem.c
  user/jmallett/octeon/sys/dev/hwpmc/hwpmc_mod.c
  user/jmallett/octeon/sys/dev/iicbus/iic.h
  user/jmallett/octeon/sys/dev/isp/isp.c
  user/jmallett/octeon/sys/dev/isp/isp_freebsd.c
  user/jmallett/octeon/sys/dev/isp/isp_library.c
  user/jmallett/octeon/sys/dev/isp/isp_pci.c
  user/jmallett/octeon/sys/dev/iwn/if_iwn.c
  user/jmallett/octeon/sys/dev/ixgbe/ixgbe.c
  user/jmallett/octeon/sys/dev/ixgbe/ixgbe.h
  user/jmallett/octeon/sys/dev/md/md.c
  user/jmallett/octeon/sys/dev/mge/if_mge.c
  user/jmallett/octeon/sys/dev/mge/if_mgevar.h
  user/jmallett/octeon/sys/dev/mvs/mvs.c
  user/jmallett/octeon/sys/dev/ofw/ofw_bus_subr.c
  user/jmallett/octeon/sys/dev/ofw/ofw_bus_subr.h
  user/jmallett/octeon/sys/dev/pci/pci.c
  user/jmallett/octeon/sys/dev/pci/pcivar.h
  user/jmallett/octeon/sys/dev/random/nehemiah.c
  user/jmallett/octeon/sys/dev/sge/if_sge.c
  user/jmallett/octeon/sys/dev/siis/siis.c
  user/jmallett/octeon/sys/dev/sound/pci/hda/hdac.c
  user/jmallett/octeon/sys/dev/sound/pcm/feeder_eq.c
  user/jmallett/octeon/sys/dev/sound/pcm/feeder_rate.c
  user/jmallett/octeon/sys/dev/sound/pcm/sound.c
  user/jmallett/octeon/sys/dev/twa/tw_cl.h
  user/jmallett/octeon/sys/dev/twa/tw_cl_fwif.h
  user/jmallett/octeon/sys/dev/twa/tw_cl_init.c
  user/jmallett/octeon/sys/dev/twa/tw_cl_intr.c
  user/jmallett/octeon/sys/dev/twa/tw_cl_io.c
  user/jmallett/octeon/sys/dev/twa/tw_cl_misc.c
  user/jmallett/octeon/sys/dev/twa/tw_cl_share.h
  user/jmallett/octeon/sys/dev/twa/tw_osl.h
  user/jmallett/octeon/sys/dev/twa/tw_osl_cam.c
  user/jmallett/octeon/sys/dev/twa/tw_osl_externs.h
  user/jmallett/octeon/sys/dev/twa/tw_osl_freebsd.c
  user/jmallett/octeon/sys/dev/twa/tw_osl_inline.h
  user/jmallett/octeon/sys/dev/twa/tw_osl_share.h
  user/jmallett/octeon/sys/dev/usb/usb_dev.c
  user/jmallett/octeon/sys/dev/usb/usb_device.c
  user/jmallett/octeon/sys/dev/usb/usb_process.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_rum.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_run.c
  user/jmallett/octeon/sys/dev/usb/wlan/if_runvar.h
  user/jmallett/octeon/sys/dev/usb/wlan/if_ural.c
  user/jmallett/octeon/sys/dev/xen/netfront/netfront.c
  user/jmallett/octeon/sys/fs/devfs/devfs.h
  user/jmallett/octeon/sys/fs/devfs/devfs_devs.c
  user/jmallett/octeon/sys/fs/devfs/devfs_vnops.c
  user/jmallett/octeon/sys/fs/nfsclient/nfs_clbio.c
  user/jmallett/octeon/sys/fs/nfsclient/nfs_clcomsubs.c
  user/jmallett/octeon/sys/fs/nfsclient/nfs_clport.c
  user/jmallett/octeon/sys/fs/nfsclient/nfs_clrpcops.c
  user/jmallett/octeon/sys/fs/nfsclient/nfs_clsubs.c
  user/jmallett/octeon/sys/fs/nfsclient/nfs_clvnops.c
  user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdport.c
  user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdsocket.c
  user/jmallett/octeon/sys/fs/nwfs/nwfs_io.c
  user/jmallett/octeon/sys/fs/procfs/procfs_type.c
  user/jmallett/octeon/sys/fs/smbfs/smbfs_io.c
  user/jmallett/octeon/sys/fs/tmpfs/tmpfs_vnops.c
  user/jmallett/octeon/sys/geom/gate/g_gate.c
  user/jmallett/octeon/sys/geom/geom_dev.c
  user/jmallett/octeon/sys/geom/geom_event.c
  user/jmallett/octeon/sys/geom/geom_io.c
  user/jmallett/octeon/sys/geom/mountver/g_mountver.c
  user/jmallett/octeon/sys/geom/part/g_part_bsd.c
  user/jmallett/octeon/sys/geom/part/g_part_gpt.c
  user/jmallett/octeon/sys/i386/acpica/acpi_wakeup.c
  user/jmallett/octeon/sys/i386/acpica/madt.c
  user/jmallett/octeon/sys/i386/conf/NOTES
  user/jmallett/octeon/sys/i386/i386/intr_machdep.c
  user/jmallett/octeon/sys/i386/i386/legacy.c
  user/jmallett/octeon/sys/i386/i386/machdep.c
  user/jmallett/octeon/sys/i386/i386/mp_machdep.c
  user/jmallett/octeon/sys/i386/i386/pmap.c
  user/jmallett/octeon/sys/i386/i386/ptrace_machdep.c
  user/jmallett/octeon/sys/i386/i386/swtch.s
  user/jmallett/octeon/sys/i386/i386/trap.c
  user/jmallett/octeon/sys/i386/i386/tsc.c
  user/jmallett/octeon/sys/i386/i386/vm_machdep.c
  user/jmallett/octeon/sys/i386/include/mca.h
  user/jmallett/octeon/sys/i386/include/npx.h
  user/jmallett/octeon/sys/i386/include/pcb.h
  user/jmallett/octeon/sys/i386/include/pcpu.h
  user/jmallett/octeon/sys/i386/isa/npx.c
  user/jmallett/octeon/sys/i386/linux/linux_machdep.c
  user/jmallett/octeon/sys/i386/linux/linux_ptrace.c
  user/jmallett/octeon/sys/i386/xen/pmap.c
  user/jmallett/octeon/sys/ia64/ia64/busdma_machdep.c
  user/jmallett/octeon/sys/ia64/ia64/exception.S
  user/jmallett/octeon/sys/ia64/ia64/pmap.c
  user/jmallett/octeon/sys/ia64/ia64/vm_machdep.c
  user/jmallett/octeon/sys/ia64/include/md_var.h
  user/jmallett/octeon/sys/kern/bus_if.m
  user/jmallett/octeon/sys/kern/kern_clock.c
  user/jmallett/octeon/sys/kern/kern_conf.c
  user/jmallett/octeon/sys/kern/kern_intr.c
  user/jmallett/octeon/sys/kern/kern_jail.c
  user/jmallett/octeon/sys/kern/kern_switch.c
  user/jmallett/octeon/sys/kern/kern_sx.c
  user/jmallett/octeon/sys/kern/kern_tc.c
  user/jmallett/octeon/sys/kern/kern_timeout.c
  user/jmallett/octeon/sys/kern/sched_4bsd.c
  user/jmallett/octeon/sys/kern/sched_ule.c
  user/jmallett/octeon/sys/kern/subr_acl_nfs4.c
  user/jmallett/octeon/sys/kern/subr_acl_posix1e.c
  user/jmallett/octeon/sys/kern/subr_bus.c
  user/jmallett/octeon/sys/kern/subr_kdb.c
  user/jmallett/octeon/sys/kern/subr_lock.c
  user/jmallett/octeon/sys/kern/subr_pcpu.c
  user/jmallett/octeon/sys/kern/subr_smp.c
  user/jmallett/octeon/sys/kern/subr_taskqueue.c
  user/jmallett/octeon/sys/kern/subr_trap.c
  user/jmallett/octeon/sys/kern/subr_unit.c
  user/jmallett/octeon/sys/kern/sysv_sem.c
  user/jmallett/octeon/sys/kern/sysv_shm.c
  user/jmallett/octeon/sys/kern/uipc_shm.c
  user/jmallett/octeon/sys/kern/vfs_acl.c
  user/jmallett/octeon/sys/kern/vfs_bio.c
  user/jmallett/octeon/sys/kern/vfs_subr.c
  user/jmallett/octeon/sys/mips/rmi/board.c
  user/jmallett/octeon/sys/mips/rmi/board.h
  user/jmallett/octeon/sys/mips/rmi/dev/xlr/rge.c
  user/jmallett/octeon/sys/modules/netgraph/Makefile
  user/jmallett/octeon/sys/modules/zfs/Makefile
  user/jmallett/octeon/sys/net/bpf.c
  user/jmallett/octeon/sys/net/bpf.h
  user/jmallett/octeon/sys/net/bpfdesc.h
  user/jmallett/octeon/sys/net/flowtable.c
  user/jmallett/octeon/sys/net/if_epair.c
  user/jmallett/octeon/sys/net/netisr.c
  user/jmallett/octeon/sys/net/vnet.h
  user/jmallett/octeon/sys/net80211/ieee80211_hwmp.c
  user/jmallett/octeon/sys/net80211/ieee80211_rssadapt.c
  user/jmallett/octeon/sys/net80211/ieee80211_sta.c
  user/jmallett/octeon/sys/netgraph/ng_pppoe.c
  user/jmallett/octeon/sys/netinet/ip_mroute.c
  user/jmallett/octeon/sys/netinet/ip_mroute.h
  user/jmallett/octeon/sys/netinet/pim_var.h
  user/jmallett/octeon/sys/netinet/sctp.h
  user/jmallett/octeon/sys/netinet/sctp_asconf.c
  user/jmallett/octeon/sys/netinet/sctp_auth.c
  user/jmallett/octeon/sys/netinet/sctp_bsd_addr.c
  user/jmallett/octeon/sys/netinet/sctp_constants.h
  user/jmallett/octeon/sys/netinet/sctp_indata.c
  user/jmallett/octeon/sys/netinet/sctp_input.c
  user/jmallett/octeon/sys/netinet/sctp_lock_bsd.h
  user/jmallett/octeon/sys/netinet/sctp_output.c
  user/jmallett/octeon/sys/netinet/sctp_pcb.c
  user/jmallett/octeon/sys/netinet/sctp_pcb.h
  user/jmallett/octeon/sys/netinet/sctp_sysctl.c
  user/jmallett/octeon/sys/netinet/sctp_usrreq.c
  user/jmallett/octeon/sys/netinet/sctputil.c
  user/jmallett/octeon/sys/nfsclient/nfs_bio.c
  user/jmallett/octeon/sys/nfsclient/nfs_subs.c
  user/jmallett/octeon/sys/nfsclient/nfs_vnops.c
  user/jmallett/octeon/sys/opencrypto/crypto.c
  user/jmallett/octeon/sys/pc98/pc98/machdep.c
  user/jmallett/octeon/sys/powerpc/aim/interrupt.c
  user/jmallett/octeon/sys/powerpc/aim/mmu_oea.c
  user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c
  user/jmallett/octeon/sys/powerpc/aim/mp_cpudep.c
  user/jmallett/octeon/sys/powerpc/aim/nexus.c
  user/jmallett/octeon/sys/powerpc/aim/platform_chrp.c
  user/jmallett/octeon/sys/powerpc/booke/interrupt.c
  user/jmallett/octeon/sys/powerpc/booke/pmap.c
  user/jmallett/octeon/sys/powerpc/include/intr_machdep.h
  user/jmallett/octeon/sys/powerpc/include/ocpbus.h
  user/jmallett/octeon/sys/powerpc/include/openpicvar.h
  user/jmallett/octeon/sys/powerpc/mpc85xx/atpic.c
  user/jmallett/octeon/sys/powerpc/mpc85xx/isa.c
  user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.c
  user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.h
  user/jmallett/octeon/sys/powerpc/mpc85xx/opic.c
  user/jmallett/octeon/sys/powerpc/mpc85xx/pci_ocp.c
  user/jmallett/octeon/sys/powerpc/ofw/ofw_pcib_pci.c
  user/jmallett/octeon/sys/powerpc/ofw/ofw_pcibus.c
  user/jmallett/octeon/sys/powerpc/ofw/ofw_syscons.c
  user/jmallett/octeon/sys/powerpc/powermac/cpcht.c
  user/jmallett/octeon/sys/powerpc/powermac/grackle.c
  user/jmallett/octeon/sys/powerpc/powermac/hrowpic.c
  user/jmallett/octeon/sys/powerpc/powermac/kiic.c
  user/jmallett/octeon/sys/powerpc/powermac/macgpio.c
  user/jmallett/octeon/sys/powerpc/powermac/macio.c
  user/jmallett/octeon/sys/powerpc/powermac/openpic_macio.c
  user/jmallett/octeon/sys/powerpc/powermac/smu.c
  user/jmallett/octeon/sys/powerpc/powermac/uninorth.c
  user/jmallett/octeon/sys/powerpc/powermac/uninorthpci.c
  user/jmallett/octeon/sys/powerpc/powerpc/intr_machdep.c
  user/jmallett/octeon/sys/powerpc/powerpc/mp_machdep.c
  user/jmallett/octeon/sys/powerpc/powerpc/openpic.c
  user/jmallett/octeon/sys/powerpc/powerpc/pic_if.m
  user/jmallett/octeon/sys/sparc64/ebus/ebus.c
  user/jmallett/octeon/sys/sparc64/isa/ofw_isa.c
  user/jmallett/octeon/sys/sparc64/pci/fire.c
  user/jmallett/octeon/sys/sparc64/pci/ofw_pcib_subr.c
  user/jmallett/octeon/sys/sparc64/pci/psycho.c
  user/jmallett/octeon/sys/sparc64/pci/schizo.c
  user/jmallett/octeon/sys/sparc64/sparc64/mp_locore.S
  user/jmallett/octeon/sys/sparc64/sparc64/pmap.c
  user/jmallett/octeon/sys/sun4v/sun4v/hv_pci.c
  user/jmallett/octeon/sys/sun4v/sun4v/pmap.c
  user/jmallett/octeon/sys/sys/buf.h
  user/jmallett/octeon/sys/sys/bus.h
  user/jmallett/octeon/sys/sys/conf.h
  user/jmallett/octeon/sys/sys/file.h
  user/jmallett/octeon/sys/sys/libkern.h
  user/jmallett/octeon/sys/sys/nlist_aout.h
  user/jmallett/octeon/sys/sys/param.h
  user/jmallett/octeon/sys/sys/pcpu.h
  user/jmallett/octeon/sys/sys/pmc.h
  user/jmallett/octeon/sys/sys/proc.h
  user/jmallett/octeon/sys/sys/smp.h
  user/jmallett/octeon/sys/sys/time.h
  user/jmallett/octeon/sys/sys/vnode.h
  user/jmallett/octeon/sys/sys/vtoc.h
  user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c
  user/jmallett/octeon/sys/ufs/ufs/ufs_quota.c
  user/jmallett/octeon/sys/vm/uma.h
  user/jmallett/octeon/sys/vm/uma_core.c
  user/jmallett/octeon/sys/vm/uma_int.h
  user/jmallett/octeon/sys/vm/vm_contig.c
  user/jmallett/octeon/sys/vm/vm_page.c
  user/jmallett/octeon/sys/vm/vm_page.h
  user/jmallett/octeon/sys/vm/vm_pageout.c
  user/jmallett/octeon/sys/vm/vm_pageout.h
  user/jmallett/octeon/sys/vm/vnode_pager.c
  user/jmallett/octeon/tools/build/mk/OptionalObsoleteFiles.inc
  user/jmallett/octeon/tools/regression/fstest/Makefile
  user/jmallett/octeon/tools/tools/nanobsd/nanobsd.sh
  user/jmallett/octeon/tools/tools/netrate/tcpp/README
  user/jmallett/octeon/tools/tools/netrate/tcpp/tcpp.c
  user/jmallett/octeon/tools/tools/netrate/tcpp/tcpp.h
  user/jmallett/octeon/tools/tools/netrate/tcpp/tcpp_client.c
  user/jmallett/octeon/tools/tools/netrate/tcpp/tcpp_server.c
  user/jmallett/octeon/tools/tools/tinybsd/conf/default/TINYBSD
  user/jmallett/octeon/tools/tools/tinybsd/conf/vpn/TINYBSD
  user/jmallett/octeon/usr.bin/Makefile
  user/jmallett/octeon/usr.bin/bc/scan.l
  user/jmallett/octeon/usr.bin/c99/c99.1
  user/jmallett/octeon/usr.bin/calendar/calendars/calendar.freebsd
  user/jmallett/octeon/usr.bin/calendar/io.c
  user/jmallett/octeon/usr.bin/calendar/locale.c
  user/jmallett/octeon/usr.bin/calendar/sunpos.c
  user/jmallett/octeon/usr.bin/dc/bcode.c
  user/jmallett/octeon/usr.bin/dc/dc.c
  user/jmallett/octeon/usr.bin/gzip/gzip.c
  user/jmallett/octeon/usr.bin/hexdump/od.1
  user/jmallett/octeon/usr.bin/ipcs/ipc.c
  user/jmallett/octeon/usr.bin/systat/vmstat.c
  user/jmallett/octeon/usr.bin/tar/read.c
  user/jmallett/octeon/usr.bin/tar/write.c
  user/jmallett/octeon/usr.bin/unzip/unzip.c
  user/jmallett/octeon/usr.bin/vmstat/vmstat.c
  user/jmallett/octeon/usr.bin/wtmpcvt/wtmpcvt.c
  user/jmallett/octeon/usr.sbin/Makefile
  user/jmallett/octeon/usr.sbin/arp/arp.c
  user/jmallett/octeon/usr.sbin/chown/chown.c
  user/jmallett/octeon/usr.sbin/config/mkmakefile.c
  user/jmallett/octeon/usr.sbin/moused/moused.c
  user/jmallett/octeon/usr.sbin/mptutil/mptutil.8
  user/jmallett/octeon/usr.sbin/nfscbd/nfscbd.8
  user/jmallett/octeon/usr.sbin/nfsdumpstate/nfsdumpstate.8
  user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_calltree.c
  user/jmallett/octeon/usr.sbin/pmcstat/pmcstat.c
  user/jmallett/octeon/usr.sbin/pmcstat/pmcstat_log.c
  user/jmallett/octeon/usr.sbin/powerd/powerd.c
  user/jmallett/octeon/usr.sbin/service/service.8
  user/jmallett/octeon/usr.sbin/sysinstall/Makefile
  user/jmallett/octeon/usr.sbin/sysinstall/devices.c
  user/jmallett/octeon/usr.sbin/sysinstall/disks.c
  user/jmallett/octeon/usr.sbin/sysinstall/install.c
  user/jmallett/octeon/usr.sbin/sysinstall/installUpgrade.c
  user/jmallett/octeon/usr.sbin/sysinstall/label.c
  user/jmallett/octeon/usr.sbin/sysinstall/media.c
  user/jmallett/octeon/usr.sbin/sysinstall/sysinstall.h
  user/jmallett/octeon/usr.sbin/sysinstall/system.c
  user/jmallett/octeon/usr.sbin/sysinstall/tcpip.c
  user/jmallett/octeon/usr.sbin/timed/timed/timed.8
  user/jmallett/octeon/usr.sbin/tzsetup/tzsetup.c
  user/jmallett/octeon/usr.sbin/wpa/hostapd/Makefile
  user/jmallett/octeon/usr.sbin/wpa/wpa_supplicant/Makefile
Directory Properties:
  user/jmallett/octeon/   (props changed)
  user/jmallett/octeon/contrib/wpa/   (props changed)
  user/jmallett/octeon/sys/arm/include/bootinfo.h   (props changed)

Modified: user/jmallett/octeon/Makefile
==============================================================================

--- user/jmallett/octeon/Makefile	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/Makefile	Sat Jun 19 10:06:46 2010	(r209334)
@@ -89,7 +89,8 @@ TGTS=	all all-man buildenv buildenvvars 
 	obj objlink regress rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	build32 distribute32 install32 xdev xdev-build xdev-install
+	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+
 TGTS+=	${SUBDIR_TARGETS}
 
 BITGTS=	files includes

Modified: user/jmallett/octeon/Makefile.inc1
==============================================================================
--- user/jmallett/octeon/Makefile.inc1	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/Makefile.inc1	Sat Jun 19 10:06:46 2010	(r209334)
@@ -956,18 +956,31 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptre
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
+# XXX: There is no way to specify bootstrap tools depending on MK-flags
+# with different per-architecture default values. Always build tblgen.
+_clang_tblgen= \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmsystem \
+	usr.bin/clang/tblgen
+
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
+.if ${MK_FDT} != "no"
+_dtc= gnu/usr.bin/dtc
+.endif
+
 bootstrap-tools:
 .for _tool in \
+    ${_clang_tblgen} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
     ${_ar} \
+    ${_dtc} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     ${_mklocale} \
@@ -1440,3 +1453,39 @@ _xi-links:
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
 .endif
+
+.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
+DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
+
+.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
+FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \
+	${KERNCONFDIR}/${KERNCONF}
+.endif
+
+.endif
+
+.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
+DTBOUTPUTPATH= ${.CURDIR}
+.endif
+
+#
+# Build 'standalone' Device Tree Blob
+#
+builddtb:
+	@if [ "${FDT_DTS_FILE}" = "" ]; then \
+		echo "ERROR: FDT_DTS_FILE must be specified!"; \
+		exit 1; \
+	fi;	\
+	if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+		echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
+			exist!"; \
+		exit 1;	\
+	fi;	\
+	if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then	\
+		echo "WARNING: DTB will be placed in the current working \
+			directory"; \
+	fi
+	@PATH=${TMPPATH} \
+	dtc -O dtb -o \
+	    ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
+	    -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}

Modified: user/jmallett/octeon/bin/cp/cp.c
==============================================================================
--- user/jmallett/octeon/bin/cp/cp.c	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/cp/cp.c	Sat Jun 19 10:06:46 2010	(r209334)
@@ -466,6 +466,7 @@ copy(char *argv[], enum op type, int fts
 		case S_IFSOCK:
 			warnx("%s is a socket (not copied).",
 				    curr->fts_path);
+			break;
 		case S_IFIFO:
 			if (Rflag) {
 				if (copy_fifo(curr->fts_statp, !dne))

Modified: user/jmallett/octeon/bin/date/date.1
==============================================================================
--- user/jmallett/octeon/bin/date/date.1	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/date/date.1	Sat Jun 19 10:06:46 2010	(r209334)
@@ -32,7 +32,7 @@
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd June 2, 2007
+.Dd June 3, 2010
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -219,6 +219,14 @@ When the date is adjusted to a specific 
 the resulting timezone will be set so that the date matches the earlier of
 the two times.
 .Pp
+It is not possible to adjust a date to an invalid absolute day, so using
+the switches
+.Fl v No 31d Fl v No 12m
+will simply fail five months of the year.
+It is therefore usual to set the month before setting the day; using
+.Fl v No 12m Fl v No 31d
+always works.
+.Pp
 Adjusting the date by months is inherently ambiguous because
 a month is a unit of variable length depending on the current date.
 This kind of date adjustment is applied in the most intuitive way.
@@ -339,9 +347,9 @@ will display the last day of February in
 .Pp
 .Dl "Tue Feb 29 03:18:00 GMT 2000"
 .Pp
-So will do the command:
+So will the command:
 .Pp
-.Dl "date -v30d -v3m -v0y -v-1m"
+.Dl "date -v3m -v30d -v0y -v-1m"
 .Pp
 because there is no such date as the 30th of February.
 .Pp

Modified: user/jmallett/octeon/bin/getfacl/getfacl.1
==============================================================================
--- user/jmallett/octeon/bin/getfacl/getfacl.1	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/getfacl/getfacl.1	Sat Jun 19 10:06:46 2010	(r209334)
@@ -48,7 +48,7 @@ the specified file(s) to standard output
 If the
 .Xr getconf 1
 utility indicates that
-.Eq { } Va _POSIX_ACL_EXTENDED
+.Brq Va _POSIX_ACL_EXTENDED
 is not in effect for a
 .Ar file
 then the standard discretionary access permissions are interpreted as

Modified: user/jmallett/octeon/bin/sh/histedit.c
==============================================================================
--- user/jmallett/octeon/bin/sh/histedit.c	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/sh/histedit.c	Sat Jun 19 10:06:46 2010	(r209334)
@@ -98,6 +98,8 @@ histedit(void)
 			/*
 			 * turn editing on
 			 */
+			char *term;
+
 			INTOFF;
 			if (el_in == NULL)
 				el_in = fdopen(0, "r");
@@ -107,11 +109,19 @@ histedit(void)
 				el_out = fdopen(2, "w");
 			if (el_in == NULL || el_err == NULL || el_out == NULL)
 				goto bad;
+			term = lookupvar("TERM");
+			if (term)
+				setenv("TERM", term, 1);
+			else
+				unsetenv("TERM");
 			el = el_init(arg0, el_in, el_out, el_err);
 			if (el != NULL) {
 				if (hist)
 					el_set(el, EL_HIST, history, hist);
 				el_set(el, EL_PROMPT, getprompt);
+				el_set(el, EL_ADDFN, "sh-complete",
+				    "Filename completion",
+				    _el_fn_sh_complete);
 			} else {
 bad:
 				out2fmt_flush("sh: can't initialize editing\n");
@@ -128,6 +138,7 @@ bad:
 				el_set(el, EL_EDITOR, "vi");
 			else if (Eflag)
 				el_set(el, EL_EDITOR, "emacs");
+			el_set(el, EL_BIND, "^I", "sh-complete", NULL);
 			el_source(el, NULL);
 		}
 	} else {
@@ -160,6 +171,13 @@ sethistsize(hs)
 	}
 }
 
+void
+setterm(const char *term)
+{
+	if (rootshell && el != NULL && term != NULL)
+		el_set(el, EL_TERMINAL, term);
+}
+
 int
 histcmd(int argc, char **argv)
 {

Modified: user/jmallett/octeon/bin/sh/jobs.c
==============================================================================
--- user/jmallett/octeon/bin/sh/jobs.c	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/sh/jobs.c	Sat Jun 19 10:06:46 2010	(r209334)
@@ -866,6 +866,7 @@ waitforjob(struct job *jp, int *origstat
 {
 #if JOBS
 	pid_t mypgrp = getpgrp();
+	int propagate_int = jp->jobctl && jp->foreground;
 #endif
 	int status;
 	int st;
@@ -903,6 +904,11 @@ waitforjob(struct job *jp, int *origstat
 		else
 			CLEAR_PENDING_INT;
 	}
+#if JOBS
+	else if (rootshell && iflag && propagate_int &&
+			WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
+		kill(getpid(), SIGINT);
+#endif
 	INTON;
 	return st;
 }

Modified: user/jmallett/octeon/bin/sh/myhistedit.h
==============================================================================
--- user/jmallett/octeon/bin/sh/myhistedit.h	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/sh/myhistedit.h	Sat Jun 19 10:06:46 2010	(r209334)
@@ -38,6 +38,7 @@ extern int displayhist;
 
 void histedit(void);
 void sethistsize(const char *);
+void setterm(const char *);
 int histcmd(int, char **);
 int not_fcnumber(const char *);
 int str_to_event(const char *, int);

Modified: user/jmallett/octeon/bin/sh/var.c
==============================================================================
--- user/jmallett/octeon/bin/sh/var.c	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/sh/var.c	Sat Jun 19 10:06:46 2010	(r209334)
@@ -80,6 +80,7 @@ struct varinit {
 
 #ifndef NO_HISTORY
 struct var vhistsize;
+struct var vterm;
 #endif
 struct var vifs;
 struct var vmail;
@@ -114,6 +115,10 @@ STATIC const struct varinit varinit[] = 
 	  NULL },
 	{ &vps4,	0,				"PS4=+ ",
 	  NULL },
+#ifndef NO_HISTORY
+	{ &vterm,	VUNSET,				"TERM=",
+	  setterm },
+#endif
 	{ &voptind,	0,				"OPTIND=1",
 	  getoptsreset },
 	{ NULL,	0,				NULL,

Modified: user/jmallett/octeon/bin/sh/var.h
==============================================================================
--- user/jmallett/octeon/bin/sh/var.h	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/bin/sh/var.h	Sat Jun 19 10:06:46 2010	(r209334)
@@ -77,6 +77,7 @@ extern struct var vps2;
 extern struct var vps4;
 #ifndef NO_HISTORY
 extern struct var vhistsize;
+extern struct var vterm;
 #endif
 
 /*
@@ -96,6 +97,7 @@ extern struct var vhistsize;
 #define optindval()	(voptind.text + 7)
 #ifndef NO_HISTORY
 #define histsizeval()	(vhistsize.text + 9)
+#define termval()	(vterm.text + 5)
 #endif
 
 #define mpathset()	((vmpath.flags & VUNSET) == 0)

Modified: user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Sat Jun 19 10:06:46 2010	(r209334)
@@ -45,7 +45,7 @@
 #undef input
 #undef unput
 #else
-/* 
+/*
  * Define YY_INPUT for flex since input() can't be re-defined.
  */
 #define YY_INPUT(buf,result,max_size) \
@@ -60,6 +60,15 @@
 			buf[n] = *yypcb->pcb_strptr++; \
 		result = n; \
 	}
+/*
+ * Do not EOF let tokens to be put back. This does not work with flex.
+ * On the other hand, leaving current buffer in same state it was when
+ * last EOF was received guarantees that input() will keep returning EOF
+ * for all subsequent invocations, which is the effect desired.
+ */
+#undef  unput
+#define unput(c) \
+	if (c != EOF) yyunput( c, yytext_ptr )
 #endif
 
 static int id_or_type(const char *);

Modified: user/jmallett/octeon/contrib/gdtoa/hexnan.c
==============================================================================
--- user/jmallett/octeon/contrib/gdtoa/hexnan.c	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/contrib/gdtoa/hexnan.c	Sat Jun 19 10:06:46 2010	(r209334)
@@ -31,6 +31,8 @@ THIS SOFTWARE.
 
 /* $FreeBSD$ */
 
+#include <ctype.h>
+
 #include "gdtoaimp.h"
 
  static void

Modified: user/jmallett/octeon/contrib/sendmail/mail.local/mail.local.8
==============================================================================
--- user/jmallett/octeon/contrib/sendmail/mail.local/mail.local.8	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/contrib/sendmail/mail.local/mail.local.8	Sat Jun 19 10:06:46 2010	(r209334)
@@ -39,9 +39,7 @@ The options are as follows:
 Do not advertise 8BITMIME support in LMTP mode.
 .TP 
 .B \-B
-Turn off the attempts to notify the
-.Dq biff
-service.
+Turn off the attempts to notify the ``biff'' service.
 .TP 
 .B \-b
 Return a permanent error instead of a temporary error
@@ -63,11 +61,8 @@ Specify the sender's name.
 Turn on LMTP mode.
 .TP
 .B \-s
-Turn off the
-.Xr fsync 2
-call that forces the mailbox to be committed to disk before returning a
-.Dq success
-status.
+Turn off the fsync(2) call that forces the mailbox to be committed
+to disk before returning a "success" status.
 .TP 
 .BI \-r " from"
 Specify the sender's name (for backward compatibility).

Modified: user/jmallett/octeon/contrib/tzcode/zic/zic.8
==============================================================================
--- user/jmallett/octeon/contrib/tzcode/zic/zic.8	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/contrib/tzcode/zic/zic.8	Sat Jun 19 10:06:46 2010	(r209334)
@@ -120,9 +120,9 @@ Non-blank lines are expected to be of on
 rule lines, zone lines, and link lines.
 .Pp
 A rule line has the form:
-.Dl "Rule	NAME	FROM	TO	TYPE	IN	ON		AT	SAVE	LETTER/S
+.Dl "Rule	NAME	FROM	TO	TYPE	IN	ON		AT	SAVE	LETTER/S"
 For example:
-.Dl "Rule	US	1967	1973	\-	Apr	lastSun	2:00	1:00	D
+.Dl "Rule	US	1967	1973	\-	Apr	lastSun	2:00	1:00	D"
 .Pp
 The fields that make up a rule line are:
 .Bl -tag -width "LETTER/S" -offset indent
@@ -262,7 +262,7 @@ the variable part is null.
 A zone line has the form:
 .Dl "Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	[UNTILYEAR [MONTH [DAY [TIME]]]]"
 For example:
-.Dl "Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00
+.Dl "Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00"
 The fields that make up a zone line are:
 .Bl -tag -width indent
 .It NAME
@@ -319,9 +319,9 @@ continuation.
 .El
 .Pp
 A link line has the form
-.Dl "Link	LINK-FROM	LINK-TO
+.Dl "Link	LINK-FROM	LINK-TO"
 For example:
-.Dl "Link	Europe/Istanbul	Asia/Istanbul
+.Dl "Link	Europe/Istanbul	Asia/Istanbul"
 The
 .Em LINK-FROM
 field should appear as the
@@ -335,9 +335,9 @@ Except for continuation lines,
 lines may appear in any order in the input.
 .Pp
 Lines in the file that describes leap seconds have the following form:
-.Dl "Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
+.Dl "Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
 For example:
-.Dl "Leap	1974	Dec	31	23:59:60	+	S
+.Dl "Leap	1974	Dec	31	23:59:60	+	S"
 The
 .Em YEAR ,
 .Em MONTH ,

Modified: user/jmallett/octeon/contrib/wpa/hostapd/ChangeLog
==============================================================================
--- user/jmallett/octeon/contrib/wpa/hostapd/ChangeLog	Sat Jun 19 09:50:04 2010	(r209333)
+++ user/jmallett/octeon/contrib/wpa/hostapd/ChangeLog	Sat Jun 19 10:06:46 2010	(r209334)
@@ -1,5 +1,37 @@
 ChangeLog for hostapd
 
+2010-01-12 - v0.6.10
+	* fixed SHA-256 based key derivation function to match with the
+	  standard when using CCMP (for IEEE 802.11r and IEEE 802.11w)
+	  (note: this breaks interoperability with previous version) [Bug 307]
+	* fixed WPS selected registrar expiration for internal PIN registrar
+	* disable PMTU discovery for RADIUS packets
+	* fixed WPS UPnP SSDP on 32-bit targets
+	* fixed WPS AP reconfiguration with drivers that do not use hostapd
+	  MLME
+	* fixed RSN parameter setting for multi-BSS case
+	* added WPS workarounds for known interoperability issues with broken,
+	  deployed implementation
+	* update IEEE 802.11w implementation to match with the published
+	  standard
+	* fixed OpCode when proxying WSC_ACK or WSC_NACK from WPS ER
+	* fixed proxying of WSC_NACK to WPS ER
+	* fixed compilation with newer GnuTLS versions
+	* added support for defining timeout for WPS PINs
+	* fixed WPS Probe Request processing to handle missing required
+	  attribute
+	* fixed PKCS#12 use with OpenSSL 1.0.0
+
+2009-03-23 - v0.6.9
+	* driver_nl80211: fixed STA accounting data collection (TX/RX bytes
+	  reported correctly; TX/RX packets not yet available from kernel)
+	* fixed EAPOL/EAP reauthentication when using an external RADIUS
+	  authentication server
+	* driver_prism54: fixed segmentation fault on initialization
+	* fixed TNC with EAP-TTLS
+	* fixed IEEE 802.11r key derivation function to match with the standard
+	  (note: this breaks interoperability with previous version) [Bug 303]
+
 2009-02-15 - v0.6.8
 	* increased hostapd_cli ping interval to 5 seconds and made this
 	  configurable with a new command line options (-G<seconds>)

Copied: user/jmallett/octeon/contrib/wpa/hostapd/Makefile (from r209333, head/contrib/wpa/hostapd/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/contrib/wpa/hostapd/Makefile	Sat Jun 19 10:06:46 2010	(r209334, copy of r209333, head/contrib/wpa/hostapd/Makefile)
@@ -0,0 +1,635 @@
+ifndef CC
+CC=gcc
+endif
+
+ifndef CFLAGS
+CFLAGS = -MMD -O2 -Wall -g
+endif
+
+# define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+# a file (undefine it, if you want to save in binary size)
+CFLAGS += -DHOSTAPD_DUMP_STATE
+
+CFLAGS += -I../src
+CFLAGS += -I../src/crypto
+CFLAGS += -I../src/utils
+CFLAGS += -I../src/common
+
+# Uncomment following line and set the path to your kernel tree include
+# directory if your C library does not include all header files.
+# CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
+
+-include .config
+
+ifndef CONFIG_OS
+ifdef CONFIG_NATIVE_WINDOWS
+CONFIG_OS=win32
+else
+CONFIG_OS=unix
+endif
+endif
+
+ifeq ($(CONFIG_OS), internal)
+CFLAGS += -DOS_NO_C_LIB_DEFINES
+endif
+
+ifdef CONFIG_NATIVE_WINDOWS
+CFLAGS += -DCONFIG_NATIVE_WINDOWS
+LIBS += -lws2_32
+endif
+
+OBJS =	hostapd.o ieee802_1x.o eapol_sm.o \
+	ieee802_11.o config.o ieee802_11_auth.o accounting.o \
+	sta_info.o wpa.o ctrl_iface.o \
+	drivers.o preauth.o pmksa_cache.o beacon.o \
+	hw_features.o wme.o ap_list.o \
+	mlme.o vlan_init.o wpa_auth_ie.o
+
+OBJS += ../src/utils/eloop.o
+OBJS += ../src/utils/common.o
+OBJS += ../src/utils/wpa_debug.o
+OBJS += ../src/utils/wpabuf.o
+OBJS += ../src/utils/os_$(CONFIG_OS).o
+OBJS += ../src/utils/ip_addr.o
+
+OBJS += ../src/common/ieee802_11_common.o
+OBJS += ../src/common/wpa_common.o
+
+OBJS += ../src/radius/radius.o
+OBJS += ../src/radius/radius_client.o
+
+OBJS += ../src/crypto/md5.o
+OBJS += ../src/crypto/rc4.o
+OBJS += ../src/crypto/md4.o
+OBJS += ../src/crypto/sha1.o
+OBJS += ../src/crypto/des.o
+OBJS += ../src/crypto/aes_wrap.o
+OBJS += ../src/crypto/aes.o
+
+HOBJS=../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/hlr_auc_gw/milenage.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+
+CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
+
+ifdef CONFIG_IAPP
+CFLAGS += -DCONFIG_IAPP
+OBJS += iapp.o
+endif
+
+ifdef CONFIG_RSN_PREAUTH
+CFLAGS += -DCONFIG_RSN_PREAUTH
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_PEERKEY
+CFLAGS += -DCONFIG_PEERKEY
+OBJS += peerkey.o
+endif
+
+ifdef CONFIG_IEEE80211W
+CFLAGS += -DCONFIG_IEEE80211W
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_IEEE80211R
+CFLAGS += -DCONFIG_IEEE80211R
+OBJS += wpa_ft.o
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_IEEE80211N
+CFLAGS += -DCONFIG_IEEE80211N
+endif
+
+ifdef CONFIG_DRIVER_HOSTAP
+CFLAGS += -DCONFIG_DRIVER_HOSTAP
+OBJS += driver_hostap.o
+endif
+
+ifdef CONFIG_DRIVER_WIRED
+CFLAGS += -DCONFIG_DRIVER_WIRED
+OBJS += driver_wired.o
+endif
+
+ifdef CONFIG_DRIVER_MADWIFI
+CFLAGS += -DCONFIG_DRIVER_MADWIFI
+OBJS += driver_madwifi.o
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_DRIVER_ATHEROS
+CFLAGS += -DCONFIG_DRIVER_ATHEROS
+OBJS += driver_atheros.o
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_DRIVER_PRISM54
+CFLAGS += -DCONFIG_DRIVER_PRISM54
+OBJS += driver_prism54.o
+endif
+
+ifdef CONFIG_DRIVER_NL80211
+CFLAGS += -DCONFIG_DRIVER_NL80211
+OBJS += driver_nl80211.o radiotap.o
+LIBS += -lnl
+ifdef CONFIG_LIBNL20
+LIBS += -lnl-genl
+CFLAGS += -DCONFIG_LIBNL20
+endif
+endif
+
+ifdef CONFIG_DRIVER_BSD
+CFLAGS += -DCONFIG_DRIVER_BSD
+OBJS += driver_bsd.o
+CONFIG_L2_PACKET=y
+CONFIG_DNET_PCAP=y
+CONFIG_L2_FREEBSD=y
+endif
+
+ifdef CONFIG_DRIVER_TEST
+CFLAGS += -DCONFIG_DRIVER_TEST
+OBJS += driver_test.o
+endif
+
+ifdef CONFIG_DRIVER_NONE
+CFLAGS += -DCONFIG_DRIVER_NONE
+OBJS += driver_none.o
+endif
+
+ifdef CONFIG_L2_PACKET
+ifdef CONFIG_DNET_PCAP
+ifdef CONFIG_L2_FREEBSD
+LIBS += -lpcap
+OBJS += ../src/l2_packet/l2_packet_freebsd.o
+else
+LIBS += -ldnet -lpcap
+OBJS += ../src/l2_packet/l2_packet_pcap.o
+endif
+else
+OBJS += ../src/l2_packet/l2_packet_linux.o
+endif
+else
+OBJS += ../src/l2_packet/l2_packet_none.o
+endif
+
+
+ifdef CONFIG_EAP_MD5
+CFLAGS += -DEAP_MD5
+OBJS += ../src/eap_server/eap_md5.o
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_TLS
+CFLAGS += -DEAP_TLS
+OBJS += ../src/eap_server/eap_tls.o
+TLS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_PEAP
+CFLAGS += -DEAP_PEAP
+OBJS += ../src/eap_server/eap_peap.o
+OBJS += ../src/eap_common/eap_peap_common.o
+TLS_FUNCS=y
+CONFIG_EAP_MSCHAPV2=y
+endif
+
+ifdef CONFIG_EAP_TTLS
+CFLAGS += -DEAP_TTLS
+OBJS += ../src/eap_server/eap_ttls.o
+TLS_FUNCS=y
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_MSCHAPV2
+CFLAGS += -DEAP_MSCHAPv2
+OBJS += ../src/eap_server/eap_mschapv2.o
+MS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_GTC
+CFLAGS += -DEAP_GTC
+OBJS += ../src/eap_server/eap_gtc.o
+endif
+
+ifdef CONFIG_EAP_SIM
+CFLAGS += -DEAP_SIM
+OBJS += ../src/eap_server/eap_sim.o
+CONFIG_EAP_SIM_COMMON=y
+endif
+
+ifdef CONFIG_EAP_AKA
+CFLAGS += -DEAP_AKA
+OBJS += ../src/eap_server/eap_aka.o
+CONFIG_EAP_SIM_COMMON=y
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_EAP_AKA_PRIME
+CFLAGS += -DEAP_AKA_PRIME
+endif
+
+ifdef CONFIG_EAP_SIM_COMMON
+OBJS += ../src/eap_common/eap_sim_common.o
+# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be
+# replaced with another file implementating the interface specified in
+# eap_sim_db.h.
+OBJS += ../src/eap_server/eap_sim_db.o
+NEED_FIPS186_2_PRF=y
+endif
+
+ifdef CONFIG_EAP_PAX
+CFLAGS += -DEAP_PAX
+OBJS += ../src/eap_server/eap_pax.o ../src/eap_common/eap_pax_common.o
+endif
+
+ifdef CONFIG_EAP_PSK
+CFLAGS += -DEAP_PSK
+OBJS += ../src/eap_server/eap_psk.o ../src/eap_common/eap_psk_common.o
+endif
+
+ifdef CONFIG_EAP_SAKE
+CFLAGS += -DEAP_SAKE
+OBJS += ../src/eap_server/eap_sake.o ../src/eap_common/eap_sake_common.o
+endif
+
+ifdef CONFIG_EAP_GPSK
+CFLAGS += -DEAP_GPSK
+OBJS += ../src/eap_server/eap_gpsk.o ../src/eap_common/eap_gpsk_common.o
+ifdef CONFIG_EAP_GPSK_SHA256
+CFLAGS += -DEAP_GPSK_SHA256
+endif
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_EAP_VENDOR_TEST
+CFLAGS += -DEAP_VENDOR_TEST
+OBJS += ../src/eap_server/eap_vendor_test.o
+endif
+
+ifdef CONFIG_EAP_FAST
+CFLAGS += -DEAP_FAST
+OBJS += ../src/eap_server/eap_fast.o
+OBJS += ../src/eap_common/eap_fast_common.o
+TLS_FUNCS=y
+NEED_T_PRF=y
+endif
+
+ifdef CONFIG_WPS
+CFLAGS += -DCONFIG_WPS -DEAP_WSC
+OBJS += ../src/utils/uuid.o
+OBJS += wps_hostapd.o
+OBJS += ../src/eap_server/eap_wsc.o ../src/eap_common/eap_wsc_common.o
+OBJS += ../src/wps/wps.o
+OBJS += ../src/wps/wps_common.o
+OBJS += ../src/wps/wps_attr_parse.o
+OBJS += ../src/wps/wps_attr_build.o
+OBJS += ../src/wps/wps_attr_process.o
+OBJS += ../src/wps/wps_dev_attr.o
+OBJS += ../src/wps/wps_enrollee.o
+OBJS += ../src/wps/wps_registrar.o
+NEED_DH_GROUPS=y
+NEED_SHA256=y
+NEED_CRYPTO=y
+NEED_BASE64=y
+
+ifdef CONFIG_WPS_UPNP
+CFLAGS += -DCONFIG_WPS_UPNP
+OBJS += ../src/wps/wps_upnp.o
+OBJS += ../src/wps/wps_upnp_ssdp.o
+OBJS += ../src/wps/wps_upnp_web.o
+OBJS += ../src/wps/wps_upnp_event.o
+OBJS += ../src/wps/httpread.o
+endif
+
+endif
+
+ifdef CONFIG_EAP_IKEV2
+CFLAGS += -DEAP_IKEV2
+OBJS += ../src/eap_server/eap_ikev2.o ../src/eap_server/ikev2.o
+OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
+NEED_DH_GROUPS=y
+NEED_DH_GROUPS_ALL=y
+endif
+
+ifdef CONFIG_EAP_TNC
+CFLAGS += -DEAP_TNC
+OBJS += ../src/eap_server/eap_tnc.o
+OBJS += ../src/eap_server/tncs.o
+NEED_BASE64=y
+ifndef CONFIG_DRIVER_BSD
+LIBS += -ldl
+endif
+endif
+
+# Basic EAP functionality is needed for EAPOL
+OBJS += ../src/eap_server/eap.o
+OBJS += ../src/eap_common/eap_common.o
+OBJS += ../src/eap_server/eap_methods.o
+OBJS += ../src/eap_server/eap_identity.o
+
+ifdef CONFIG_EAP
+CFLAGS += -DEAP_SERVER
+endif
+
+ifndef CONFIG_TLS
+CONFIG_TLS=openssl
+endif
+
+ifeq ($(CONFIG_TLS), internal)
+ifndef CONFIG_CRYPTO
+CONFIG_CRYPTO=internal
+endif
+endif
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+CFLAGS += -DCONFIG_INTERNAL_X509
+endif
+ifeq ($(CONFIG_CRYPTO), internal)
+CFLAGS += -DCONFIG_INTERNAL_X509
+endif
+
+
+ifdef TLS_FUNCS
+# Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS)
+CFLAGS += -DEAP_TLS_FUNCS
+OBJS += ../src/eap_server/eap_tls_common.o
+NEED_TLS_PRF=y
+ifeq ($(CONFIG_TLS), openssl)
+OBJS += ../src/crypto/tls_openssl.o
+LIBS += -lssl -lcrypto
+LIBS_p += -lcrypto
+LIBS_h += -lcrypto
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS += ../src/crypto/tls_gnutls.o
+LIBS += -lgnutls -lgcrypt -lgpg-error
+LIBS_p += -lgcrypt
+LIBS_h += -lgcrypt
+endif
+ifdef CONFIG_GNUTLS_EXTRA
+CFLAGS += -DCONFIG_GNUTLS_EXTRA
+LIBS += -lgnutls-extra
+endif
+ifeq ($(CONFIG_TLS), internal)
+OBJS += ../src/crypto/tls_internal.o
+OBJS += ../src/tls/tlsv1_common.o ../src/tls/tlsv1_record.o
+OBJS += ../src/tls/tlsv1_cred.o ../src/tls/tlsv1_server.o
+OBJS += ../src/tls/tlsv1_server_write.o ../src/tls/tlsv1_server_read.o
+OBJS += ../src/tls/asn1.o ../src/tls/x509v3.o
+OBJS_p += ../src/tls/asn1.o
+OBJS_p += ../src/crypto/rc4.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+NEED_BASE64=y
+CFLAGS += -DCONFIG_TLS_INTERNAL
+CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
+ifeq ($(CONFIG_CRYPTO), internal)
+ifdef CONFIG_INTERNAL_LIBTOMMATH
+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+else
+LIBS += -ltommath
+LIBS_p += -ltommath
+endif
+endif
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+LIBS += -ltomcrypt -ltfm
+LIBS_p += -ltomcrypt -ltfm
+endif
+endif
+NEED_CRYPTO=y
+else
+OBJS += ../src/crypto/tls_none.o
+endif
+
+ifdef CONFIG_PKCS12
+CFLAGS += -DPKCS12_FUNCS
+endif
+
+ifdef MS_FUNCS
+OBJS += ../src/crypto/ms_funcs.o
+NEED_CRYPTO=y
+endif
+
+ifdef CHAP
+OBJS += ../src/eap_common/chap.o
+endif
+
+ifdef NEED_CRYPTO
+ifndef TLS_FUNCS
+ifeq ($(CONFIG_TLS), openssl)
+LIBS += -lcrypto
+LIBS_p += -lcrypto
+LIBS_h += -lcrypto
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+LIBS += -lgcrypt
+LIBS_p += -lgcrypt
+LIBS_h += -lgcrypt
+endif
+ifeq ($(CONFIG_TLS), internal)
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+LIBS += -ltomcrypt -ltfm
+LIBS_p += -ltomcrypt -ltfm
+endif
+endif
+endif
+ifeq ($(CONFIG_TLS), openssl)
+OBJS += ../src/crypto/crypto_openssl.o
+OBJS_p += ../src/crypto/crypto_openssl.o
+HOBJS += ../src/crypto/crypto_openssl.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS += ../src/crypto/crypto_gnutls.o
+OBJS_p += ../src/crypto/crypto_gnutls.o
+HOBJS += ../src/crypto/crypto_gnutls.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_TLS), internal)
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+OBJS += ../src/crypto/crypto_libtomcrypt.o
+OBJS_p += ../src/crypto/crypto_libtomcrypt.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_CRYPTO), internal)
+OBJS += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+OBJS_p += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+CFLAGS += -DCONFIG_CRYPTO_INTERNAL
+ifdef CONFIG_INTERNAL_LIBTOMMATH
+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
+CFLAGS += -DLTM_FAST
+endif
+else
+LIBS += -ltommath
+LIBS_p += -ltommath
+endif
+CONFIG_INTERNAL_AES=y
+CONFIG_INTERNAL_DES=y
+CONFIG_INTERNAL_SHA1=y
+CONFIG_INTERNAL_MD4=y
+CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_SHA256=y
+endif
+endif
+else
+CONFIG_INTERNAL_AES=y
+CONFIG_INTERNAL_SHA1=y
+CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_SHA256=y
+endif
+
+ifdef CONFIG_INTERNAL_AES
+CFLAGS += -DINTERNAL_AES
+endif
+ifdef CONFIG_INTERNAL_SHA1
+CFLAGS += -DINTERNAL_SHA1
+endif
+ifdef CONFIG_INTERNAL_SHA256
+CFLAGS += -DINTERNAL_SHA256
+endif
+ifdef CONFIG_INTERNAL_MD5
+CFLAGS += -DINTERNAL_MD5
+endif
+ifdef CONFIG_INTERNAL_MD4
+CFLAGS += -DINTERNAL_MD4
+endif
+ifdef CONFIG_INTERNAL_DES
+CFLAGS += -DINTERNAL_DES
+endif
+
+ifdef NEED_SHA256
+OBJS += ../src/crypto/sha256.o
+endif
+
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_groups.o
+ifdef NEED_DH_GROUPS_ALL
+CFLAGS += -DALL_DH_GROUPS
+endif
+endif
+
+ifndef NEED_FIPS186_2_PRF
+CFLAGS += -DCONFIG_NO_FIPS186_2_PRF
+endif
+
+ifndef NEED_T_PRF
+CFLAGS += -DCONFIG_NO_T_PRF
+endif
+
+ifndef NEED_TLS_PRF
+CFLAGS += -DCONFIG_NO_TLS_PRF
+endif
+
+ifdef CONFIG_RADIUS_SERVER
+CFLAGS += -DRADIUS_SERVER
+OBJS += ../src/radius/radius_server.o
+endif
+
+ifdef CONFIG_IPV6
+CFLAGS += -DCONFIG_IPV6
+endif
+
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
+ifdef CONFIG_FULL_DYNAMIC_VLAN
+# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
+# and vlan interfaces for the vlan feature.
+CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN
+endif
+
+ifdef NEED_BASE64
+OBJS += ../src/utils/base64.o
+endif
+
+ifdef CONFIG_NO_STDOUT_DEBUG
+CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
+endif
+
+ifdef CONFIG_NO_AES_EXTRAS
+CFLAGS += -DCONFIG_NO_AES_UNWRAP
+CFLAGS += -DCONFIG_NO_AES_CTR -DCONFIG_NO_AES_OMAC1
+CFLAGS += -DCONFIG_NO_AES_EAX -DCONFIG_NO_AES_CBC
+CFLAGS += -DCONFIG_NO_AES_DECRYPT
+CFLAGS += -DCONFIG_NO_AES_ENCRYPT_BLOCK
+endif
+
+ALL=hostapd hostapd_cli
+
+all: verify_config $(ALL)
+
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+
+%.o: %.c
+	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
+	@$(E) "  CC " $<
+
+verify_config:
+	@if [ ! -r .config ]; then \
+		echo 'Building hostapd requires a configuration file'; \
+		echo '(.config). See README for more instructions. You can'; \
+		echo 'run "cp defconfig .config" to create an example'; \
+		echo 'configuration.'; \
+		exit 1; \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
