Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Nov 2010 18:24:05 +0000 (UTC)
From:      Ed Schouten <ed@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r214796 - in user/ed/compiler-rt: . bin/rm bin/sh bin/stty cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzpool/common contrib/bind9 contrib/bind9/bin/dnssec contrib...
Message-ID:  <201011041824.oA4IO5DF068682@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ed
Date: Thu Nov  4 18:24:05 2010
New Revision: 214796
URL: http://svn.freebsd.org/changeset/base/214796

Log:
  Merge from HEAD, so I can make universe, create diffs, etc.

Added:
  user/ed/compiler-rt/contrib/wpa/patches/
     - copied from r214794, head/contrib/wpa/patches/
  user/ed/compiler-rt/contrib/wpa/src/ap/
     - copied from r214794, head/contrib/wpa/src/ap/
  user/ed/compiler-rt/contrib/wpa/src/crypto/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/.gitignore
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-cbc.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-cbc.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-ctr.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-ctr.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-eax.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-eax.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-encblock.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-encblock.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-internal-dec.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-internal-dec.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-internal-enc.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-internal-enc.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-omac1.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-omac1.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-unwrap.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-unwrap.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes-wrap.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes-wrap.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes_i.h
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/aes_i.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_internal-cipher.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/crypto_internal-cipher.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_internal-modexp.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/crypto_internal-modexp.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_internal-rsa.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/crypto_internal-rsa.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_nss.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/crypto_nss.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/des-internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/des-internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/des_i.h
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/des_i.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/dh_group5.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/dh_group5.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/dh_group5.h
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/dh_group5.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/fips_prf_cryptoapi.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/fips_prf_cryptoapi.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/fips_prf_gnutls.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/fips_prf_gnutls.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/fips_prf_internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/fips_prf_internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/fips_prf_nss.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/fips_prf_nss.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/fips_prf_openssl.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/fips_prf_openssl.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md4-internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/md4-internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md5-internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/md5-internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md5-non-fips.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/md5-non-fips.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md5_i.h
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/md5_i.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/milenage.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/milenage.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/milenage.h
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/milenage.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1-internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/sha1-internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1-pbkdf2.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/sha1-pbkdf2.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1-tlsprf.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/sha1-tlsprf.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1-tprf.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/sha1-tprf.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1_i.h
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/sha1_i.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha256-internal.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/sha256-internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls_nss.c
     - copied unchanged from r214794, head/contrib/wpa/src/crypto/tls_nss.c
  user/ed/compiler-rt/contrib/wpa/src/drivers/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/src/drivers/.gitignore
  user/ed/compiler-rt/contrib/wpa/src/drivers/drivers.mak
     - copied unchanged from r214794, head/contrib/wpa/src/drivers/drivers.mak
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_aka.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_aka.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_fast.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_fast.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_gpsk.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_gpsk.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_gtc.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_gtc.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_identity.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_identity.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_ikev2.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_ikev2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_md5.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_md5.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_methods.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_methods.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_mschapv2.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_mschapv2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_pax.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_pax.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_peap.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_peap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_psk.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_psk.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_sake.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_sake.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_sim.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_sim.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_tls.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_tls.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_tls_common.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_tls_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_tnc.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_tnc.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_ttls.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_ttls.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_vendor_test.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_vendor_test.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_server_wsc.c
     - copied unchanged from r214794, head/contrib/wpa/src/eap_server/eap_server_wsc.c
  user/ed/compiler-rt/contrib/wpa/src/eapol_auth/
     - copied from r214794, head/contrib/wpa/src/eapol_auth/
  user/ed/compiler-rt/contrib/wpa/src/lib.rules
     - copied unchanged from r214794, head/contrib/wpa/src/lib.rules
  user/ed/compiler-rt/contrib/wpa/src/radius/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/src/radius/.gitignore
  user/ed/compiler-rt/contrib/wpa/src/tls/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/src/tls/.gitignore
  user/ed/compiler-rt/contrib/wpa/src/tls/pkcs1.c
     - copied unchanged from r214794, head/contrib/wpa/src/tls/pkcs1.c
  user/ed/compiler-rt/contrib/wpa/src/tls/pkcs1.h
     - copied unchanged from r214794, head/contrib/wpa/src/tls/pkcs1.h
  user/ed/compiler-rt/contrib/wpa/src/tls/pkcs5.c
     - copied unchanged from r214794, head/contrib/wpa/src/tls/pkcs5.c
  user/ed/compiler-rt/contrib/wpa/src/tls/pkcs5.h
     - copied unchanged from r214794, head/contrib/wpa/src/tls/pkcs5.h
  user/ed/compiler-rt/contrib/wpa/src/tls/pkcs8.c
     - copied unchanged from r214794, head/contrib/wpa/src/tls/pkcs8.c
  user/ed/compiler-rt/contrib/wpa/src/tls/pkcs8.h
     - copied unchanged from r214794, head/contrib/wpa/src/tls/pkcs8.h
  user/ed/compiler-rt/contrib/wpa/src/utils/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/src/utils/.gitignore
  user/ed/compiler-rt/contrib/wpa/src/utils/list.h
     - copied unchanged from r214794, head/contrib/wpa/src/utils/list.h
  user/ed/compiler-rt/contrib/wpa/src/utils/radiotap.c
     - copied unchanged from r214794, head/contrib/wpa/src/utils/radiotap.c
  user/ed/compiler-rt/contrib/wpa/src/utils/radiotap.h
     - copied unchanged from r214794, head/contrib/wpa/src/utils/radiotap.h
  user/ed/compiler-rt/contrib/wpa/src/utils/radiotap_iter.h
     - copied unchanged from r214794, head/contrib/wpa/src/utils/radiotap_iter.h
  user/ed/compiler-rt/contrib/wpa/src/utils/trace.c
     - copied unchanged from r214794, head/contrib/wpa/src/utils/trace.c
  user/ed/compiler-rt/contrib/wpa/src/utils/trace.h
     - copied unchanged from r214794, head/contrib/wpa/src/utils/trace.h
  user/ed/compiler-rt/contrib/wpa/src/wps/http.h
     - copied unchanged from r214794, head/contrib/wpa/src/wps/http.h
  user/ed/compiler-rt/contrib/wpa/src/wps/http_client.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/http_client.c
  user/ed/compiler-rt/contrib/wpa/src/wps/http_client.h
     - copied unchanged from r214794, head/contrib/wpa/src/wps/http_client.h
  user/ed/compiler-rt/contrib/wpa/src/wps/http_server.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/http_server.c
  user/ed/compiler-rt/contrib/wpa/src/wps/http_server.h
     - copied unchanged from r214794, head/contrib/wpa/src/wps/http_server.h
  user/ed/compiler-rt/contrib/wpa/src/wps/ndef.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/ndef.c
  user/ed/compiler-rt/contrib/wpa/src/wps/upnp_xml.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/upnp_xml.c
  user/ed/compiler-rt/contrib/wpa/src/wps/upnp_xml.h
     - copied unchanged from r214794, head/contrib/wpa/src/wps/upnp_xml.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_er.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_er.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_er.h
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_er.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_er_ssdp.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_er_ssdp.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_nfc.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_nfc.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_nfc_pn531.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_nfc_pn531.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_ufd.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_ufd.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp_ap.c
     - copied unchanged from r214794, head/contrib/wpa/src/wps/wps_upnp_ap.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/.gitignore
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ap.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/ap.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ap.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/ap.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/bgscan.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/bgscan.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/bgscan.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/bgscan.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/bgscan_simple.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/bgscan_simple.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/bss.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/bss.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/bss.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/bss.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/dbus/
     - copied from r214794, head/contrib/wpa/wpa_supplicant/dbus/
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/driver_i.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/driver_i.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/eap_register.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/eap_register.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/examples/60_wpa_supplicant
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/examples/60_wpa_supplicant
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ibss_rsn.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/ibss_rsn.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ibss_rsn.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/ibss_rsn.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/notify.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/notify.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/notify.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/notify.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/scan.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/scan.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/sme.c
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/sme.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/sme.h
     - copied unchanged from r214794, head/contrib/wpa/wpa_supplicant/sme.h
  user/ed/compiler-rt/sys/dev/agp/agp_apple.c
     - copied unchanged from r214794, head/sys/dev/agp/agp_apple.c
  user/ed/compiler-rt/sys/x86/include/
     - copied from r214794, head/sys/x86/include/
  user/ed/compiler-rt/tools/regression/bin/sh/parser/alias3.0
     - copied unchanged from r214794, head/tools/regression/bin/sh/parser/alias3.0
Replaced:
  user/ed/compiler-rt/contrib/wpa/hostapd/
     - copied from r214794, head/contrib/wpa/hostapd/
  user/ed/compiler-rt/contrib/wpa/hostapd/ChangeLog
     - copied unchanged from r214794, head/contrib/wpa/hostapd/ChangeLog
  user/ed/compiler-rt/contrib/wpa/hostapd/Makefile
     - copied unchanged from r214794, head/contrib/wpa/hostapd/Makefile
  user/ed/compiler-rt/contrib/wpa/hostapd/README
     - copied unchanged from r214794, head/contrib/wpa/hostapd/README
  user/ed/compiler-rt/contrib/wpa/hostapd/README-WPS
     - copied unchanged from r214794, head/contrib/wpa/hostapd/README-WPS
  user/ed/compiler-rt/contrib/wpa/hostapd/ctrl_iface.c
     - copied unchanged from r214794, head/contrib/wpa/hostapd/ctrl_iface.c
  user/ed/compiler-rt/contrib/wpa/hostapd/ctrl_iface.h
     - copied unchanged from r214794, head/contrib/wpa/hostapd/ctrl_iface.h
  user/ed/compiler-rt/contrib/wpa/hostapd/defconfig
     - copied unchanged from r214794, head/contrib/wpa/hostapd/defconfig
  user/ed/compiler-rt/contrib/wpa/hostapd/eap_testing.txt
     - copied unchanged from r214794, head/contrib/wpa/hostapd/eap_testing.txt
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.8
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.8
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.accept
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.accept
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.conf
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.conf
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.deny
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.deny
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.eap_user
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.eap_user
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.radius_clients
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.radius_clients
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.sim_db
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.sim_db
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.vlan
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.vlan
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd.wpa_psk
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd.wpa_psk
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd_cli.1
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd_cli.1
  user/ed/compiler-rt/contrib/wpa/hostapd/hostapd_cli.c
     - copied unchanged from r214794, head/contrib/wpa/hostapd/hostapd_cli.c
  user/ed/compiler-rt/contrib/wpa/hostapd/logwatch/
     - copied from r214794, head/contrib/wpa/hostapd/logwatch/
  user/ed/compiler-rt/contrib/wpa/hostapd/logwatch/README
     - copied unchanged from r214794, head/contrib/wpa/hostapd/logwatch/README
  user/ed/compiler-rt/contrib/wpa/hostapd/logwatch/hostapd
     - copied unchanged from r214794, head/contrib/wpa/hostapd/logwatch/hostapd
  user/ed/compiler-rt/contrib/wpa/hostapd/logwatch/hostapd.conf
     - copied unchanged from r214794, head/contrib/wpa/hostapd/logwatch/hostapd.conf
  user/ed/compiler-rt/contrib/wpa/hostapd/nt_password_hash.c
     - copied unchanged from r214794, head/contrib/wpa/hostapd/nt_password_hash.c
  user/ed/compiler-rt/contrib/wpa/hostapd/wired.conf
     - copied unchanged from r214794, head/contrib/wpa/hostapd/wired.conf
Deleted:
  user/ed/compiler-rt/contrib/wpa/src/common/nl80211_copy.h
  user/ed/compiler-rt/contrib/wpa/src/common/wireless_copy.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes_wrap.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/des.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md4.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/rc4.h
  user/ed/compiler-rt/contrib/wpa/src/drivers/radiotap.c
  user/ed/compiler-rt/contrib/wpa/src/drivers/radiotap.h
  user/ed/compiler-rt/contrib/wpa/src/drivers/radiotap_iter.h
  user/ed/compiler-rt/contrib/wpa/src/drivers/scan_helpers.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_aka.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_fast.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_gpsk.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_gtc.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_identity.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_ikev2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_md5.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_methods.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_mschapv2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_pax.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_peap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_psk.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_sake.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_sim.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_tls.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_tls_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_tnc.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_ttls.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_vendor_test.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_wsc.c
  user/ed/compiler-rt/contrib/wpa/src/hlr_auc_gw/Makefile
  user/ed/compiler-rt/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c
  user/ed/compiler-rt/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db
  user/ed/compiler-rt/contrib/wpa/src/hlr_auc_gw/milenage.c
  user/ed/compiler-rt/contrib/wpa/src/hlr_auc_gw/milenage.h
  user/ed/compiler-rt/contrib/wpa/src/tls/asn1_test.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/doxygen.fast
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/doxygen.full
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/eap.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/porting.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_aes.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_md4.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_md5.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_sha1.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_sha256.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_x509v3.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh
  user/ed/compiler-rt/sys/amd64/include/apicreg.h
  user/ed/compiler-rt/sys/amd64/include/mca.h
  user/ed/compiler-rt/sys/i386/include/apicreg.h
  user/ed/compiler-rt/sys/i386/include/mca.h
  user/ed/compiler-rt/sys/pc98/include/apicreg.h
  user/ed/compiler-rt/sys/pc98/include/mca.h
Modified:
  user/ed/compiler-rt/ObsoleteFiles.inc
  user/ed/compiler-rt/bin/rm/rm.1
  user/ed/compiler-rt/bin/sh/eval.c
  user/ed/compiler-rt/bin/sh/parser.c
  user/ed/compiler-rt/bin/sh/sh.1
  user/ed/compiler-rt/bin/stty/key.c
  user/ed/compiler-rt/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/ed/compiler-rt/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  user/ed/compiler-rt/contrib/bind9/CHANGES
  user/ed/compiler-rt/contrib/bind9/README
  user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keygen.html
  user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-signzone.html
  user/ed/compiler-rt/contrib/bind9/bin/named/include/named/globals.h
  user/ed/compiler-rt/contrib/bind9/bin/named/main.c
  user/ed/compiler-rt/contrib/bind9/bin/named/query.c
  user/ed/compiler-rt/contrib/bind9/bin/named/server.c
  user/ed/compiler-rt/contrib/bind9/bin/nsupdate/nsupdate.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM-book.xml
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/Bv9ARM.pdf
  user/ed/compiler-rt/contrib/bind9/doc/arm/isc-logo.eps
  user/ed/compiler-rt/contrib/bind9/doc/arm/isc-logo.pdf
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.dig.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.dnssec-keygen.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.dnssec-signzone.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.host.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.named-checkconf.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.named-checkzone.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.named.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.nsupdate.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.rndc-confgen.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.rndc.conf.html
  user/ed/compiler-rt/contrib/bind9/doc/arm/man.rndc.html
  user/ed/compiler-rt/contrib/bind9/lib/dns/adb.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/api
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/diff.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/ncache.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/rdataset.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/resolver.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/result.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/types.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/include/dns/validator.h
  user/ed/compiler-rt/contrib/bind9/lib/dns/ncache.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/rbtdb.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/rdatalist.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/rdataset.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/rdataslab.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/resolver.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/result.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/sdb.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/sdlz.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/validator.c
  user/ed/compiler-rt/contrib/bind9/lib/dns/view.c
  user/ed/compiler-rt/contrib/bind9/lib/isc/api
  user/ed/compiler-rt/contrib/bind9/lib/isc/include/isc/mem.h
  user/ed/compiler-rt/contrib/bind9/lib/isc/mem.c
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_buffer.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_config.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_context.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_gabn.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_gnba.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_noop.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_packet.html
  user/ed/compiler-rt/contrib/bind9/lib/lwres/man/lwres_resutil.html
  user/ed/compiler-rt/contrib/bind9/version
  user/ed/compiler-rt/contrib/gdb/gdb/dwarf2read.c
  user/ed/compiler-rt/contrib/gdb/gdb/mipsfbsd-tdep.c
  user/ed/compiler-rt/contrib/tzdata/australasia
  user/ed/compiler-rt/contrib/wpa/src/Makefile
  user/ed/compiler-rt/contrib/wpa/src/common/Makefile
  user/ed/compiler-rt/contrib/wpa/src/common/defs.h
  user/ed/compiler-rt/contrib/wpa/src/common/ieee802_11_common.c
  user/ed/compiler-rt/contrib/wpa/src/common/ieee802_11_common.h
  user/ed/compiler-rt/contrib/wpa/src/common/ieee802_11_defs.h
  user/ed/compiler-rt/contrib/wpa/src/common/privsep_commands.h
  user/ed/compiler-rt/contrib/wpa/src/common/version.h
  user/ed/compiler-rt/contrib/wpa/src/common/wpa_common.c
  user/ed/compiler-rt/contrib/wpa/src/common/wpa_common.h
  user/ed/compiler-rt/contrib/wpa/src/common/wpa_ctrl.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/Makefile
  user/ed/compiler-rt/contrib/wpa/src/crypto/aes.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_cryptoapi.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_gnutls.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_libtomcrypt.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_none.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/crypto_openssl.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/dh_groups.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md5.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/md5.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/ms_funcs.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/ms_funcs.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/rc4.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha1.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/sha256.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls.h
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls_gnutls.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls_internal.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls_none.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls_openssl.c
  user/ed/compiler-rt/contrib/wpa/src/crypto/tls_schannel.c
  user/ed/compiler-rt/contrib/wpa/src/drivers/Makefile
  user/ed/compiler-rt/contrib/wpa/src/drivers/driver.h
  user/ed/compiler-rt/contrib/wpa/src/drivers/driver_ndis.c
  user/ed/compiler-rt/contrib/wpa/src/drivers/driver_ndis.h
  user/ed/compiler-rt/contrib/wpa/src/drivers/driver_ndiswrapper.c
  user/ed/compiler-rt/contrib/wpa/src/drivers/driver_wired.c
  user/ed/compiler-rt/contrib/wpa/src/drivers/drivers.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/Makefile
  user/ed/compiler-rt/contrib/wpa/src/eap_common/chap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/chap.h
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_fast_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_gpsk_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_pax_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_peap_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_psk_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_sake_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_sim_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_common/eap_sim_common.h
  user/ed/compiler-rt/contrib/wpa/src/eap_common/ikev2_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/Makefile
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap.h
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_aka.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_config.h
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_fast.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_fast_pac.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_leap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_md5.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_methods.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_methods.h
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_mschapv2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_pax.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_peap.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_psk.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_sim.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_tls.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_tls_common.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_tls_common.h
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_tnc.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_ttls.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/eap_wsc.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/ikev2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/mschapv2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_peer/mschapv2.h
  user/ed/compiler-rt/contrib/wpa/src/eap_server/Makefile
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap.h
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_i.h
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_methods.h
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_sim_db.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_sim_db.h
  user/ed/compiler-rt/contrib/wpa/src/eap_server/eap_tls_common.h
  user/ed/compiler-rt/contrib/wpa/src/eap_server/ikev2.c
  user/ed/compiler-rt/contrib/wpa/src/eap_server/tncs.c
  user/ed/compiler-rt/contrib/wpa/src/eapol_supp/Makefile
  user/ed/compiler-rt/contrib/wpa/src/eapol_supp/eapol_supp_sm.c
  user/ed/compiler-rt/contrib/wpa/src/eapol_supp/eapol_supp_sm.h
  user/ed/compiler-rt/contrib/wpa/src/l2_packet/Makefile
  user/ed/compiler-rt/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
  user/ed/compiler-rt/contrib/wpa/src/l2_packet/l2_packet_ndis.c
  user/ed/compiler-rt/contrib/wpa/src/radius/Makefile
  user/ed/compiler-rt/contrib/wpa/src/radius/radius.c
  user/ed/compiler-rt/contrib/wpa/src/radius/radius.h
  user/ed/compiler-rt/contrib/wpa/src/radius/radius_client.c
  user/ed/compiler-rt/contrib/wpa/src/radius/radius_client.h
  user/ed/compiler-rt/contrib/wpa/src/radius/radius_server.c
  user/ed/compiler-rt/contrib/wpa/src/radius/radius_server.h
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/Makefile
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/peerkey.c
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/pmksa_cache.c
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/pmksa_cache.h
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/preauth.c
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/preauth.h
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/wpa.c
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/wpa.h
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/wpa_ft.c
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/wpa_i.h
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/wpa_ie.c
  user/ed/compiler-rt/contrib/wpa/src/rsn_supp/wpa_ie.h
  user/ed/compiler-rt/contrib/wpa/src/tls/Makefile
  user/ed/compiler-rt/contrib/wpa/src/tls/asn1.c
  user/ed/compiler-rt/contrib/wpa/src/tls/asn1.h
  user/ed/compiler-rt/contrib/wpa/src/tls/rsa.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_client.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_client_read.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_client_write.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_common.h
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_cred.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_record.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_record.h
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_server.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_server_read.c
  user/ed/compiler-rt/contrib/wpa/src/tls/tlsv1_server_write.c
  user/ed/compiler-rt/contrib/wpa/src/tls/x509v3.c
  user/ed/compiler-rt/contrib/wpa/src/tls/x509v3.h
  user/ed/compiler-rt/contrib/wpa/src/utils/Makefile
  user/ed/compiler-rt/contrib/wpa/src/utils/base64.c
  user/ed/compiler-rt/contrib/wpa/src/utils/build_config.h
  user/ed/compiler-rt/contrib/wpa/src/utils/common.c
  user/ed/compiler-rt/contrib/wpa/src/utils/common.h
  user/ed/compiler-rt/contrib/wpa/src/utils/eloop.c
  user/ed/compiler-rt/contrib/wpa/src/utils/eloop.h
  user/ed/compiler-rt/contrib/wpa/src/utils/eloop_none.c
  user/ed/compiler-rt/contrib/wpa/src/utils/eloop_win.c
  user/ed/compiler-rt/contrib/wpa/src/utils/ip_addr.h
  user/ed/compiler-rt/contrib/wpa/src/utils/os.h
  user/ed/compiler-rt/contrib/wpa/src/utils/os_internal.c
  user/ed/compiler-rt/contrib/wpa/src/utils/os_unix.c
  user/ed/compiler-rt/contrib/wpa/src/utils/uuid.c
  user/ed/compiler-rt/contrib/wpa/src/utils/uuid.h
  user/ed/compiler-rt/contrib/wpa/src/utils/wpa_debug.c
  user/ed/compiler-rt/contrib/wpa/src/utils/wpa_debug.h
  user/ed/compiler-rt/contrib/wpa/src/utils/wpabuf.c
  user/ed/compiler-rt/contrib/wpa/src/utils/wpabuf.h
  user/ed/compiler-rt/contrib/wpa/src/wps/Makefile
  user/ed/compiler-rt/contrib/wpa/src/wps/httpread.c
  user/ed/compiler-rt/contrib/wpa/src/wps/httpread.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_attr_build.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_attr_parse.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_attr_process.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_common.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_defs.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_dev_attr.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_enrollee.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_i.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_registrar.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp_event.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp_i.h
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp_ssdp.c
  user/ed/compiler-rt/contrib/wpa/src/wps/wps_upnp_web.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ChangeLog
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/Makefile
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/README
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/README-WPS
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/config.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/config.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/config_file.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/config_ssid.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/defconfig
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/eapol_test.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/events.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/main.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/mlme.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/mlme.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/nmake.mak
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/preauth_test.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/scan.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/tests/test_wpa.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/todo.txt
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_cli.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_passphrase.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_priv.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_supplicant.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_supplicant.conf
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wpas_glue.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wps_supplicant.c
  user/ed/compiler-rt/contrib/wpa/wpa_supplicant/wps_supplicant.h
  user/ed/compiler-rt/include/Makefile
  user/ed/compiler-rt/include/termios.h
  user/ed/compiler-rt/lib/bind/config.h
  user/ed/compiler-rt/lib/bind/isc/isc/platform.h
  user/ed/compiler-rt/lib/clang/Makefile
  user/ed/compiler-rt/lib/libc/gen/Makefile.inc
  user/ed/compiler-rt/lib/libc/gen/Symbol.map
  user/ed/compiler-rt/lib/libc/gen/tcsetattr.3
  user/ed/compiler-rt/lib/libc/gen/termios.c
  user/ed/compiler-rt/lib/libthr/thread/thr_attr.c
  user/ed/compiler-rt/libexec/getty/main.c
  user/ed/compiler-rt/libexec/rlogind/rlogind.c
  user/ed/compiler-rt/libexec/rtld-elf/rtld.c
  user/ed/compiler-rt/libexec/rtld-elf/rtld.h
  user/ed/compiler-rt/sbin/camcontrol/camcontrol.c
  user/ed/compiler-rt/sbin/hastd/primary.c
  user/ed/compiler-rt/share/man/man9/BUS_SETUP_INTR.9
  user/ed/compiler-rt/share/man/man9/locking.9
  user/ed/compiler-rt/share/man/man9/sysctl_ctx_init.9
  user/ed/compiler-rt/share/misc/bsd-family-tree
  user/ed/compiler-rt/sys/amd64/acpica/acpi_wakeup.c
  user/ed/compiler-rt/sys/amd64/acpica/madt.c
  user/ed/compiler-rt/sys/amd64/amd64/apic_vector.S
  user/ed/compiler-rt/sys/amd64/amd64/genassym.c
  user/ed/compiler-rt/sys/amd64/amd64/machdep.c
  user/ed/compiler-rt/sys/amd64/amd64/mp_machdep.c
  user/ed/compiler-rt/sys/amd64/amd64/mp_watchdog.c
  user/ed/compiler-rt/sys/amd64/amd64/pmap.c
  user/ed/compiler-rt/sys/amd64/amd64/trap.c
  user/ed/compiler-rt/sys/arm/arm/elf_trampoline.c
  user/ed/compiler-rt/sys/conf/files
  user/ed/compiler-rt/sys/conf/files.powerpc
  user/ed/compiler-rt/sys/conf/kern.post.mk
  user/ed/compiler-rt/sys/conf/kmod.mk
  user/ed/compiler-rt/sys/conf/options.powerpc
  user/ed/compiler-rt/sys/dev/acpica/acpi.c
  user/ed/compiler-rt/sys/dev/agp/agp.c
  user/ed/compiler-rt/sys/dev/ata/chipsets/ata-intel.c
  user/ed/compiler-rt/sys/dev/e1000/e1000_82571.c
  user/ed/compiler-rt/sys/dev/e1000/if_em.c
  user/ed/compiler-rt/sys/dev/e1000/if_lem.c
  user/ed/compiler-rt/sys/dev/e1000/if_lem.h
  user/ed/compiler-rt/sys/dev/mii/e1000phy.c
  user/ed/compiler-rt/sys/dev/mii/mii_physubr.c
  user/ed/compiler-rt/sys/dev/mii/miivar.h
  user/ed/compiler-rt/sys/dev/usb/net/uhso.c
  user/ed/compiler-rt/sys/dev/usb/serial/u3g.c
  user/ed/compiler-rt/sys/dev/usb/serial/uark.c
  user/ed/compiler-rt/sys/dev/usb/serial/ubsa.c
  user/ed/compiler-rt/sys/dev/usb/serial/ubser.c
  user/ed/compiler-rt/sys/dev/usb/serial/uchcom.c
  user/ed/compiler-rt/sys/dev/usb/serial/ucycom.c
  user/ed/compiler-rt/sys/dev/usb/serial/ufoma.c
  user/ed/compiler-rt/sys/dev/usb/serial/uftdi.c
  user/ed/compiler-rt/sys/dev/usb/serial/ugensa.c
  user/ed/compiler-rt/sys/dev/usb/serial/uipaq.c
  user/ed/compiler-rt/sys/dev/usb/serial/umct.c
  user/ed/compiler-rt/sys/dev/usb/serial/umodem.c
  user/ed/compiler-rt/sys/dev/usb/serial/umoscom.c
  user/ed/compiler-rt/sys/dev/usb/serial/uplcom.c
  user/ed/compiler-rt/sys/dev/usb/serial/usb_serial.c
  user/ed/compiler-rt/sys/dev/usb/serial/usb_serial.h
  user/ed/compiler-rt/sys/dev/usb/serial/uslcom.c
  user/ed/compiler-rt/sys/dev/usb/serial/uvisor.c
  user/ed/compiler-rt/sys/dev/usb/serial/uvscom.c
  user/ed/compiler-rt/sys/dev/usb/usbdevs
  user/ed/compiler-rt/sys/geom/geom_event.c
  user/ed/compiler-rt/sys/i386/acpica/acpi_wakeup.c
  user/ed/compiler-rt/sys/i386/acpica/madt.c
  user/ed/compiler-rt/sys/i386/i386/apic_vector.s
  user/ed/compiler-rt/sys/i386/i386/genassym.c
  user/ed/compiler-rt/sys/i386/i386/machdep.c
  user/ed/compiler-rt/sys/i386/i386/mp_machdep.c
  user/ed/compiler-rt/sys/i386/i386/mp_watchdog.c
  user/ed/compiler-rt/sys/i386/i386/mpboot.s
  user/ed/compiler-rt/sys/i386/i386/trap.c
  user/ed/compiler-rt/sys/i386/xen/mp_machdep.c
  user/ed/compiler-rt/sys/i386/xen/mptable.c
  user/ed/compiler-rt/sys/kern/kern_clock.c
  user/ed/compiler-rt/sys/kern/kern_cpuset.c
  user/ed/compiler-rt/sys/kern/kern_timeout.c
  user/ed/compiler-rt/sys/kern/sched_ule.c
  user/ed/compiler-rt/sys/kern/vfs_cache.c
  user/ed/compiler-rt/sys/mips/cavium/octeon_ebt3000_cf.c
  user/ed/compiler-rt/sys/mips/cavium/octopci.c
  user/ed/compiler-rt/sys/modules/Makefile
  user/ed/compiler-rt/sys/modules/agp/Makefile
  user/ed/compiler-rt/sys/netinet/if_ether.c
  user/ed/compiler-rt/sys/netinet/libalias/alias.c
  user/ed/compiler-rt/sys/netipsec/ipsec.c
  user/ed/compiler-rt/sys/pc98/include/bus.h
  user/ed/compiler-rt/sys/pc98/pc98/busiosubr.c
  user/ed/compiler-rt/sys/pc98/pc98/machdep.c
  user/ed/compiler-rt/sys/powerpc/aim/copyinout.c
  user/ed/compiler-rt/sys/powerpc/aim/mmu_oea.c
  user/ed/compiler-rt/sys/powerpc/aim/mmu_oea64.c
  user/ed/compiler-rt/sys/powerpc/aim/slb.c
  user/ed/compiler-rt/sys/powerpc/aim/swtch32.S
  user/ed/compiler-rt/sys/powerpc/aim/swtch64.S
  user/ed/compiler-rt/sys/powerpc/aim/trap.c
  user/ed/compiler-rt/sys/powerpc/aim/trap_subr32.S
  user/ed/compiler-rt/sys/powerpc/aim/trap_subr64.S
  user/ed/compiler-rt/sys/powerpc/aim/vm_machdep.c
  user/ed/compiler-rt/sys/powerpc/conf/GENERIC
  user/ed/compiler-rt/sys/powerpc/conf/GENERIC64
  user/ed/compiler-rt/sys/powerpc/conf/NOTES
  user/ed/compiler-rt/sys/powerpc/include/pcb.h
  user/ed/compiler-rt/sys/powerpc/include/slb.h
  user/ed/compiler-rt/sys/powerpc/include/sr.h
  user/ed/compiler-rt/sys/powerpc/powermac/cpcht.c
  user/ed/compiler-rt/sys/powerpc/powerpc/exec_machdep.c
  user/ed/compiler-rt/sys/powerpc/powerpc/genassym.c
  user/ed/compiler-rt/sys/sys/interrupt.h
  user/ed/compiler-rt/sys/vm/uma_core.c
  user/ed/compiler-rt/sys/vm/vm_phys.c
  user/ed/compiler-rt/sys/vm/vm_reserv.c
  user/ed/compiler-rt/sys/x86/x86/io_apic.c
  user/ed/compiler-rt/sys/x86/x86/local_apic.c
  user/ed/compiler-rt/sys/x86/x86/mca.c
  user/ed/compiler-rt/sys/x86/x86/mptable.c
  user/ed/compiler-rt/sys/x86/x86/msi.c
  user/ed/compiler-rt/sys/x86/x86/nexus.c
  user/ed/compiler-rt/usr.bin/kdump/kdump.1
  user/ed/compiler-rt/usr.bin/locate/locate/locate.rc
  user/ed/compiler-rt/usr.bin/locate/locate/updatedb.sh
  user/ed/compiler-rt/usr.sbin/config/mkmakefile.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_cmd.c
  user/ed/compiler-rt/usr.sbin/tcpdump/tcpdump/Makefile
  user/ed/compiler-rt/usr.sbin/tcpdump/tcpdump/config.h
  user/ed/compiler-rt/usr.sbin/wpa/hostapd/Makefile
  user/ed/compiler-rt/usr.sbin/wpa/hostapd/driver_freebsd.c
  user/ed/compiler-rt/usr.sbin/wpa/wpa_passphrase/Makefile
  user/ed/compiler-rt/usr.sbin/wpa/wpa_supplicant/Makefile
  user/ed/compiler-rt/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
Directory Properties:
  user/ed/compiler-rt/   (props changed)
  user/ed/compiler-rt/cddl/contrib/opensolaris/   (props changed)
  user/ed/compiler-rt/contrib/bind9/   (props changed)
  user/ed/compiler-rt/contrib/binutils/   (props changed)
  user/ed/compiler-rt/contrib/bzip2/   (props changed)
  user/ed/compiler-rt/contrib/ee/   (props changed)
  user/ed/compiler-rt/contrib/expat/   (props changed)
  user/ed/compiler-rt/contrib/file/   (props changed)
  user/ed/compiler-rt/contrib/gdb/   (props changed)
  user/ed/compiler-rt/contrib/gdtoa/   (props changed)
  user/ed/compiler-rt/contrib/gnu-sort/   (props changed)
  user/ed/compiler-rt/contrib/groff/   (props changed)
  user/ed/compiler-rt/contrib/less/   (props changed)
  user/ed/compiler-rt/contrib/libpcap/   (props changed)
  user/ed/compiler-rt/contrib/llvm/   (props changed)
  user/ed/compiler-rt/contrib/llvm/tools/clang/   (props changed)
  user/ed/compiler-rt/contrib/ncurses/   (props changed)
  user/ed/compiler-rt/contrib/netcat/   (props changed)
  user/ed/compiler-rt/contrib/ntp/   (props changed)
  user/ed/compiler-rt/contrib/one-true-awk/   (props changed)
  user/ed/compiler-rt/contrib/openbsm/   (props changed)
  user/ed/compiler-rt/contrib/openpam/   (props changed)
  user/ed/compiler-rt/contrib/pf/   (props changed)
  user/ed/compiler-rt/contrib/sendmail/   (props changed)
  user/ed/compiler-rt/contrib/tcpdump/   (props changed)
  user/ed/compiler-rt/contrib/tcsh/   (props changed)
  user/ed/compiler-rt/contrib/top/   (props changed)
  user/ed/compiler-rt/contrib/top/install-sh   (props changed)
  user/ed/compiler-rt/contrib/tzcode/stdtime/   (props changed)
  user/ed/compiler-rt/contrib/tzcode/zic/   (props changed)
  user/ed/compiler-rt/contrib/tzdata/   (props changed)
  user/ed/compiler-rt/contrib/wpa/   (props changed)
  user/ed/compiler-rt/contrib/xz/   (props changed)
  user/ed/compiler-rt/crypto/openssh/   (props changed)
  user/ed/compiler-rt/crypto/openssl/   (props changed)
  user/ed/compiler-rt/lib/libc/   (props changed)
  user/ed/compiler-rt/lib/libc/stdtime/   (props changed)
  user/ed/compiler-rt/lib/libutil/   (props changed)
  user/ed/compiler-rt/lib/libz/   (props changed)
  user/ed/compiler-rt/sbin/   (props changed)
  user/ed/compiler-rt/sbin/ipfw/   (props changed)
  user/ed/compiler-rt/share/mk/bsd.arch.inc.mk   (props changed)
  user/ed/compiler-rt/share/zoneinfo/   (props changed)
  user/ed/compiler-rt/sys/   (props changed)
  user/ed/compiler-rt/sys/amd64/include/xen/   (props changed)
  user/ed/compiler-rt/sys/cddl/contrib/opensolaris/   (props changed)
  user/ed/compiler-rt/sys/contrib/dev/acpica/   (props changed)
  user/ed/compiler-rt/sys/contrib/pf/   (props changed)
  user/ed/compiler-rt/sys/contrib/x86emu/   (props changed)
  user/ed/compiler-rt/sys/dev/xen/xenpci/   (props changed)
  user/ed/compiler-rt/usr.bin/calendar/   (props changed)
  user/ed/compiler-rt/usr.bin/csup/   (props changed)
  user/ed/compiler-rt/usr.bin/procstat/   (props changed)
  user/ed/compiler-rt/usr.sbin/zic/   (props changed)

Modified: user/ed/compiler-rt/ObsoleteFiles.inc
==============================================================================
--- user/ed/compiler-rt/ObsoleteFiles.inc	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/ObsoleteFiles.inc	Thu Nov  4 18:24:05 2010	(r214796)
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20101101: headers moved to machine/ to x86/
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/machine/apicreg.h
+OLD_FILES+=usr/include/machine/mca.h
+.endif
 # 20101020: catch up with vm_page_sleep_if_busy rename
 OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
 # 20101011: removed subblock.h from liblzma

Modified: user/ed/compiler-rt/bin/rm/rm.1
==============================================================================
--- user/ed/compiler-rt/bin/rm/rm.1	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/bin/rm/rm.1	Thu Nov  4 18:24:05 2010	(r214796)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd October 8, 2010
+.Dd October 31, 2010
 .Dt RM 1
 .Os
 .Sh NAME
@@ -100,6 +100,11 @@ Specifying this flag for a read only fil
 .Nm
 to generate an error message and exit.
 The file will not be removed or overwritten.
+.Pp
+N.B.: The
+.Fl P
+flag is not considered a security feature
+.Pq see Sx BUGS .
 .It Fl R
 Attempt to remove the file hierarchy rooted in each
 .Ar file
@@ -229,8 +234,12 @@ command appeared in
 .Sh BUGS
 The
 .Fl P
-option assumes that the underlying file system updates existing blocks
-in-place and does not store new data in a new location.
-This is true for UFS, but not for ZFS or other file systems which use
-copy-on-write semantics.
-In addition, only regular files are overwritten.
+option assumes that the underlying storage overwrites file blocks
+when data is written to an existing offset.
+Several factors including the file system and its backing store could defeat
+this assumption.
+This includes, but is not limited to file systems that use a
+Copy-On-Write strategy (e.g. ZFS or UFS when snapshots are being used), Flash
+media that are using a wear leveling algorithm, or when the backing datastore
+does journaling, etc.
+In addition, only regular files are overwritten, other types of files are not.

Modified: user/ed/compiler-rt/bin/sh/eval.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/eval.c	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/bin/sh/eval.c	Thu Nov  4 18:24:05 2010	(r214796)
@@ -196,6 +196,7 @@ void
 evaltree(union node *n, int flags)
 {
 	int do_etest;
+	union node *next;
 
 	do_etest = 0;
 	if (n == NULL) {
@@ -203,84 +204,88 @@ evaltree(union node *n, int flags)
 		exitstatus = 0;
 		goto out;
 	}
+	do {
+		next = NULL;
 #ifndef NO_HISTORY
-	displayhist = 1;	/* show history substitutions done with fc */
+		displayhist = 1;	/* show history substitutions done with fc */
 #endif
-	TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type));
-	switch (n->type) {
-	case NSEMI:
-		evaltree(n->nbinary.ch1, flags & ~EV_EXIT);
-		if (evalskip)
-			goto out;
-		evaltree(n->nbinary.ch2, flags);
-		break;
-	case NAND:
-		evaltree(n->nbinary.ch1, EV_TESTED);
-		if (evalskip || exitstatus != 0) {
-			goto out;
+		TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type));
+		switch (n->type) {
+		case NSEMI:
+			evaltree(n->nbinary.ch1, flags & ~EV_EXIT);
+			if (evalskip)
+				goto out;
+			next = n->nbinary.ch2;
+			break;
+		case NAND:
+			evaltree(n->nbinary.ch1, EV_TESTED);
+			if (evalskip || exitstatus != 0) {
+				goto out;
+			}
+			next = n->nbinary.ch2;
+			break;
+		case NOR:
+			evaltree(n->nbinary.ch1, EV_TESTED);
+			if (evalskip || exitstatus == 0)
+				goto out;
+			next = n->nbinary.ch2;
+			break;
+		case NREDIR:
+			evalredir(n, flags);
+			break;
+		case NSUBSHELL:
+			evalsubshell(n, flags);
+			do_etest = !(flags & EV_TESTED);
+			break;
+		case NBACKGND:
+			evalsubshell(n, flags);
+			break;
+		case NIF: {
+			evaltree(n->nif.test, EV_TESTED);
+			if (evalskip)
+				goto out;
+			if (exitstatus == 0)
+				next = n->nif.ifpart;
+			else if (n->nif.elsepart)
+				next = n->nif.elsepart;
+			else
+				exitstatus = 0;
+			break;
 		}
-		evaltree(n->nbinary.ch2, flags);
-		break;
-	case NOR:
-		evaltree(n->nbinary.ch1, EV_TESTED);
-		if (evalskip || exitstatus == 0)
-			goto out;
-		evaltree(n->nbinary.ch2, flags);
-		break;
-	case NREDIR:
-		evalredir(n, flags);
-		break;
-	case NSUBSHELL:
-		evalsubshell(n, flags);
-		do_etest = !(flags & EV_TESTED);
-		break;
-	case NBACKGND:
-		evalsubshell(n, flags);
-		break;
-	case NIF: {
-		evaltree(n->nif.test, EV_TESTED);
-		if (evalskip)
-			goto out;
-		if (exitstatus == 0)
-			evaltree(n->nif.ifpart, flags);
-		else if (n->nif.elsepart)
-			evaltree(n->nif.elsepart, flags);
-		else
+		case NWHILE:
+		case NUNTIL:
+			evalloop(n, flags & ~EV_EXIT);
+			break;
+		case NFOR:
+			evalfor(n, flags & ~EV_EXIT);
+			break;
+		case NCASE:
+			evalcase(n, flags);
+			break;
+		case NDEFUN:
+			defun(n->narg.text, n->narg.next);
 			exitstatus = 0;
-		break;
-	}
-	case NWHILE:
-	case NUNTIL:
-		evalloop(n, flags & ~EV_EXIT);
-		break;
-	case NFOR:
-		evalfor(n, flags & ~EV_EXIT);
-		break;
-	case NCASE:
-		evalcase(n, flags);
-		break;
-	case NDEFUN:
-		defun(n->narg.text, n->narg.next);
-		exitstatus = 0;
-		break;
-	case NNOT:
-		evaltree(n->nnot.com, EV_TESTED);
-		exitstatus = !exitstatus;
-		break;
-
-	case NPIPE:
-		evalpipe(n);
-		do_etest = !(flags & EV_TESTED);
-		break;
-	case NCMD:
-		evalcommand(n, flags, (struct backcmd *)NULL);
-		do_etest = !(flags & EV_TESTED);
-		break;
-	default:
-		out1fmt("Node type = %d\n", n->type);
-		flushout(&output);
-		break;
-	}
+			break;
+		case NNOT:
+			evaltree(n->nnot.com, EV_TESTED);
+			exitstatus = !exitstatus;
+			break;
+
+		case NPIPE:
+			evalpipe(n);
+			do_etest = !(flags & EV_TESTED);
+			break;
+		case NCMD:
+			evalcommand(n, flags, (struct backcmd *)NULL);
+			do_etest = !(flags & EV_TESTED);
+			break;
+		default:
+			out1fmt("Node type = %d\n", n->type);
+			flushout(&output);
+			break;
+		}
+		n = next;
+	} while (n != NULL);
 out:
 	if (pendingsigs)
 		dotrap();

Modified: user/ed/compiler-rt/bin/sh/parser.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/parser.c	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/bin/sh/parser.c	Thu Nov  4 18:24:05 2010	(r214796)
@@ -69,6 +69,11 @@ __FBSDID("$FreeBSD$");
 #define	EOFMARKLEN	79
 #define	PROMPTLEN	128
 
+/* values of checkkwd variable */
+#define CHKALIAS	0x1
+#define CHKKWD		0x2
+#define CHKNL		0x4
+
 /* values returned by readtoken */
 #include "token.h"
 
@@ -102,9 +107,6 @@ static int startlinno;		/* line # where 
 static int funclinno;		/* line # where the current function started */
 static struct parser_temp *parser_temp;
 
-/* XXX When 'noaliases' is set to one, no alias expansion takes place. */
-static int noaliases = 0;
-
 
 static union node *list(int, int);
 static union node *andor(void);
@@ -227,13 +229,13 @@ parsecmd(int interact)
 static union node *
 list(int nlflag, int erflag)
 {
-	union node *n1, *n2, *n3;
+	union node *ntop, *n1, *n2, *n3;
 	int tok;
 
-	checkkwd = 2;
+	checkkwd = CHKNL | CHKKWD | CHKALIAS;
 	if (!nlflag && !erflag && tokendlist[peektoken()])
 		return NULL;
-	n1 = NULL;
+	ntop = n1 = NULL;
 	for (;;) {
 		n2 = andor();
 		tok = readtoken();
@@ -250,14 +252,21 @@ list(int nlflag, int erflag)
 				n2 = n3;
 			}
 		}
-		if (n1 == NULL) {
-			n1 = n2;
+		if (ntop == NULL)
+			ntop = n2;
+		else if (n1 == NULL) {
+			n1 = (union node *)stalloc(sizeof (struct nbinary));
+			n1->type = NSEMI;
+			n1->nbinary.ch1 = ntop;
+			n1->nbinary.ch2 = n2;
+			ntop = n1;
 		}
 		else {
 			n3 = (union node *)stalloc(sizeof (struct nbinary));
 			n3->type = NSEMI;
-			n3->nbinary.ch1 = n1;
+			n3->nbinary.ch1 = n1->nbinary.ch2;
 			n3->nbinary.ch2 = n2;
+			n1->nbinary.ch2 = n3;
 			n1 = n3;
 		}
 		switch (tok) {
@@ -269,28 +278,28 @@ list(int nlflag, int erflag)
 			if (tok == TNL) {
 				parseheredoc();
 				if (nlflag)
-					return n1;
+					return ntop;
 			} else if (tok == TEOF && nlflag) {
 				parseheredoc();
-				return n1;
+				return ntop;
 			} else {
 				tokpushback++;
 			}
-			checkkwd = 2;
+			checkkwd = CHKNL | CHKKWD | CHKALIAS;
 			if (!nlflag && !erflag && tokendlist[peektoken()])
-				return n1;
+				return ntop;
 			break;
 		case TEOF:
 			if (heredoclist)
 				parseheredoc();
 			else
 				pungetc();		/* push back EOF on input */
-			return n1;
+			return ntop;
 		default:
 			if (nlflag || erflag)
 				synexpect(-1);
 			tokpushback++;
-			return n1;
+			return ntop;
 		}
 	}
 }
@@ -332,7 +341,7 @@ pipeline(void)
 	int negate, t;
 
 	negate = 0;
-	checkkwd = 2;
+	checkkwd = CHKNL | CHKKWD | CHKALIAS;
 	TRACE(("pipeline: entered\n"));
 	while (readtoken() == TNOT)
 		negate = !negate;
@@ -348,7 +357,7 @@ pipeline(void)
 		do {
 			prev = lp;
 			lp = (struct nodelist *)stalloc(sizeof (struct nodelist));
-			checkkwd = 2;
+			checkkwd = CHKNL | CHKKWD | CHKALIAS;
 			t = readtoken();
 			tokpushback++;
 			if (t == TNOT)
@@ -381,7 +390,7 @@ command(void)
 	union node *redir, **rpp;
 	int t;
 
-	checkkwd = 2;
+	checkkwd = CHKNL | CHKKWD | CHKALIAS;
 	redir = NULL;
 	n1 = NULL;
 	rpp = &redir;
@@ -422,7 +431,7 @@ command(void)
 		}
 		if (readtoken() != TFI)
 			synexpect(TFI);
-		checkkwd = 1;
+		checkkwd = CHKKWD | CHKALIAS;
 		break;
 	case TWHILE:
 	case TUNTIL: {
@@ -438,7 +447,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 		n1->nbinary.ch2 = list(0, 0);
 		if (readtoken() != TDONE)
 			synexpect(TDONE);
-		checkkwd = 1;
+		checkkwd = CHKKWD | CHKALIAS;
 		break;
 	}
 	case TFOR:
@@ -480,7 +489,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 			if (lasttoken != TNL && lasttoken != TSEMI)
 				tokpushback++;
 		}
-		checkkwd = 2;
+		checkkwd = CHKNL | CHKKWD | CHKALIAS;
 		if ((t = readtoken()) == TDO)
 			t = TDONE;
 		else if (t == TBEGIN)
@@ -490,7 +499,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 		n1->nfor.body = list(0, 0);
 		if (readtoken() != t)
 			synexpect(t);
-		checkkwd = 1;
+		checkkwd = CHKKWD | CHKALIAS;
 		break;
 	case TCASE:
 		n1 = (union node *)stalloc(sizeof (struct ncase));
@@ -506,8 +515,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 		if (lasttoken != TWORD || ! equal(wordtext, "in"))
 			synerror("expecting \"in\"");
 		cpp = &n1->ncase.cases;
-		noaliases = 1;	/* turn off alias expansion */
-		checkkwd = 2, readtoken();
+		checkkwd = CHKNL | CHKKWD, readtoken();
 		while (lasttoken != TESAC) {
 			*cpp = cp = (union node *)stalloc(sizeof (struct nclist));
 			cp->type = NCLIST;
@@ -519,28 +527,28 @@ TRACE(("expecting DO got %s %s\n", tokna
 				ap->type = NARG;
 				ap->narg.text = wordtext;
 				ap->narg.backquote = backquotelist;
-				if (checkkwd = 2, readtoken() != TPIPE)
+				checkkwd = CHKNL | CHKKWD;
+				if (readtoken() != TPIPE)
 					break;
 				app = &ap->narg.next;
 				readtoken();
 			}
 			ap->narg.next = NULL;
 			if (lasttoken != TRP)
-				noaliases = 0, synexpect(TRP);
+				synexpect(TRP);
 			cp->nclist.body = list(0, 0);
 
-			checkkwd = 2;
+			checkkwd = CHKNL | CHKKWD | CHKALIAS;
 			if ((t = readtoken()) != TESAC) {
 				if (t != TENDCASE)
-					noaliases = 0, synexpect(TENDCASE);
+					synexpect(TENDCASE);
 				else
-					checkkwd = 2, readtoken();
+					checkkwd = CHKNL | CHKKWD, readtoken();
 			}
 			cpp = &cp->nclist.next;
 		}
-		noaliases = 0;	/* reset alias expansion */
 		*cpp = NULL;
-		checkkwd = 1;
+		checkkwd = CHKKWD | CHKALIAS;
 		break;
 	case TLP:
 		n1 = (union node *)stalloc(sizeof (struct nredir));
@@ -549,13 +557,13 @@ TRACE(("expecting DO got %s %s\n", tokna
 		n1->nredir.redirect = NULL;
 		if (readtoken() != TRP)
 			synexpect(TRP);
-		checkkwd = 1;
+		checkkwd = CHKKWD | CHKALIAS;
 		break;
 	case TBEGIN:
 		n1 = list(0, 0);
 		if (readtoken() != TEND)
 			synexpect(TEND);
-		checkkwd = 1;
+		checkkwd = CHKKWD | CHKALIAS;
 		break;
 	/* Handle an empty command like other simple commands.  */
 	case TBACKGND:
@@ -789,7 +797,6 @@ static int
 readtoken(void)
 {
 	int t;
-	int savecheckkwd = checkkwd;
 	struct alias *ap;
 #ifdef DEBUG
 	int alreadyseen = tokpushback;
@@ -798,25 +805,24 @@ readtoken(void)
 	top:
 	t = xxreadtoken();
 
-	if (checkkwd) {
-		/*
-		 * eat newlines
-		 */
-		if (checkkwd == 2) {
-			checkkwd = 0;
-			while (t == TNL) {
-				parseheredoc();
-				t = xxreadtoken();
-			}
-		} else
-			checkkwd = 0;
-		/*
-		 * check for keywords and aliases
-		 */
-		if (t == TWORD && !quoteflag)
-		{
-			const char * const *pp;
+	/*
+	 * eat newlines
+	 */
+	if (checkkwd & CHKNL) {
+		while (t == TNL) {
+			parseheredoc();
+			t = xxreadtoken();
+		}
+	}
 
+	/*
+	 * check for keywords and aliases
+	 */
+	if (t == TWORD && !quoteflag)
+	{
+		const char * const *pp;
+
+		if (checkkwd & CHKKWD)
 			for (pp = parsekwd; *pp; pp++) {
 				if (**pp == *wordtext && equal(*pp, wordtext))
 				{
@@ -825,16 +831,16 @@ readtoken(void)
 					goto out;
 				}
 			}
-			if (noaliases == 0 &&
-			    (ap = lookupalias(wordtext, 1)) != NULL) {
-				pushstring(ap->val, strlen(ap->val), ap);
-				checkkwd = savecheckkwd;
-				goto top;
-			}
+		if (checkkwd & CHKALIAS &&
+		    (ap = lookupalias(wordtext, 1)) != NULL) {
+			pushstring(ap->val, strlen(ap->val), ap);
+			goto top;
 		}
-out:
-		checkkwd = (t == TNOT) ? savecheckkwd : 0;
 	}
+out:
+	if (t != TNOT)
+		checkkwd = 0;
+
 #ifdef DEBUG
 	if (!alreadyseen)
 	    TRACE(("token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));

Modified: user/ed/compiler-rt/bin/sh/sh.1
==============================================================================
--- user/ed/compiler-rt/bin/sh/sh.1	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/bin/sh/sh.1	Thu Nov  4 18:24:05 2010	(r214796)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd October 16, 2010
+.Dd October 31, 2010
 .Dt SH 1
 .Os
 .Sh NAME
@@ -40,9 +40,24 @@
 .Nd command interpreter (shell)
 .Sh SYNOPSIS
 .Nm
-.Op Fl /+abCEefIimnPpsTuVvx
+.Op Fl /+abCEefIimnPpTuVvx
 .Op Fl /+o Ar longname
-.Op Fl c Ar string
+.Oo
+.Ar script
+.Op Ar arg ...
+.Oc
+.Nm
+.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+o Ar longname
+.Fl c Ar string
+.Oo
+.Ar name
+.Op Ar arg ...
+.Oc
+.Nm
+.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+o Ar longname
+.Fl s
 .Op Ar arg ...
 .Sh DESCRIPTION
 The
@@ -1109,7 +1124,12 @@ the process ID and its exit status until
 .Ic wait
 built-in command reports completion of the process.
 .It Li $0
-(zero) Expands to the name of the shell or shell script.
+(zero) Expands to the name of the shell script if passed on the command line,
+the
+.Ar name
+operand if given (with
+.Fl c )
+or otherwise argument 0 passed to the shell.
 .El
 .Ss Special Variables
 The following variables are set by the shell or

Modified: user/ed/compiler-rt/bin/stty/key.c
==============================================================================
--- user/ed/compiler-rt/bin/stty/key.c	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/bin/stty/key.c	Thu Nov  4 18:24:05 2010	(r214796)
@@ -257,14 +257,15 @@ f_rows(struct info *ip)
 void
 f_sane(struct info *ip)
 {
+	struct termios def;
 
-	ip->t.c_cflag = TTYDEF_CFLAG | (ip->t.c_cflag & CLOCAL);
-	ip->t.c_iflag = TTYDEF_IFLAG;
-	ip->t.c_iflag |= ICRNL;
+	cfmakesane(&def);
+	ip->t.c_cflag = def.c_cflag | (ip->t.c_cflag & CLOCAL);
+	ip->t.c_iflag = def.c_iflag;
 	/* preserve user-preference flags in lflag */
 #define	LKEEP	(ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH)
-	ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP);
-	ip->t.c_oflag = TTYDEF_OFLAG;
+	ip->t.c_lflag = def.c_lflag | (ip->t.c_lflag & LKEEP);
+	ip->t.c_oflag = def.c_oflag;
 	ip->set = 1;
 }
 

Modified: user/ed/compiler-rt/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- user/ed/compiler-rt/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Thu Nov  4 18:24:05 2010	(r214796)
@@ -3362,8 +3362,7 @@ ztest_verify_blocks(char *pool)
 	int isalen;
 	FILE *fp;
 
-	if (realpath(progname, zdb) == NULL)
-		assert(!"realpath() failed");
+	strlcpy(zdb, "/usr/bin/ztest", sizeof(zdb));
 
 	/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */
 	bin = strstr(zdb, "/usr/bin/");

Modified: user/ed/compiler-rt/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- user/ed/compiler-rt/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Thu Nov  4 18:24:05 2010	(r214796)
@@ -308,9 +308,9 @@ cv_timedwait(kcondvar_t *cv, kmutex_t *m
 	struct timeval tv;
 	clock_t delta;
 
-	ASSERT(abstime > 0);
+	abstime += lbolt;
 top:
-	delta = abstime;
+	delta = abstime - lbolt;
 	if (delta <= 0)
 		return (-1);
 
@@ -321,7 +321,7 @@ top:
 	ts.tv_nsec = tv.tv_usec * 1000 + (delta % hz) * (NANOSEC / hz);
 	ASSERT(ts.tv_nsec >= 0);
 
-	if(ts.tv_nsec >= NANOSEC) {
+	if (ts.tv_nsec >= NANOSEC) {
 		ts.tv_sec++;
 		ts.tv_nsec -= NANOSEC;
 	}

Modified: user/ed/compiler-rt/contrib/bind9/CHANGES
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/CHANGES	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/CHANGES	Thu Nov  4 18:24:05 2010	(r214796)
@@ -1,9 +1,48 @@
-	--- 9.6.2-P2 released ---
+	--- 9.6-ESV-R2 released ---
+
+2939.	[func]		Check that named successfully skips NSEC3 records
+			that fail to match the NSEC3PARAM record currently
+			in use. [RT# 21868]
+
+2937.	[bug]		Worked around an apparent race condition in over
+			memory conditions.  Without this fix a DNS cache DB or
+			ADB could incorrectly stay in an over memory state,
+			effectively refusing further caching, which
+			subsequently made a BIND 9 caching server unworkable.
+			This fix prevents this problem from happening by
+			polling the state of the memory context, rather than
+			making a copy of the state, which appeared to cause
+			a race.  This is a "workaround" in that it doesn't
+			solve the possible race per se, but several experiments
+			proved this change solves the symptom.  Also, the
+			polling overhead hasn't been reported to be an issue.
+			This bug should only affect a caching server that
+			specifies a finite max-cache-size.  It's also quite
+			likely that the bug happens only when enabling threads,
+			but it's not confirmed yet. [RT #21818]
+
+2925.	[bug]		Named failed to accept uncachable negative responses
+			from insecure zones. [RT# 21555]
+
+2921.	[bug]		The resolver could attempt to destroy a fetch context
+			too soon.  [RT #19878]
+
+2900.	[bug]		The placeholder negative caching element was not
+			properly constructed triggering a INSIST in 
+			dns_ncache_towire(). [RT #21346]
+			
+2890.	[bug]		Handle the introduction of new trusted-keys and
+			DS, DLV RRsets better. [RT #21097]
+
+2869.	[bug]		Fix arguments to dns_keytable_findnextkeynode() call.
+			[RT #20877]
+
+	--- 9.6-ESV-R1 released ---
 
 2876.	[bug]		Named could return SERVFAIL for negative responses
 			from unsigned zones. [RT #21131]
 
-	--- 9.6.2-P1 released ---
+	--- 9.6-ESV released ---
 
 2852.	[bug]		Handle broken DNSSEC trust chains better. [RT #15619]
 

Modified: user/ed/compiler-rt/contrib/bind9/README
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/README	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/README	Thu Nov  4 18:24:05 2010	(r214796)
@@ -42,6 +42,12 @@ BIND 9
 		Stichting NLnet - NLnet Foundation
 		Nominum, Inc.
 
+BIND 9.6-ESV (Extended Support Version)
+
+	BIND 9.6-ESV will be supported until March 31, 2013, at
+	which time you will need to upgrade to the current release
+	of BIND.
+
 BIND 9.6.2
 
 	BIND 9.6.2 is a maintenance release, fixing bugs in 9.6.1.

Modified: user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html	Thu Nov  4 18:24:05 2010	(r214796)
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-dsfromkey.html,v 1.5 2008/11/08 01:11:47 tbox Exp $ -->
+<!-- $Id: dnssec-dsfromkey.html,v 1.5.110.2 2010/03/03 23:32:17 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -33,14 +33,14 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-dsfromkey</code>  {-s} [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-1</code>] [<code class="option">-2</code>] [<code class="option">-a <em class="replaceable"><code>alg</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-d <em class="replaceable"><code>dir</code></em></code>] {dnsname}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543424"></a><h2>DESCRIPTION</h2>
+<a name="id2543421"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-dsfromkey</strong></span>
       outputs the Delegation Signer (DS) resource record (RR), as defined in
       RFC 3658 and RFC 4509, for the given key(s).
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543435"></a><h2>OPTIONS</h2>
+<a name="id2543433"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-1</span></dt>
 <dd><p>
@@ -81,7 +81,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543563"></a><h2>EXAMPLE</h2>
+<a name="id2543561"></a><h2>EXAMPLE</h2>
 <p>
       To build the SHA-256 DS RR from the
       <strong class="userinput"><code>Kexample.com.+003+26160</code></strong>
@@ -96,7 +96,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543593"></a><h2>FILES</h2>
+<a name="id2543591"></a><h2>FILES</h2>
 <p>
       The keyfile can be designed by the key identification
       <code class="filename">Knnnn.+aaa+iiiii</code> or the full file name
@@ -110,13 +110,13 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543628"></a><h2>CAVEAT</h2>
+<a name="id2543626"></a><h2>CAVEAT</h2>
 <p>
       A keyfile error can give a "file not found" even if the file exists.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543638"></a><h2>SEE ALSO</h2>
+<a name="id2543636"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -125,7 +125,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543674"></a><h2>AUTHOR</h2>
+<a name="id2543672"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html	Thu Nov  4 18:24:05 2010	(r214796)
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-keyfromlabel.html,v 1.5.44.3 2010/01/16 01:55:32 tbox Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.html,v 1.5.44.3.4.1 2010/03/03 22:19:19 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -31,7 +31,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-keyfromlabel</code>  {-a <em class="replaceable"><code>algorithm</code></em>} {-l <em class="replaceable"><code>label</code></em>} [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-k</code>] [<code class="option">-n <em class="replaceable"><code>nametype</code></em></code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] {name}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543416"></a><h2>DESCRIPTION</h2>
+<a name="id2543414"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-keyfromlabel</strong></span>
       gets keys with the given label from a crypto hardware and builds
       key files for DNSSEC (Secure DNS), as defined in RFC 2535
@@ -39,7 +39,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543428"></a><h2>OPTIONS</h2>
+<a name="id2543426"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd>
@@ -120,7 +120,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543632"></a><h2>GENERATED KEY FILES</h2>
+<a name="id2543629"></a><h2>GENERATED KEY FILES</h2>
 <p>
       When <span><strong class="command">dnssec-keyfromlabel</strong></span> completes
       successfully,
@@ -161,7 +161,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543704"></a><h2>SEE ALSO</h2>
+<a name="id2543702"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -169,7 +169,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543737"></a><h2>AUTHOR</h2>
+<a name="id2543735"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keygen.html
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keygen.html	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-keygen.html	Thu Nov  4 18:24:05 2010	(r214796)
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-keygen.html,v 1.32.44.4 2010/01/16 01:55:32 tbox Exp $ -->
+<!-- $Id: dnssec-keygen.html,v 1.32.44.4.4.1 2010/03/03 22:19:19 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-keygen</code>  {-a <em class="replaceable"><code>algorithm</code></em>} {-b <em class="replaceable"><code>keysize</code></em>} {-n <em class="replaceable"><code>nametype</code></em>} [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-e</code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-g <em class="replaceable"><code>generator</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k</code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-s <em class="replaceable"><code>strength</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em
 ></code>] {name}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543483"></a><h2>DESCRIPTION</h2>
+<a name="id2543481"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-keygen</strong></span>
       generates keys for DNSSEC (Secure DNS), as defined in RFC 2535
       and RFC 4034.  It can also generate keys for use with
@@ -45,7 +45,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543501"></a><h2>OPTIONS</h2>
+<a name="id2543499"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd>
@@ -155,7 +155,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543836"></a><h2>GENERATED KEYS</h2>
+<a name="id2543834"></a><h2>GENERATED KEYS</h2>
 <p>
       When <span><strong class="command">dnssec-keygen</strong></span> completes
       successfully,
@@ -201,7 +201,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543918"></a><h2>EXAMPLE</h2>
+<a name="id2543916"></a><h2>EXAMPLE</h2>
 <p>
       To generate a 768-bit DSA key for the domain
       <strong class="userinput"><code>example.com</code></strong>, the following command would be
@@ -222,7 +222,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544030"></a><h2>SEE ALSO</h2>
+<a name="id2544028"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 2539</em>,
@@ -231,7 +231,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544061"></a><h2>AUTHOR</h2>
+<a name="id2544059"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-signzone.html
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-signzone.html	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/bin/dnssec/dnssec-signzone.html	Thu Nov  4 18:24:05 2010	(r214796)
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-signzone.html,v 1.33.44.8 2009/11/07 01:56:11 tbox Exp $ -->
+<!-- $Id: dnssec-signzone.html,v 1.33.44.8.10.1 2010/03/03 22:19:19 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-signzone</code>  [<code class="option">-a</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-d <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-e <em class="replaceable"><code>end-time</code></em></code>] [<code class="option">-f <em class="replaceable"><code>output-file</code></em></code>] [<code class="option">-g</code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>key</code></em></code>] [<code class="option">-l <em class="replaceable"><code>domain</code></em></code>] [<code class="option">-i <em class="replaceable"><code>interval</code></em></code>] [<code class="option">-I <em class="replaceable"><code>input-format</code></em></code>] [<code class="option">-j <em class="replaceable"><code>jitter</code></em></code>] [<code class="option">-N <em class="replaceable"><code>soa-seria
 l-format</code></em></code>] [<code class="option">-o <em class="replaceable"><code>origin</code></em></code>] [<code class="option">-O <em class="replaceable"><code>output-format</code></em></code>] [<code class="option">-p</code>] [<code class="option">-P</code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-s <em class="replaceable"><code>start-time</code></em></code>] [<code class="option">-t</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-z</code>] [<code class="option">-3 <em class="replaceable"><code>salt</code></em></code>] [<code class="option">-H <em class="replaceable"><code>iterations</code></em></code>] [<code class="option">-A</code>] {zonefile} [key...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543558"></a><h2>DESCRIPTION</h2>
+<a name="id2543556"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-signzone</strong></span>
       signs a zone.  It generates
       NSEC and RRSIG records and produces a signed version of the
@@ -43,7 +43,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543576"></a><h2>OPTIONS</h2>
+<a name="id2543574"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a</span></dt>
 <dd><p>
@@ -273,7 +273,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544503"></a><h2>EXAMPLE</h2>
+<a name="id2544433"></a><h2>EXAMPLE</h2>
 <p>
       The following command signs the <strong class="userinput"><code>example.com</code></strong>
       zone with the DSA key generated by <span><strong class="command">dnssec-keygen</strong></span>
@@ -302,7 +302,7 @@ db.example.com.signed
 %</pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544554"></a><h2>KNOWN BUGS</h2>
+<a name="id2544552"></a><h2>KNOWN BUGS</h2>
 <p>
         <span><strong class="command">dnssec-signzone</strong></span> was designed so that it could
         sign a zone partially, using only a subset of the DNSSEC keys
@@ -327,14 +327,14 @@ db.example.com.signed
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544716"></a><h2>SEE ALSO</h2>
+<a name="id2544714"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 4033</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544741"></a><h2>AUTHOR</h2>
+<a name="id2544739"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: user/ed/compiler-rt/contrib/bind9/bin/named/include/named/globals.h
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/bin/named/include/named/globals.h	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/bin/named/include/named/globals.h	Thu Nov  4 18:24:05 2010	(r214796)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: globals.h,v 1.80 2008/11/16 22:49:18 marka Exp $ */
+/* $Id: globals.h,v 1.80.84.2 2010/06/26 23:46:15 tbox Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1
@@ -132,6 +132,7 @@ EXTERN int			ns_g_listen		INIT(3);
 EXTERN isc_time_t		ns_g_boottime;
 EXTERN isc_boolean_t		ns_g_memstatistics	INIT(ISC_FALSE);
 EXTERN isc_boolean_t		ns_g_clienttest		INIT(ISC_FALSE);
+EXTERN isc_boolean_t		ns_g_nosoa		INIT(ISC_FALSE);
 
 #undef EXTERN
 #undef INIT

Modified: user/ed/compiler-rt/contrib/bind9/bin/named/main.c
==============================================================================
--- user/ed/compiler-rt/contrib/bind9/bin/named/main.c	Thu Nov  4 18:19:45 2010	(r214795)
+++ user/ed/compiler-rt/contrib/bind9/bin/named/main.c	Thu Nov  4 18:24:05 2010	(r214796)
@@ -1,5 +1,5 @@

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



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