Update to FreeBSD head 2019-09-24

Git mirror commit 6b0307a0a5184339393f555d5d424190d8a8277a.

1 files changed, 92 insertions, 83 deletions

diff --git a/libbsd.py b/libbsd.py
index a19c3309..194733bb 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -349,7 +349,6 @@ class base(builder.Module):
                 'sys/sys/bus.h',
                 'sys/sys/_callout.h',
                 'sys/sys/callout.h',
-                'sys/sys/capability.h',
                 'sys/sys/caprights.h',
                 'sys/sys/capsicum.h',
                 'sys/sys/ck.h',
@@ -362,6 +361,7 @@ class base(builder.Module):
                 'sys/sys/domain.h',
                 'sys/sys/_domainset.h',
                 'sys/sys/domainset.h',
+                'sys/sys/_eventhandler.h',
                 'sys/sys/eventhandler.h',
                 'sys/sys/fail.h',
                 'sys/sys/filedesc.h',
@@ -369,6 +369,7 @@ class base(builder.Module):
                 'sys/sys/firmware.h',
                 'sys/sys/fnv_hash.h',
                 'sys/sys/gpio.h',
+                'sys/sys/gsb_crc32.h',
                 'sys/sys/gtaskqueue.h',
                 'sys/sys/hash.h',
                 'sys/sys/hhook.h',
@@ -378,6 +379,7 @@ class base(builder.Module):
                 'sys/sys/khelp.h',
                 'sys/sys/kobj.h',
                 'sys/sys/kthread.h',
+                'sys/sys/ktls.h',
                 'sys/sys/ktr_class.h',
                 'sys/sys/ktr.h',
                 'sys/sys/libkern.h',
@@ -424,7 +426,7 @@ class base(builder.Module):
                 'sys/sys/sdt.h',
                 'sys/sys/selinfo.h',
                 'sys/sys/_semaphore.h',
-                'sys/sys/seq.h',
+                'sys/sys/seqc.h',
                 'sys/sys/sf_buf.h',
                 'sys/sys/sglist.h',
                 'sys/sys/sigio.h',
@@ -510,7 +512,7 @@ class base(builder.Module):
                 'sys/kern/uipc_sockbuf.c',
                 'sys/kern/uipc_socket.c',
                 'sys/kern/uipc_usrreq.c',
-                'sys/libkern/crc32.c',
+                'sys/libkern/gsb_crc32.c',
                 'sys/libkern/bcd.c',
                 'sys/libkern/inet_ntoa.c',
                 'sys/libkern/jenkins_hash.c',
@@ -888,11 +890,13 @@ class dev_usb(builder.Module):
                 'sys/dev/usb/usbdi_util.h',
                 'sys/dev/usb/usb_dynamic.h',
                 'sys/dev/usb/usb_endian.h',
+                'sys/dev/usb/usb_fdt_support.h',
                 'sys/dev/usb/usb_freebsd.h',
                 'sys/dev/usb/usb_generic.h',
                 'sys/dev/usb/usb.h',
                 'sys/dev/usb/usbhid.h',
                 'sys/dev/usb/usb_hub.h',
+                'sys/dev/usb/usb_hub_private.h',
                 'sys/dev/usb/usb_ioctl.h',
                 'sys/dev/usb/usb_mbuf.h',
                 'sys/dev/usb/usb_msctest.h',
@@ -1344,7 +1348,6 @@ class dev_wlan_rtwn(builder.Module):
                 'sys/dev/rtwn/rtl8188e/r88e_tx.c',
                 'sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c',
                 'sys/dev/rtwn/rtl8188e/usb/r88eu_init.c',
-                'sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c',
                 'sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c',
                 'sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c',
                 'sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c',
@@ -1776,6 +1779,7 @@ class net(builder.Module):
                 'sys/net/ethernet.h',
                 'sys/net/firewire.h',
                 'sys/net/ieee8023ad_lacp.h',
+                'sys/net/ieee_oui.h',
                 'sys/net/if_arp.h',
                 'sys/net/if_bridgevar.h',
                 'sys/net/if_clone.h',
@@ -1790,7 +1794,6 @@ class net(builder.Module):
                 'sys/net/if_mib.h',
                 'sys/net/if_sppp.h',
                 'sys/net/if_tap.h',
-                'sys/net/if_tapvar.h',
                 'sys/net/if_tun.h',
                 'sys/net/if_types.h',
                 'sys/net/if_var.h',
@@ -1836,8 +1839,7 @@ class net(builder.Module):
                 'sys/net/if_mib.c',
                 'sys/net/if_spppfr.c',
                 'sys/net/if_spppsubr.c',
-                'sys/net/if_tap.c',
-                'sys/net/if_tun.c',
+                'sys/net/if_tuntap.c',
                 'sys/net/if_vlan.c',
                 'sys/net/pfil.c',
                 'sys/net/radix.c',
@@ -2351,6 +2353,7 @@ class net80211(builder.Module):
                 'sys/net80211/ieee80211_var.h',
                 'sys/net80211/ieee80211_vht.h',
                 'sys/net80211/ieee80211_wds.h',
+                'sys/net80211/ieee80211_wps.h',
             ]
         )
         self.addKernelSpaceSourceFiles(
@@ -2426,6 +2429,7 @@ class opencrypto(builder.Module):
                 'sys/contrib/libsodium/src/libsodium/include/sodium/utils.h',
                 'sys/opencrypto/cast.h',
                 'sys/opencrypto/castsb.h',
+                'sys/opencrypto/cbc_mac.h',
                 'sys/opencrypto/_cryptodev.h',
                 'sys/opencrypto/cryptodev.h',
                 'sys/opencrypto/cryptosoft.h',
@@ -2465,6 +2469,7 @@ class opencrypto(builder.Module):
                 'sys/contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c',
                 'sys/crypto/libsodium/utils.c',
                 'sys/opencrypto/cast.c',
+                'sys/opencrypto/cbc_mac.c',
                 'sys/opencrypto/criov.c',
                 'sys/opencrypto/crypto.c',
                 'sys/opencrypto/cryptodeflate.c',
@@ -2475,6 +2480,7 @@ class opencrypto(builder.Module):
                 'sys/opencrypto/rmd160.c',
                 'sys/opencrypto/skipjack.c',
                 'sys/opencrypto/xform.c',
+                'sys/opencrypto/xform_cbc_mac.c',
                 'sys/opencrypto/xform_poly1305.c',
             ],
             mm.generator['source']()
@@ -2503,7 +2509,6 @@ class crypto(builder.Module):
                 'sys/crypto/blowfish/bf_pi.h',
                 'sys/crypto/blowfish/blowfish.h',
                 'sys/crypto/camellia/camellia.h',
-                'sys/crypto/chacha20/_chacha.h',
                 'sys/crypto/chacha20/chacha.h',
                 'sys/crypto/des/des.h',
                 'sys/crypto/des/des_locl.h',
@@ -2700,6 +2705,7 @@ class user_space(builder.Module):
                 'bin/stty/stty.h',
                 'contrib/libxo/libxo/xo_buf.h',
                 'contrib/libxo/libxo/xo_encoder.h',
+                'contrib/libxo/libxo/xo_explicit.h',
                 'contrib/libxo/libxo/xo.h',
                 'contrib/libxo/libxo/xo_humanize.h',
                 'contrib/libxo/libxo/xo_wcwidth.h',
@@ -2791,6 +2797,7 @@ class user_space(builder.Module):
                 'sbin/dhclient/privsep.h',
                 'sbin/dhclient/tree.h',
                 'sbin/ifconfig/ifconfig.h',
+                'sbin/ping/utils.h',
                 'usr.bin/netstat/netstat.h'
             ]
         )
@@ -3060,6 +3067,7 @@ class user_space(builder.Module):
                 'sbin/pfctl/pf_print_state.c',
                 'sbin/ping6/ping6.c',
                 'sbin/ping/ping.c',
+                'sbin/ping/utils.c',
                 'sbin/route/route.c',
                 'sbin/sysctl/sysctl.c',
                 'usr.bin/netstat/bpf.c',
@@ -3371,6 +3379,7 @@ class crypto_openssl(builder.Module):
         )
         self.addUserSpaceSourceFiles(
             [
+                'crypto/openssl/crypto/getenv.c',
                 'crypto/openssl/crypto/aes/aes_cbc.c',
                 'crypto/openssl/crypto/aes/aes_cfb.c',
                 'crypto/openssl/crypto/aes/aes_core.c',
@@ -3742,7 +3751,6 @@ class crypto_openssl(builder.Module):
                 'crypto/openssl/crypto/evp/p_sign.c',
                 'crypto/openssl/crypto/evp/p_verify.c',
                 'crypto/openssl/crypto/ex_data.c',
-                'crypto/openssl/crypto/getenv.c',
                 'crypto/openssl/crypto/hmac/hmac.c',
                 'crypto/openssl/crypto/hmac/hm_ameth.c',
                 'crypto/openssl/crypto/hmac/hm_pmeth.c',
@@ -4208,7 +4216,6 @@ class contrib_expat(builder.Module):
                 'contrib/expat/lib/internal.h',
                 'contrib/expat/lib/latin1tab.h',
                 'contrib/expat/lib/nametab.h',
-                'contrib/expat/lib/siphash.h',
                 'contrib/expat/lib/utf8tab.h',
                 'contrib/expat/lib/xmlrole.h',
                 'contrib/expat/lib/xmltok.h',
@@ -4607,6 +4614,7 @@ class usr_sbin_wpa_supplicant(builder.Module):
                 'contrib/wpa/src/ap/wpa_auth_i.h',
                 'contrib/wpa/src/common/ctrl_iface_common.h',
                 'contrib/wpa/src/common/defs.h',
+                'contrib/wpa/src/common/dpp.h',
                 'contrib/wpa/src/common/eapol_common.h',
                 'contrib/wpa/src/common/gas.h',
                 'contrib/wpa/src/common/gas_server.h',
@@ -4614,6 +4622,7 @@ class usr_sbin_wpa_supplicant(builder.Module):
                 'contrib/wpa/src/common/ieee802_11_common.h',
                 'contrib/wpa/src/common/ieee802_11_defs.h',
                 'contrib/wpa/src/common/ieee802_1x_defs.h',
+                'contrib/wpa/src/common/ocv.h',
                 'contrib/wpa/src/common/qca-vendor.h',
                 'contrib/wpa/src/common/sae.h',
                 'contrib/wpa/src/common/version.h',
@@ -4675,6 +4684,7 @@ class usr_sbin_wpa_supplicant(builder.Module):
                 'contrib/wpa/src/utils/bitfield.h',
                 'contrib/wpa/src/utils/build_config.h',
                 'contrib/wpa/src/utils/common.h',
+                'contrib/wpa/src/utils/const_time.h',
                 'contrib/wpa/src/utils/eloop.h',
                 'contrib/wpa/src/utils/ext_password.h',
                 'contrib/wpa/src/utils/includes.h',
@@ -4713,7 +4723,6 @@ class usr_sbin_wpa_supplicant(builder.Module):
                 'contrib/wpa/wpa_supplicant/ctrl_iface.h',
                 'contrib/wpa/wpa_supplicant/dbus/dbus_common.h',
                 'contrib/wpa/wpa_supplicant/dbus/dbus_new.h',
-                'contrib/wpa/wpa_supplicant/dbus/dbus_old.h',
                 'contrib/wpa/wpa_supplicant/dpp_supplicant.h',
                 'contrib/wpa/wpa_supplicant/driver_i.h',
                 'contrib/wpa/wpa_supplicant/gas_query.h',
@@ -4741,107 +4750,107 @@ class usr_sbin_wpa_supplicant(builder.Module):
         )
         self.addUserSpaceSourceFiles(
             [
+                'contrib/wpa/wpa_supplicant/blacklist.c',
+                'contrib/wpa/wpa_supplicant/bss.c',
+                'contrib/wpa/wpa_supplicant/config.c',
+                'contrib/wpa/wpa_supplicant/config_file.c',
+                'contrib/wpa/wpa_supplicant/ctrl_iface.c',
+                'contrib/wpa/wpa_supplicant/ctrl_iface_unix.c',
+                'contrib/wpa/wpa_supplicant/eap_register.c',
+                'contrib/wpa/wpa_supplicant/events.c',
+                'contrib/wpa/wpa_supplicant/gas_query.c',
+                'contrib/wpa/wpa_supplicant/hs20_supplicant.c',
+                'contrib/wpa/wpa_supplicant/interworking.c',
+                'contrib/wpa/wpa_supplicant/main.c',
+                'contrib/wpa/wpa_supplicant/notify.c',
+                'contrib/wpa/wpa_supplicant/offchannel.c',
+                'contrib/wpa/wpa_supplicant/op_classes.c',
+                'contrib/wpa/wpa_supplicant/rrm.c',
+                'contrib/wpa/wpa_supplicant/scan.c',
+                'contrib/wpa/wpa_supplicant/wmm_ac.c',
+                'contrib/wpa/wpa_supplicant/wpas_glue.c',
+                'contrib/wpa/wpa_supplicant/wpa_supplicant.c',
+                'contrib/wpa/wpa_supplicant/wps_supplicant.c',
                 'contrib/wpa/src/ap/ap_drv_ops.c',
                 'contrib/wpa/src/ap/hs20.c',
                 'contrib/wpa/src/ap/ieee802_11_shared.c',
                 'contrib/wpa/src/ap/wpa_auth.c',
                 'contrib/wpa/src/ap/wpa_auth_ft.c',
+                'contrib/wpa/src/utils/base64.c',
+                'contrib/wpa/src/utils/bitfield.c',
+                'contrib/wpa/src/utils/common.c',
+                'contrib/wpa/src/utils/eloop.c',
+                'contrib/wpa/src/utils/os_unix.c',
+                'contrib/wpa/src/utils/uuid.c',
+                'contrib/wpa/src/utils/wpa_debug.c',
+                'contrib/wpa/src/utils/wpabuf.c',
                 'contrib/wpa/src/common/ctrl_iface_common.c',
                 'contrib/wpa/src/common/gas.c',
                 'contrib/wpa/src/common/hw_features_common.c',
                 'contrib/wpa/src/common/ieee802_11_common.c',
                 'contrib/wpa/src/common/wpa_common.c',
-                'contrib/wpa/src/crypto/aes-ctr.c',
-                'contrib/wpa/src/crypto/aes-eax.c',
-                'contrib/wpa/src/crypto/aes-encblock.c',
-                'contrib/wpa/src/crypto/aes-omac1.c',
-                'contrib/wpa/src/crypto/aes-unwrap.c',
-                'contrib/wpa/src/crypto/crypto_openssl.c',
-                'contrib/wpa/src/crypto/ms_funcs.c',
-                'contrib/wpa/src/crypto/random.c',
-                'contrib/wpa/src/crypto/rc4.c',
-                'contrib/wpa/src/crypto/sha1.c',
-                'contrib/wpa/src/crypto/sha1-pbkdf2.c',
-                'contrib/wpa/src/crypto/sha1-prf.c',
-                'contrib/wpa/src/crypto/sha256-internal.c',
-                'contrib/wpa/src/crypto/sha256-prf.c',
-                'contrib/wpa/src/crypto/tls_internal.c',
                 'contrib/wpa/src/drivers/driver_bsd.c',
                 'contrib/wpa/src/drivers/driver_common.c',
                 'contrib/wpa/src/drivers/driver_ndis.c',
-                'contrib/wpa/src/drivers/drivers.c',
                 'contrib/wpa/src/drivers/driver_wired.c',
                 'contrib/wpa/src/drivers/driver_wired_common.c',
-                'contrib/wpa/src/eap_common/chap.c',
-                'contrib/wpa/src/eap_common/eap_common.c',
-                'contrib/wpa/src/eap_common/eap_peap_common.c',
-                'contrib/wpa/src/eap_common/eap_psk_common.c',
-                'contrib/wpa/src/eapol_supp/eapol_supp_sm.c',
-                'contrib/wpa/src/eap_peer/eap.c',
-                'contrib/wpa/src/eap_peer/eap_gtc.c',
-                'contrib/wpa/src/eap_peer/eap_leap.c',
-                'contrib/wpa/src/eap_peer/eap_md5.c',
-                'contrib/wpa/src/eap_peer/eap_methods.c',
-                'contrib/wpa/src/eap_peer/eap_mschapv2.c',
-                'contrib/wpa/src/eap_peer/eap_otp.c',
-                'contrib/wpa/src/eap_peer/eap_peap.c',
-                'contrib/wpa/src/eap_peer/eap_psk.c',
-                'contrib/wpa/src/eap_peer/eap_tls.c',
-                'contrib/wpa/src/eap_peer/eap_tls_common.c',
-                'contrib/wpa/src/eap_peer/eap_ttls.c',
-                'contrib/wpa/src/eap_peer/mschapv2.c',
-                'contrib/wpa/src/l2_packet/l2_packet_freebsd.c',
-                'contrib/wpa/src/rsn_supp/pmksa_cache.c',
-                'contrib/wpa/src/rsn_supp/preauth.c',
-                'contrib/wpa/src/rsn_supp/wpa.c',
-                'contrib/wpa/src/rsn_supp/wpa_ft.c',
-                'contrib/wpa/src/rsn_supp/wpa_ie.c',
-                'contrib/wpa/src/utils/base64.c',
-                'contrib/wpa/src/utils/bitfield.c',
-                'contrib/wpa/src/utils/common.c',
-                'contrib/wpa/src/utils/eloop.c',
-                'contrib/wpa/src/utils/os_unix.c',
-                'contrib/wpa/src/utils/uuid.c',
-                'contrib/wpa/src/utils/wpabuf.c',
-                'contrib/wpa/src/utils/wpa_debug.c',
+                'contrib/wpa/src/drivers/drivers.c',
                 'contrib/wpa/src/wps/http_client.c',
-                'contrib/wpa/src/wps/httpread.c',
                 'contrib/wpa/src/wps/http_server.c',
+                'contrib/wpa/src/wps/httpread.c',
                 'contrib/wpa/src/wps/upnp_xml.c',
+                'contrib/wpa/src/wps/wps.c',
                 'contrib/wpa/src/wps/wps_attr_build.c',
                 'contrib/wpa/src/wps/wps_attr_parse.c',
                 'contrib/wpa/src/wps/wps_attr_process.c',
-                'contrib/wpa/src/wps/wps.c',
                 'contrib/wpa/src/wps/wps_common.c',
                 'contrib/wpa/src/wps/wps_dev_attr.c',
                 'contrib/wpa/src/wps/wps_enrollee.c',
                 'contrib/wpa/src/wps/wps_registrar.c',
-                'contrib/wpa/src/wps/wps_upnp_ap.c',
                 'contrib/wpa/src/wps/wps_upnp.c',
+                'contrib/wpa/src/wps/wps_upnp_ap.c',
                 'contrib/wpa/src/wps/wps_upnp_event.c',
                 'contrib/wpa/src/wps/wps_upnp_ssdp.c',
                 'contrib/wpa/src/wps/wps_upnp_web.c',
-                'contrib/wpa/wpa_supplicant/blacklist.c',
-                'contrib/wpa/wpa_supplicant/bss.c',
-                'contrib/wpa/wpa_supplicant/config.c',
-                'contrib/wpa/wpa_supplicant/config_file.c',
-                'contrib/wpa/wpa_supplicant/ctrl_iface.c',
-                'contrib/wpa/wpa_supplicant/ctrl_iface_unix.c',
-                'contrib/wpa/wpa_supplicant/eap_register.c',
-                'contrib/wpa/wpa_supplicant/events.c',
-                'contrib/wpa/wpa_supplicant/gas_query.c',
-                'contrib/wpa/wpa_supplicant/hs20_supplicant.c',
-                'contrib/wpa/wpa_supplicant/interworking.c',
-                'contrib/wpa/wpa_supplicant/main.c',
-                'contrib/wpa/wpa_supplicant/notify.c',
-                'contrib/wpa/wpa_supplicant/offchannel.c',
-                'contrib/wpa/wpa_supplicant/op_classes.c',
-                'contrib/wpa/wpa_supplicant/rrm.c',
-                'contrib/wpa/wpa_supplicant/scan.c',
-                'contrib/wpa/wpa_supplicant/wmm_ac.c',
-                'contrib/wpa/wpa_supplicant/wpas_glue.c',
-                'contrib/wpa/wpa_supplicant/wpa_supplicant.c',
-                'contrib/wpa/wpa_supplicant/wps_supplicant.c',
+                'contrib/wpa/src/l2_packet/l2_packet_freebsd.c',
+                'contrib/wpa/src/rsn_supp/pmksa_cache.c',
+                'contrib/wpa/src/rsn_supp/preauth.c',
+                'contrib/wpa/src/rsn_supp/wpa.c',
+                'contrib/wpa/src/rsn_supp/wpa_ft.c',
+                'contrib/wpa/src/rsn_supp/wpa_ie.c',
+                'contrib/wpa/src/eapol_supp/eapol_supp_sm.c',
+                'contrib/wpa/src/eap_peer/eap.c',
+                'contrib/wpa/src/eap_peer/eap_methods.c',
+                'contrib/wpa/src/eap_peer/eap_mschapv2.c',
+                'contrib/wpa/src/eap_peer/mschapv2.c',
+                'contrib/wpa/src/eap_peer/eap_md5.c',
+                'contrib/wpa/src/eap_peer/eap_tls.c',
+                'contrib/wpa/src/eap_peer/eap_peap.c',
+                'contrib/wpa/src/eap_peer/eap_ttls.c',
+                'contrib/wpa/src/eap_peer/eap_gtc.c',
+                'contrib/wpa/src/eap_peer/eap_otp.c',
+                'contrib/wpa/src/eap_peer/eap_leap.c',
+                'contrib/wpa/src/eap_peer/eap_psk.c',
+                'contrib/wpa/src/eap_peer/eap_tls_common.c',
+                'contrib/wpa/src/eap_common/eap_common.c',
+                'contrib/wpa/src/eap_common/eap_peap_common.c',
+                'contrib/wpa/src/eap_common/eap_psk_common.c',
+                'contrib/wpa/src/eap_common/chap.c',
+                'contrib/wpa/src/crypto/crypto_openssl.c',
+                'contrib/wpa/src/crypto/random.c',
+                'contrib/wpa/src/crypto/aes-omac1.c',
+                'contrib/wpa/src/crypto/sha256-prf.c',
+                'contrib/wpa/src/crypto/sha256-internal.c',
+                'contrib/wpa/src/crypto/sha1.c',
+                'contrib/wpa/src/crypto/sha1-prf.c',
+                'contrib/wpa/src/crypto/aes-unwrap.c',
+                'contrib/wpa/src/crypto/rc4.c',
+                'contrib/wpa/src/crypto/sha1-pbkdf2.c',
+                'contrib/wpa/src/crypto/tls_internal.c',
+                'contrib/wpa/src/crypto/ms_funcs.c',
+                'contrib/wpa/src/crypto/aes-eax.c',
+                'contrib/wpa/src/crypto/aes-ctr.c',
+                'contrib/wpa/src/crypto/aes-encblock.c',
                 'usr.sbin/wpa/wpa_supplicant/Packet32.c',
             ],
             mm.generator['source'](['-D__FreeBSD__=1',