Update to FreeBSD head 2016-08-23

Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.

1 files changed, 203 insertions, 116 deletions

diff --git a/libbsd.py b/libbsd.py
index d7a0a5f7..08f3a988 100755
--- a/libbsd.py
+++ b/libbsd.py
@@ -56,6 +56,8 @@ def rtems(mm):
             'local/usb_if.c',
             'local/mmcbus_if.c',
             'local/mmcbr_if.c',
+            'local/if_dwc_if.c',
+            'local/gpio_if.c',
             'rtems/ipsec_get_policylen.c',
             'rtems/rtems-bsd-arp-processor.c',
             'rtems/rtems-bsd-allocator-domain-size.c',
@@ -210,6 +212,8 @@ def base(mm):
             'sys/security/mac/mac_framework.h',
             'sys/sys/acl.h',
             'sys/sys/aio.h',
+            'sys/sys/_bitset.h',
+            'sys/sys/bitset.h',
             'sys/sys/bitstring.h',
             'sys/sys/bufobj.h',
             'sys/sys/buf_ring.h',
@@ -219,15 +223,21 @@ def base(mm):
             'sys/sys/_callout.h',
             'sys/sys/callout.h',
             'sys/sys/capability.h',
+            'sys/sys/caprights.h',
+            'sys/sys/capsicum.h',
             'sys/sys/condvar.h',
             'sys/sys/conf.h',
+            'sys/sys/counter.h',
             'sys/sys/cpu.h',
+            'sys/sys/_cpuset.h',
             'sys/sys/ctype.h',
             'sys/sys/domain.h',
             'sys/sys/eventhandler.h',
+            'sys/sys/fail.h',
             'sys/sys/filedesc.h',
             'sys/sys/file.h',
             'sys/sys/fnv_hash.h',
+            'sys/sys/gpio.h',
             'sys/sys/hash.h',
             'sys/sys/hhook.h',
             'sys/sys/interrupt.h',
@@ -237,6 +247,7 @@ def base(mm):
             'sys/sys/kobj.h',
             'sys/sys/kthread.h',
             'sys/sys/ktr.h',
+            'sys/sys/ktr_class.h',
             'sys/sys/libkern.h',
             'sys/sys/limits.h',
             'sys/sys/linker.h',
@@ -258,6 +269,7 @@ def base(mm):
             'sys/sys/_null.h',
             'sys/sys/osd.h',
             'sys/sys/pcpu.h',
+            'sys/sys/_pctrie.h',
             'sys/sys/pipe.h',
             'sys/sys/priv.h',
             'sys/sys/proc.h',
@@ -278,8 +290,10 @@ def base(mm):
             'sys/sys/sdt.h',
             'sys/sys/selinfo.h',
             'sys/sys/_semaphore.h',
+            'sys/sys/seq.h',
             'sys/sys/sf_buf.h',
             'sys/sys/sigio.h',
+            'sys/sys/signalvar.h',
             'sys/sys/smp.h',
             'sys/sys/sleepqueue.h',
             'sys/sys/_sockaddr_storage.h',
@@ -305,6 +319,8 @@ def base(mm):
             'sys/sys/ucred.h',
             'sys/sys/un.h',
             'sys/sys/unpcb.h',
+            'sys/sys/_unrhdr.h',
+            'sys/sys/uuid.h',
             'sys/sys/vmmeter.h',
             'sys/sys/vnode.h',
             'sys/vm/uma_dbg.h',
@@ -333,14 +349,17 @@ def base(mm):
             'sys/kern/kern_sysctl.c',
             'sys/kern/kern_time.c',
             'sys/kern/kern_timeout.c',
+            'sys/kern/kern_uuid.c',
             'sys/kern/subr_bufring.c',
             'sys/kern/subr_bus.c',
+            'sys/kern/subr_counter.c',
             'sys/kern/subr_eventhandler.c',
             'sys/kern/subr_hash.c',
             'sys/kern/subr_hints.c',
             'sys/kern/subr_kobj.c',
             'sys/kern/subr_lock.c',
             'sys/kern/subr_module.c',
+            'sys/kern/subr_pcpu.c',
             'sys/kern/subr_prf.c',
             'sys/kern/subr_rman.c',
             'sys/kern/subr_sbuf.c',
@@ -354,13 +373,14 @@ def base(mm):
             'sys/kern/uipc_domain.c',
             'sys/kern/uipc_mbuf2.c',
             'sys/kern/uipc_mbuf.c',
+            'sys/kern/uipc_mbufhash.c',
             'sys/kern/uipc_sockbuf.c',
             'sys/kern/uipc_socket.c',
             'sys/kern/uipc_usrreq.c',
             'sys/libkern/bcd.c',
-            'sys/libkern/arc4random.c',
-            'sys/libkern/fls.c',
             'sys/libkern/inet_ntoa.c',
+            'sys/libkern/jenkins_hash.c',
+            'sys/libkern/murmur3_32.c',
             'sys/libkern/random.c',
             'sys/vm/uma_core.c',
             'sys/vm/uma_dbg.c',
@@ -795,11 +815,13 @@ def cam(mm):
     mod = builder.Module('cam')
     mod.addKernelSpaceHeaderFiles(
         [
+            'sys/dev/nvme/nvme.h',
             'sys/sys/ata.h',
             'sys/cam/cam.h',
             'sys/cam/cam_ccb.h',
             'sys/cam/cam_sim.h',
             'sys/cam/cam_xpt_sim.h',
+            'sys/cam/nvme/nvme_all.h',
             'sys/cam/scsi/scsi_all.h',
             'sys/cam/scsi/scsi_da.h',
             'sys/cam/ata/ata_all.h',
@@ -838,6 +860,7 @@ def dev_net(mm):
             'sys/net/if_dl.h',
             'sys/net/if.h',
             'sys/net/if_media.h',
+            'sys/net/ifq.h',
             'sys/net/if_types.h',
             'sys/net/if_var.h',
             'sys/net/vnet.h',
@@ -846,6 +869,7 @@ def dev_net(mm):
             'sys/dev/tsec/if_tsecreg.h',
             'sys/dev/cadence/if_cgem_hw.h',
             'sys/dev/dwc/if_dwc.h',
+            'sys/dev/dwc/if_dwcvar.h',
             'sys/arm/xilinx/zy7_slcr.h',
         ]
     )
@@ -878,7 +902,6 @@ def dev_nic(mm):
     mod.addKernelSpaceHeaderFiles(
         [
             'sys/sys/pciio.h',
-            'sys/dev/random/randomdev_soft.h',
             'sys/sys/eventvar.h',
             'sys/sys/kenv.h',
             'sys/isa/isavar.h',
@@ -912,7 +935,6 @@ def dev_nic(mm):
     )
     mod.addKernelSpaceSourceFiles(
         [
-            'sys/dev/random/harvest.c',
             'sys/netinet/tcp_hostcache.c',
             'sys/dev/led/led.c',
         ],
@@ -927,7 +949,7 @@ def dev_nic_re(mm):
     mod = builder.Module('dev_nic_re')
     mod.addKernelSpaceHeaderFiles(
         [
-            'sys/pci/if_rlreg.h',
+            'sys/dev/rl/if_rlreg.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
@@ -1132,7 +1154,6 @@ def net(mm):
             'sys/net/if_media.h',
             'sys/net/if_mib.h',
             'sys/net/if_sppp.h',
-            'sys/net/if_stf.h',
             'sys/net/if_tap.h',
             'sys/net/if_tapvar.h',
             'sys/net/if_tun.h',
@@ -1149,8 +1170,13 @@ def net(mm):
             'sys/net/radix_mpath.h',
             'sys/net/raw_cb.h',
             'sys/net/route.h',
+            'sys/net/route_var.h',
+            'sys/net/rss_config.h',
+            'sys/net/sff8436.h',
+            'sys/net/sff8472.h',
             'sys/net/slcompress.h',
             'sys/net/vnet.h',
+            'sys/netgraph/ng_socket.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
@@ -1165,10 +1191,8 @@ def net(mm):
             'sys/net/if_dead.c',
             'sys/net/if_disc.c',
             'sys/net/if_edsc.c',
-            'sys/net/if_ef.c',
             'sys/net/if_enc.c',
             'sys/net/if_epair.c',
-            'sys/net/if_faith.c',
             'sys/net/if_fddisubr.c',
             'sys/net/if_fwsubr.c',
             'sys/net/if_gif.c',
@@ -1212,17 +1236,19 @@ def netinet(mm):
     mod = builder.Module('netinet')
     mod.addKernelSpaceHeaderFiles(
         [
-            'sys/netinet/cc.h',
+            'sys/netinet/cc/cc.h',
             'sys/netinet/cc/cc_module.h',
+            'sys/netinet/in_fib.h',
             'sys/netinet/icmp6.h',
             'sys/netinet/icmp_var.h',
             'sys/netinet/if_atm.h',
             'sys/netinet/if_ether.h',
             'sys/netinet/igmp.h',
             'sys/netinet/igmp_var.h',
-            'sys/netinet/in_gif.h',
             'sys/netinet/in.h',
+            'sys/netinet/in_kdtrace.h',
             'sys/netinet/in_pcb.h',
+            'sys/netinet/in_rss.h',
             'sys/netinet/in_systm.h',
             'sys/netinet/in_var.h',
             'sys/netinet/ip6.h',
@@ -1232,17 +1258,12 @@ def netinet(mm):
             'sys/netinet/ip_ecn.h',
             'sys/netinet/ip_encap.h',
             'sys/netinet/ip_fw.h',
-            'sys/netinet/ip_gre.h',
             'sys/netinet/ip.h',
             'sys/netinet/ip_icmp.h',
             'sys/netinet/ip_ipsec.h',
             'sys/netinet/ip_mroute.h',
             'sys/netinet/ip_options.h',
             'sys/netinet/ip_var.h',
-            'sys/netpfil/ipfw/dn_heap.h',
-            'sys/netpfil/ipfw/dn_sched.h',
-            'sys/netpfil/ipfw/ip_dn_private.h',
-            'sys/netpfil/ipfw/ip_fw_private.h',
             'sys/netinet/pim.h',
             'sys/netinet/pim_var.h',
             'sys/netinet/sctp_asconf.h',
@@ -1281,6 +1302,7 @@ def netinet(mm):
             'sys/netinet/tcp_var.h',
             'sys/netinet/toecore.h',
             'sys/netinet/udp.h',
+            'sys/netinet/udplite.h',
             'sys/netinet/udp_var.h',
             'sys/netinet/libalias/alias_local.h',
             'sys/netinet/libalias/alias.h',
@@ -1300,6 +1322,7 @@ def netinet(mm):
             'sys/netinet/if_ether.c',
             'sys/netinet/igmp.c',
             'sys/netinet/in.c',
+            'sys/netinet/in_fib.c',
             'sys/netinet/in_gif.c',
             'sys/netinet/in_mcast.c',
             'sys/netinet/in_pcb.c',
@@ -1317,6 +1340,7 @@ def netinet(mm):
             'sys/netinet/ip_mroute.c',
             'sys/netinet/ip_options.c',
             'sys/netinet/ip_output.c',
+            'sys/netinet/ip_reass.c',
             'sys/netinet/raw_ip.c',
             'sys/netinet/sctp_asconf.c',
             'sys/netinet/sctp_auth.c',
@@ -1345,22 +1369,6 @@ def netinet(mm):
             'sys/netinet/tcp_timer.c',
             'sys/netinet/tcp_timewait.c',
             'sys/netinet/tcp_usrreq.c',
-            'sys/netpfil/ipfw/dn_heap.c',
-            'sys/netpfil/ipfw/dn_sched_fifo.c',
-            'sys/netpfil/ipfw/dn_sched_prio.c',
-            'sys/netpfil/ipfw/dn_sched_qfq.c',
-            'sys/netpfil/ipfw/dn_sched_rr.c',
-            'sys/netpfil/ipfw/dn_sched_wf2q.c',
-            'sys/netpfil/ipfw/ip_dn_glue.c',
-            'sys/netpfil/ipfw/ip_dn_io.c',
-            'sys/netpfil/ipfw/ip_dummynet.c',
-            'sys/netpfil/ipfw/ip_fw2.c',
-            #'sys/netpfil/ipfw/ip_fw_dynamic.c',
-            'sys/netpfil/ipfw/ip_fw_log.c',
-            'sys/netpfil/ipfw/ip_fw_nat.c',
-            'sys/netpfil/ipfw/ip_fw_pfil.c',
-            'sys/netpfil/ipfw/ip_fw_sockopt.c',
-            'sys/netpfil/ipfw/ip_fw_table.c',
             'sys/netinet/udp_usrreq.c',
             'sys/netinet/libalias/alias_dummy.c',
             'sys/netinet/libalias/alias_pptp.c',
@@ -1389,10 +1397,11 @@ def netinet6(mm):
     mod.addKernelSpaceHeaderFiles(
         [
             'sys/netinet6/icmp6.h',
-            'sys/netinet6/in6_gif.h',
+            'sys/netinet6/in6_fib.h',
             'sys/netinet6/in6.h',
             'sys/netinet6/in6_ifattach.h',
             'sys/netinet6/in6_pcb.h',
+            'sys/netinet6/in6_rss.h',
             'sys/netinet6/in6_var.h',
             'sys/netinet6/ip6_ecn.h',
             'sys/netinet6/ip6.h',
@@ -1421,6 +1430,7 @@ def netinet6(mm):
             'sys/netinet6/icmp6.c',
             'sys/netinet6/in6.c',
             'sys/netinet6/in6_cksum.c',
+            'sys/netinet6/in6_fib.c',
             'sys/netinet6/in6_gif.c',
             'sys/netinet6/in6_ifattach.c',
             'sys/netinet6/in6_mcast.c',
@@ -1582,26 +1592,34 @@ def opencrypto(mm):
     mod = builder.Module('opencrypto')
     mod.addKernelSpaceHeaderFiles(
         [
-            'sys/opencrypto/deflate.h',
-            'sys/opencrypto/xform.h',
+            'sys/opencrypto/cast.h',
+            'sys/opencrypto/castsb.h',
+            'sys/opencrypto/cryptodev.h',
             'sys/opencrypto/cryptosoft.h',
+            'sys/opencrypto/deflate.h',
+            'sys/opencrypto/gfmult.h',
+            'sys/opencrypto/gmac.h',
             'sys/opencrypto/rmd160.h',
-            'sys/opencrypto/cryptodev.h',
-            'sys/opencrypto/castsb.h',
             'sys/opencrypto/skipjack.h',
-            'sys/opencrypto/cast.h',
+            'sys/opencrypto/xform_auth.h',
+            'sys/opencrypto/xform_comp.h',
+            'sys/opencrypto/xform_enc.h',
+            'sys/opencrypto/xform.h',
+            'sys/opencrypto/xform_userland.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
         [
-      'sys/opencrypto/crypto.c',
-            'sys/opencrypto/deflate.c',
-            'sys/opencrypto/cryptosoft.c',
+            'sys/opencrypto/cast.c',
             'sys/opencrypto/criov.c',
+            'sys/opencrypto/crypto.c',
+            'sys/opencrypto/cryptodeflate.c',
+            'sys/opencrypto/cryptosoft.c',
+            'sys/opencrypto/gfmult.c',
+            'sys/opencrypto/gmac.c',
             'sys/opencrypto/rmd160.c',
-            'sys/opencrypto/xform.c',
             'sys/opencrypto/skipjack.c',
-            'sys/opencrypto/cast.c',
+            'sys/opencrypto/xform.c',
         ],
         mm.generator['source']()
     )
@@ -1614,46 +1632,52 @@ def crypto(mm):
     mod = builder.Module('crypto')
     mod.addKernelSpaceHeaderFiles(
         [
-            #'crypto/aesni/aesni.h',
+            'sys/crypto/skein/skein_iv.h',
+            'sys/crypto/skein/skein_freebsd.h',
+            'sys/crypto/skein/skein.h',
+            'sys/crypto/skein/skein_debug.h',
+            'sys/crypto/skein/skein_port.h',
+            'sys/crypto/rc4/rc4.h',
+            'sys/crypto/sha2/sha384.h',
+            'sys/crypto/sha2/sha256.h',
+            'sys/crypto/sha2/sha512t.h',
+            'sys/crypto/sha2/sha512.h',
             'sys/crypto/sha1.h',
-            'sys/crypto/sha2/sha2.h',
-            'sys/crypto/rijndael/rijndael.h',
-            'sys/crypto/rijndael/rijndael_local.h',
+            'sys/crypto/siphash/siphash.h',
             'sys/crypto/rijndael/rijndael-api-fst.h',
-            'sys/crypto/des/des.h',
+            'sys/crypto/rijndael/rijndael_local.h',
+            'sys/crypto/rijndael/rijndael.h',
+            'sys/crypto/camellia/camellia.h',
             'sys/crypto/des/spr.h',
+            'sys/crypto/des/des_locl.h',
+            'sys/crypto/des/des.h',
             'sys/crypto/des/podd.h',
             'sys/crypto/des/sk.h',
-            'sys/crypto/des/des_locl.h',
             'sys/crypto/blowfish/bf_pi.h',
-            'sys/crypto/blowfish/bf_locl.h',
             'sys/crypto/blowfish/blowfish.h',
-            'sys/crypto/rc4/rc4.h',
-            #'crypto/via/padlock.h',
-            'sys/crypto/camellia/camellia.h',
+            'sys/crypto/blowfish/bf_locl.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
         [
-            #'crypto/aesni/aesni.c',
-            #'crypto/aesni/aesni_wrap.c',
+            'sys/crypto/skein/skein_block.c',
+            'sys/crypto/skein/skein.c',
+            'sys/crypto/rc4/rc4.c',
+            'sys/crypto/sha2/sha256c.c',
+            'sys/crypto/sha2/sha512c.c',
+            'sys/crypto/siphash/siphash.c',
             'sys/crypto/sha1.c',
-            'sys/crypto/sha2/sha2.c',
-            'sys/crypto/rijndael/rijndael-alg-fst.c',
             'sys/crypto/rijndael/rijndael-api.c',
+            'sys/crypto/rijndael/rijndael-alg-fst.c',
             'sys/crypto/rijndael/rijndael-api-fst.c',
-            'sys/crypto/des/des_setkey.c',
+            'sys/crypto/camellia/camellia-api.c',
+            'sys/crypto/camellia/camellia.c',
             'sys/crypto/des/des_enc.c',
+            'sys/crypto/des/des_setkey.c',
             'sys/crypto/des/des_ecb.c',
-            'sys/crypto/blowfish/bf_enc.c',
             'sys/crypto/blowfish/bf_skey.c',
+            'sys/crypto/blowfish/bf_enc.c',
             'sys/crypto/blowfish/bf_ecb.c',
-            'sys/crypto/rc4/rc4.c',
-            #'crypto/via/padlock.c',
-            #'crypto/via/padlock_cipher.c',
-            #'crypto/via/padlock_hash.c',
-            'sys/crypto/camellia/camellia-api.c',
-            'sys/crypto/camellia/camellia.c',
         ],
         mm.generator['source']()
     )
@@ -1666,31 +1690,34 @@ def altq(mm):
     mod = builder.Module('altq')
     mod.addKernelSpaceHeaderFiles(
         [
-            'sys/contrib/altq/altq/altq_rmclass.h',
-            'sys/contrib/altq/altq/altq_cbq.h',
-            'sys/contrib/altq/altq/altq_var.h',
-            'sys/contrib/altq/altq/altqconf.h',
-            'sys/contrib/altq/altq/altq.h',
-            'sys/contrib/altq/altq/altq_hfsc.h',
-            'sys/contrib/altq/altq/altq_red.h',
-            'sys/contrib/altq/altq/altq_classq.h',
-            'sys/contrib/altq/altq/altq_priq.h',
-            'sys/contrib/altq/altq/altq_rmclass_debug.h',
-            'sys/contrib/altq/altq/altq_cdnr.h',
-            'sys/contrib/altq/altq/altq_rio.h',
-            'sys/contrib/altq/altq/if_altq.h',
+            'sys/net/altq/altq_cbq.h',
+            'sys/net/altq/altq_cdnr.h',
+            'sys/net/altq/altq_classq.h',
+            'sys/net/altq/altq_codel.h',
+            'sys/net/altq/altq_fairq.h',
+            'sys/net/altq/altq.h',
+            'sys/net/altq/altq_hfsc.h',
+            'sys/net/altq/altq_priq.h',
+            'sys/net/altq/altq_red.h',
+            'sys/net/altq/altq_rio.h',
+            'sys/net/altq/altq_rmclass_debug.h',
+            'sys/net/altq/altq_rmclass.h',
+            'sys/net/altq/altq_var.h',
+            'sys/net/altq/if_altq.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
         [
-            'sys/contrib/altq/altq/altq_rmclass.c',
-            'sys/contrib/altq/altq/altq_rio.c',
-            'sys/contrib/altq/altq/altq_subr.c',
-            'sys/contrib/altq/altq/altq_cdnr.c',
-            'sys/contrib/altq/altq/altq_priq.c',
-            'sys/contrib/altq/altq/altq_cbq.c',
-            'sys/contrib/altq/altq/altq_hfsc.c',
-            'sys/contrib/altq/altq/altq_red.c',
+            'sys/net/altq/altq_cbq.c',
+            'sys/net/altq/altq_cdnr.c',
+            'sys/net/altq/altq_codel.c',
+            'sys/net/altq/altq_fairq.c',
+            'sys/net/altq/altq_hfsc.c',
+            'sys/net/altq/altq_priq.c',
+            'sys/net/altq/altq_red.c',
+            'sys/net/altq/altq_rio.c',
+            'sys/net/altq/altq_rmclass.c',
+            'sys/net/altq/altq_subr.c',
         ],
         mm.generator['source']()
     )
@@ -1703,26 +1730,77 @@ def pf(mm):
     mod = builder.Module('pf')
     mod.addKernelSpaceHeaderFiles(
         [
-            'sys/contrib/pf/net/if_pflog.h',
-            'sys/contrib/pf/net/if_pflow.h',
-            'sys/contrib/pf/net/if_pfsync.h',
-            'sys/contrib/pf/net/pfvar.h',
-            'sys/contrib/pf/net/pf_mtag.h',
+            'sys/net/if_pflog.h',
+            'sys/net/if_pfsync.h',
+            'sys/net/pfvar.h',
+            'sys/netpfil/pf/pf_altq.h',
+            'sys/netpfil/pf/pf.h',
+            'sys/netpfil/pf/pf_mtag.h',
+        ]
+    )
+    mod.addKernelSpaceSourceFiles(
+        [
+            'sys/netpfil/pf/if_pflog.c',
+            'sys/netpfil/pf/if_pfsync.c',
+            'sys/netpfil/pf/in4_cksum.c',
+            'sys/netpfil/pf/pf.c',
+            'sys/netpfil/pf/pf_if.c',
+            'sys/netpfil/pf/pf_ioctl.c',
+            'sys/netpfil/pf/pf_lb.c',
+            'sys/netpfil/pf/pf_norm.c',
+            'sys/netpfil/pf/pf_osfp.c',
+            'sys/netpfil/pf/pf_ruleset.c',
+            'sys/netpfil/pf/pf_table.c',
+        ],
+        mm.generator['source']()
+    )
+    return mod
+
+def ipfw(mm):
+    mod = builder.Module('ipfw')
+    mod.addKernelSpaceHeaderFiles(
+        [
+            'sys/netinet6/ip_fw_nat64.h',
+            'sys/netinet6/ip_fw_nptv6.h',
+            'sys/netpfil/ipfw/dn_aqm_codel.h',
+            'sys/netpfil/ipfw/dn_aqm.h',
+            'sys/netpfil/ipfw/dn_aqm_pie.h',
+            'sys/netpfil/ipfw/dn_heap.h',
+            'sys/netpfil/ipfw/dn_sched_fq_codel.h',
+            'sys/netpfil/ipfw/dn_sched_fq_codel_helper.h',
+            'sys/netpfil/ipfw/dn_sched.h',
+            'sys/netpfil/ipfw/ip_dn_private.h',
+            'sys/netpfil/ipfw/ip_fw_private.h',
+            'sys/netpfil/ipfw/ip_fw_table.h',
+            'sys/netpfil/ipfw/nat64/ip_fw_nat64.h',
+            'sys/netpfil/ipfw/nat64/nat64lsn.h',
+            'sys/netpfil/ipfw/nat64/nat64stl.h',
+            'sys/netpfil/ipfw/nat64/nat64_translate.h',
+            'sys/netpfil/ipfw/nptv6/nptv6.h',
         ]
     )
     mod.addKernelSpaceSourceFiles(
         [
-            'sys/contrib/pf/net/if_pflog.c',
-            'sys/contrib/pf/net/if_pfsync.c',
-            'sys/contrib/pf/net/pf.c',
-            'sys/contrib/pf/net/pf_if.c',
-            'sys/contrib/pf/net/pf_ioctl.c',
-            'sys/contrib/pf/net/pf_lb.c',
-            'sys/contrib/pf/net/pf_norm.c',
-            'sys/contrib/pf/net/pf_osfp.c',
-            'sys/contrib/pf/net/pf_ruleset.c',
-            'sys/contrib/pf/net/pf_table.c',
-            'sys/contrib/pf/netinet/in4_cksum.c',
+            'sys/netpfil/ipfw/ip_fw2.c',
+            'sys/netpfil/ipfw/ip_fw_bpf.c',
+            'sys/netpfil/ipfw/ip_fw_dynamic.c',
+            'sys/netpfil/ipfw/ip_fw_eaction.c',
+            'sys/netpfil/ipfw/ip_fw_iface.c',
+            'sys/netpfil/ipfw/ip_fw_log.c',
+            'sys/netpfil/ipfw/ip_fw_nat.c',
+            'sys/netpfil/ipfw/ip_fw_pfil.c',
+            'sys/netpfil/ipfw/ip_fw_sockopt.c',
+            'sys/netpfil/ipfw/ip_fw_table_algo.c',
+            'sys/netpfil/ipfw/ip_fw_table.c',
+            'sys/netpfil/ipfw/ip_fw_table_value.c',
+            'sys/netpfil/ipfw/nat64/ip_fw_nat64.c',
+            'sys/netpfil/ipfw/nat64/nat64lsn.c',
+            'sys/netpfil/ipfw/nat64/nat64lsn_control.c',
+            'sys/netpfil/ipfw/nat64/nat64stl.c',
+            'sys/netpfil/ipfw/nat64/nat64stl_control.c',
+            'sys/netpfil/ipfw/nat64/nat64_translate.c',
+            'sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c',
+            'sys/netpfil/ipfw/nptv6/nptv6.c',
         ],
         mm.generator['source']()
     )
@@ -1775,8 +1853,13 @@ def user_space(mm):
     mod = builder.Module('user_space')
     mod.addUserSpaceHeaderFiles(
         [
-            'contrib/pf/pfctl/pfctl.h',
-            'contrib/pf/pfctl/pfctl_parser.h',
+            'contrib/libxo/libxo/xo_buf.h',
+            'contrib/libxo/libxo/xo_encoder.h',
+            'contrib/libxo/libxo/xo.h',
+            'contrib/libxo/libxo/xo_humanize.h',
+            'contrib/libxo/libxo/xo_wcwidth.h',
+            'sbin/pfctl/pfctl.h',
+            'sbin/pfctl/pfctl_parser.h',
             'include/arpa/ftp.h',
             'include/arpa/inet.h',
             'include/arpa/nameser_compat.h',
@@ -1861,7 +1944,6 @@ def user_space(mm):
             'sbin/dhclient/privsep.h',
             'sbin/dhclient/tree.h',
             'sbin/ifconfig/ifconfig.h',
-            'sbin/ifconfig/regdomain.h',
             'usr.bin/netstat/netstat.h'
         ]
     )
@@ -1880,7 +1962,7 @@ def user_space(mm):
                                      mm.generator['convert'](),
                                      mm.generator['convert'](),
                                      mm.generator['route-keywords']()))
-    mod.addFile(mm.generator['file']('contrib/pf/pfctl/parse.y',
+    mod.addFile(mm.generator['file']('sbin/pfctl/parse.y',
                                      mm.generator['freebsd-path'](),
                                      mm.generator['convert'](),
                                      mm.generator['convert'](),
@@ -1918,15 +2000,8 @@ def user_space(mm):
     mod.addUserSpaceSourceFiles(
         [
             'bin/hostname/hostname.c',
-            'contrib/pf/pfctl/pfctl_altq.c',
-            'contrib/pf/pfctl/pfctl.c',
-            'contrib/pf/pfctl/pfctl_optimize.c',
-            'contrib/pf/pfctl/pfctl_osfp.c',
-            'contrib/pf/pfctl/pfctl_parser.c',
-            'contrib/pf/pfctl/pfctl_qstats.c',
-            'contrib/pf/pfctl/pfctl_radix.c',
-            'contrib/pf/pfctl/pfctl_table.c',
-            'contrib/pf/pfctl/pf_print_state.c',
+            'contrib/libxo/libxo/libxo.c',
+            'contrib/libxo/libxo/xo_encoder.c',
             'lib/libc/gen/err.c',
             'lib/libc/gen/feature_present.c',
             'lib/libc/gen/getdomainname.c',
@@ -2102,7 +2177,6 @@ def user_space(mm):
             'sbin/ifconfig/af_link.c',
             'sbin/ifconfig/af_nd6.c',
             'sbin/ifconfig/ifbridge.c',
-            'sbin/ifconfig/ifcarp.c',
             'sbin/ifconfig/ifclone.c',
             'sbin/ifconfig/ifconfig.c',
             'sbin/ifconfig/ifgif.c',
@@ -2113,15 +2187,27 @@ def user_space(mm):
             'sbin/ifconfig/ifmedia.c',
             'sbin/ifconfig/ifpfsync.c',
             'sbin/ifconfig/ifvlan.c',
+            'sbin/ifconfig/sfp.c',
+            'sbin/pfctl/pfctl_altq.c',
+            'sbin/pfctl/pfctl.c',
+            'sbin/pfctl/pfctl_optimize.c',
+            'sbin/pfctl/pfctl_osfp.c',
+            'sbin/pfctl/pfctl_parser.c',
+            'sbin/pfctl/pfctl_qstats.c',
+            'sbin/pfctl/pfctl_radix.c',
+            'sbin/pfctl/pfctl_table.c',
+            'sbin/pfctl/pf_print_state.c',
             'sbin/ping6/ping6.c',
             'sbin/ping/ping.c',
             'sbin/route/route.c',
             'sbin/sysctl/sysctl.c',
             'usr.bin/netstat/bpf.c',
+            'usr.bin/netstat/flowtable.c',
             'usr.bin/netstat/if.c',
             'usr.bin/netstat/inet6.c',
             'usr.bin/netstat/inet.c',
             'usr.bin/netstat/ipsec.c',
+            'usr.bin/netstat/nl_symbols.c',
             'usr.bin/netstat/main.c',
             'usr.bin/netstat/mbuf.c',
             'usr.bin/netstat/mroute6.c',
@@ -2131,7 +2217,7 @@ def user_space(mm):
             'usr.bin/netstat/sctp.c',
             'usr.bin/netstat/unix.c',
         ],
-        mm.generator['source']('-DINET6')
+        mm.generator['source'](['-DINET6', '-DINET'])
     )
     return mod
 
@@ -2683,6 +2769,7 @@ def sources(mm):
     mm.addModule(crypto(mm))
     mm.addModule(altq(mm))
     mm.addModule(pf(mm))
+    mm.addModule(ipfw(mm))
     mm.addModule(dev_net(mm))
 
     # Add PCI