Date: Tue, 21 Apr 2015 09:47:28 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281822 - in projects/ifnet: . bin/ed bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/dtrace contrib/bmake contrib/bmake/PSD.doc contrib/bmake/lst.lib contrib/bmake/mk contrib... Message-ID: <201504210947.t3L9lSwe068807@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Apr 21 09:47:27 2015 New Revision: 281822 URL: https://svnweb.freebsd.org/changeset/base/281822 Log: Merge head r257698 through r281821. Added: projects/ifnet/bin/sh/tests/builtins/trap15.0 - copied unchanged from r281821, head/bin/sh/tests/builtins/trap15.0 projects/ifnet/bin/sh/tests/builtins/trap16.0 - copied unchanged from r281821, head/bin/sh/tests/builtins/trap16.0 projects/ifnet/contrib/bmake/mk/cython.mk - copied unchanged from r281821, head/contrib/bmake/mk/cython.mk projects/ifnet/contrib/bmake/mk/manifest.mk - copied unchanged from r281821, head/contrib/bmake/mk/manifest.mk projects/ifnet/contrib/bmake/mk/mkopt.sh - copied unchanged from r281821, head/contrib/bmake/mk/mkopt.sh projects/ifnet/contrib/bmake/mk/whats.mk - copied unchanged from r281821, head/contrib/bmake/mk/whats.mk projects/ifnet/contrib/bmake/unit-tests/comment.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/comment.exp projects/ifnet/contrib/bmake/unit-tests/comment.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/comment.mk projects/ifnet/contrib/bmake/unit-tests/cond1.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/cond1.exp projects/ifnet/contrib/bmake/unit-tests/cond1.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/cond1.mk projects/ifnet/contrib/bmake/unit-tests/doterror.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/doterror.exp projects/ifnet/contrib/bmake/unit-tests/doterror.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/doterror.mk projects/ifnet/contrib/bmake/unit-tests/dotwait.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/dotwait.exp projects/ifnet/contrib/bmake/unit-tests/dotwait.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/dotwait.mk projects/ifnet/contrib/bmake/unit-tests/error.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/error.exp projects/ifnet/contrib/bmake/unit-tests/error.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/error.mk projects/ifnet/contrib/bmake/unit-tests/escape.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/escape.exp projects/ifnet/contrib/bmake/unit-tests/escape.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/escape.mk projects/ifnet/contrib/bmake/unit-tests/export-all.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/export-all.exp projects/ifnet/contrib/bmake/unit-tests/export-all.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/export-all.mk projects/ifnet/contrib/bmake/unit-tests/export-env.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/export-env.exp projects/ifnet/contrib/bmake/unit-tests/export-env.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/export-env.mk projects/ifnet/contrib/bmake/unit-tests/export.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/export.exp projects/ifnet/contrib/bmake/unit-tests/export.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/export.mk projects/ifnet/contrib/bmake/unit-tests/forloop.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/forloop.exp projects/ifnet/contrib/bmake/unit-tests/forloop.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/forloop.mk projects/ifnet/contrib/bmake/unit-tests/forsubst.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/forsubst.exp projects/ifnet/contrib/bmake/unit-tests/forsubst.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/forsubst.mk projects/ifnet/contrib/bmake/unit-tests/hash.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/hash.exp projects/ifnet/contrib/bmake/unit-tests/hash.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/hash.mk projects/ifnet/contrib/bmake/unit-tests/impsrc.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/impsrc.exp projects/ifnet/contrib/bmake/unit-tests/impsrc.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/impsrc.mk projects/ifnet/contrib/bmake/unit-tests/misc.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/misc.exp projects/ifnet/contrib/bmake/unit-tests/misc.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/misc.mk projects/ifnet/contrib/bmake/unit-tests/moderrs.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/moderrs.exp projects/ifnet/contrib/bmake/unit-tests/moderrs.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/moderrs.mk projects/ifnet/contrib/bmake/unit-tests/modmatch.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/modmatch.exp projects/ifnet/contrib/bmake/unit-tests/modmatch.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/modmatch.mk projects/ifnet/contrib/bmake/unit-tests/modmisc.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/modmisc.exp projects/ifnet/contrib/bmake/unit-tests/modmisc.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/modmisc.mk projects/ifnet/contrib/bmake/unit-tests/modorder.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/modorder.exp projects/ifnet/contrib/bmake/unit-tests/modorder.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/modorder.mk projects/ifnet/contrib/bmake/unit-tests/modts.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/modts.exp projects/ifnet/contrib/bmake/unit-tests/modts.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/modts.mk projects/ifnet/contrib/bmake/unit-tests/modword.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/modword.exp projects/ifnet/contrib/bmake/unit-tests/modword.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/modword.mk projects/ifnet/contrib/bmake/unit-tests/order.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/order.exp projects/ifnet/contrib/bmake/unit-tests/order.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/order.mk projects/ifnet/contrib/bmake/unit-tests/phony-end.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/phony-end.exp projects/ifnet/contrib/bmake/unit-tests/phony-end.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/phony-end.mk projects/ifnet/contrib/bmake/unit-tests/posix.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/posix.exp projects/ifnet/contrib/bmake/unit-tests/posix.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/posix.mk projects/ifnet/contrib/bmake/unit-tests/posix1.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/posix1.exp projects/ifnet/contrib/bmake/unit-tests/posix1.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/posix1.mk projects/ifnet/contrib/bmake/unit-tests/qequals.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/qequals.exp projects/ifnet/contrib/bmake/unit-tests/qequals.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/qequals.mk projects/ifnet/contrib/bmake/unit-tests/suffixes.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/suffixes.exp projects/ifnet/contrib/bmake/unit-tests/suffixes.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/suffixes.mk projects/ifnet/contrib/bmake/unit-tests/sunshcmd.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/sunshcmd.exp projects/ifnet/contrib/bmake/unit-tests/sunshcmd.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/sunshcmd.mk projects/ifnet/contrib/bmake/unit-tests/sysv.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/sysv.exp projects/ifnet/contrib/bmake/unit-tests/sysv.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/sysv.mk projects/ifnet/contrib/bmake/unit-tests/ternary.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/ternary.exp projects/ifnet/contrib/bmake/unit-tests/ternary.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/ternary.mk projects/ifnet/contrib/bmake/unit-tests/unexport-env.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/unexport-env.exp projects/ifnet/contrib/bmake/unit-tests/unexport-env.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/unexport-env.mk projects/ifnet/contrib/bmake/unit-tests/unexport.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/unexport.exp projects/ifnet/contrib/bmake/unit-tests/unexport.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/unexport.mk projects/ifnet/contrib/bmake/unit-tests/varcmd.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/varcmd.exp projects/ifnet/contrib/bmake/unit-tests/varcmd.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/varcmd.mk projects/ifnet/contrib/bmake/unit-tests/varmisc.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/varmisc.exp projects/ifnet/contrib/bmake/unit-tests/varmisc.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/varmisc.mk projects/ifnet/contrib/bmake/unit-tests/varshell.exp - copied unchanged from r281821, head/contrib/bmake/unit-tests/varshell.exp projects/ifnet/contrib/bmake/unit-tests/varshell.mk - copied unchanged from r281821, head/contrib/bmake/unit-tests/varshell.mk projects/ifnet/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff - copied unchanged from r281821, head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff projects/ifnet/contrib/wpa/CONTRIBUTIONS - copied unchanged from r281821, head/contrib/wpa/CONTRIBUTIONS projects/ifnet/contrib/wpa/hostapd/hapd_module_tests.c - copied unchanged from r281821, head/contrib/wpa/hostapd/hapd_module_tests.c projects/ifnet/contrib/wpa/hostapd/wps-ap-nfc.py - copied unchanged from r281821, head/contrib/wpa/hostapd/wps-ap-nfc.py projects/ifnet/contrib/wpa/hs20/ - copied from r281821, head/contrib/wpa/hs20/ projects/ifnet/contrib/wpa/patches/openssl-0.9.8za-tls-extensions.patch - copied unchanged from r281821, head/contrib/wpa/patches/openssl-0.9.8za-tls-extensions.patch projects/ifnet/contrib/wpa/src/ap/acs.c - copied unchanged from r281821, head/contrib/wpa/src/ap/acs.c projects/ifnet/contrib/wpa/src/ap/acs.h - copied unchanged from r281821, head/contrib/wpa/src/ap/acs.h projects/ifnet/contrib/wpa/src/ap/bss_load.c - copied unchanged from r281821, head/contrib/wpa/src/ap/bss_load.c projects/ifnet/contrib/wpa/src/ap/bss_load.h - copied unchanged from r281821, head/contrib/wpa/src/ap/bss_load.h projects/ifnet/contrib/wpa/src/ap/dfs.c - copied unchanged from r281821, head/contrib/wpa/src/ap/dfs.c projects/ifnet/contrib/wpa/src/ap/dfs.h - copied unchanged from r281821, head/contrib/wpa/src/ap/dfs.h projects/ifnet/contrib/wpa/src/ap/dhcp_snoop.c - copied unchanged from r281821, head/contrib/wpa/src/ap/dhcp_snoop.c projects/ifnet/contrib/wpa/src/ap/dhcp_snoop.h - copied unchanged from r281821, head/contrib/wpa/src/ap/dhcp_snoop.h projects/ifnet/contrib/wpa/src/ap/ndisc_snoop.c - copied unchanged from r281821, head/contrib/wpa/src/ap/ndisc_snoop.c projects/ifnet/contrib/wpa/src/ap/ndisc_snoop.h - copied unchanged from r281821, head/contrib/wpa/src/ap/ndisc_snoop.h projects/ifnet/contrib/wpa/src/ap/x_snoop.c - copied unchanged from r281821, head/contrib/wpa/src/ap/x_snoop.c projects/ifnet/contrib/wpa/src/ap/x_snoop.h - copied unchanged from r281821, head/contrib/wpa/src/ap/x_snoop.h projects/ifnet/contrib/wpa/src/common/common_module_tests.c - copied unchanged from r281821, head/contrib/wpa/src/common/common_module_tests.c projects/ifnet/contrib/wpa/src/common/hw_features_common.c - copied unchanged from r281821, head/contrib/wpa/src/common/hw_features_common.c projects/ifnet/contrib/wpa/src/common/hw_features_common.h - copied unchanged from r281821, head/contrib/wpa/src/common/hw_features_common.h projects/ifnet/contrib/wpa/src/common/ieee802_1x_defs.h - copied unchanged from r281821, head/contrib/wpa/src/common/ieee802_1x_defs.h projects/ifnet/contrib/wpa/src/common/qca-vendor-attr.h - copied unchanged from r281821, head/contrib/wpa/src/common/qca-vendor-attr.h projects/ifnet/contrib/wpa/src/common/qca-vendor.h - copied unchanged from r281821, head/contrib/wpa/src/common/qca-vendor.h projects/ifnet/contrib/wpa/src/common/sae.c - copied unchanged from r281821, head/contrib/wpa/src/common/sae.c projects/ifnet/contrib/wpa/src/common/sae.h - copied unchanged from r281821, head/contrib/wpa/src/common/sae.h projects/ifnet/contrib/wpa/src/common/tnc.h - copied unchanged from r281821, head/contrib/wpa/src/common/tnc.h projects/ifnet/contrib/wpa/src/common/wpa_helpers.c - copied unchanged from r281821, head/contrib/wpa/src/common/wpa_helpers.c projects/ifnet/contrib/wpa/src/common/wpa_helpers.h - copied unchanged from r281821, head/contrib/wpa/src/common/wpa_helpers.h projects/ifnet/contrib/wpa/src/crypto/aes-siv.c - copied unchanged from r281821, head/contrib/wpa/src/crypto/aes-siv.c projects/ifnet/contrib/wpa/src/crypto/aes_siv.h - copied unchanged from r281821, head/contrib/wpa/src/crypto/aes_siv.h projects/ifnet/contrib/wpa/src/crypto/crypto_module_tests.c - copied unchanged from r281821, head/contrib/wpa/src/crypto/crypto_module_tests.c projects/ifnet/contrib/wpa/src/crypto/sha256-kdf.c - copied unchanged from r281821, head/contrib/wpa/src/crypto/sha256-kdf.c projects/ifnet/contrib/wpa/src/crypto/sha384.h - copied unchanged from r281821, head/contrib/wpa/src/crypto/sha384.h projects/ifnet/contrib/wpa/src/drivers/driver_macsec_qca.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_macsec_qca.c projects/ifnet/contrib/wpa/src/drivers/driver_nl80211.h - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_nl80211.h projects/ifnet/contrib/wpa/src/drivers/driver_nl80211_android.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_nl80211_android.c projects/ifnet/contrib/wpa/src/drivers/driver_nl80211_capa.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_nl80211_capa.c projects/ifnet/contrib/wpa/src/drivers/driver_nl80211_event.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_nl80211_event.c projects/ifnet/contrib/wpa/src/drivers/driver_nl80211_monitor.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_nl80211_monitor.c projects/ifnet/contrib/wpa/src/drivers/driver_nl80211_scan.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_nl80211_scan.c projects/ifnet/contrib/wpa/src/drivers/driver_openbsd.c - copied unchanged from r281821, head/contrib/wpa/src/drivers/driver_openbsd.c projects/ifnet/contrib/wpa/src/drivers/linux_defines.h - copied unchanged from r281821, head/contrib/wpa/src/drivers/linux_defines.h projects/ifnet/contrib/wpa/src/eap_common/eap_eke_common.c - copied unchanged from r281821, head/contrib/wpa/src/eap_common/eap_eke_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_eke_common.h - copied unchanged from r281821, head/contrib/wpa/src/eap_common/eap_eke_common.h projects/ifnet/contrib/wpa/src/eap_peer/eap_eke.c - copied unchanged from r281821, head/contrib/wpa/src/eap_peer/eap_eke.c projects/ifnet/contrib/wpa/src/eap_peer/eap_proxy.h - copied unchanged from r281821, head/contrib/wpa/src/eap_peer/eap_proxy.h projects/ifnet/contrib/wpa/src/eap_peer/eap_proxy_dummy.c - copied unchanged from r281821, head/contrib/wpa/src/eap_peer/eap_proxy_dummy.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_eke.c - copied unchanged from r281821, head/contrib/wpa/src/eap_server/eap_server_eke.c projects/ifnet/contrib/wpa/src/pae/ - copied from r281821, head/contrib/wpa/src/pae/ projects/ifnet/contrib/wpa/src/utils/bitfield.c - copied unchanged from r281821, head/contrib/wpa/src/utils/bitfield.c projects/ifnet/contrib/wpa/src/utils/bitfield.h - copied unchanged from r281821, head/contrib/wpa/src/utils/bitfield.h projects/ifnet/contrib/wpa/src/utils/browser-android.c - copied unchanged from r281821, head/contrib/wpa/src/utils/browser-android.c projects/ifnet/contrib/wpa/src/utils/browser-system.c - copied unchanged from r281821, head/contrib/wpa/src/utils/browser-system.c projects/ifnet/contrib/wpa/src/utils/browser-wpadebug.c - copied unchanged from r281821, head/contrib/wpa/src/utils/browser-wpadebug.c projects/ifnet/contrib/wpa/src/utils/browser.c - copied unchanged from r281821, head/contrib/wpa/src/utils/browser.c projects/ifnet/contrib/wpa/src/utils/browser.h - copied unchanged from r281821, head/contrib/wpa/src/utils/browser.h projects/ifnet/contrib/wpa/src/utils/http-utils.h - copied unchanged from r281821, head/contrib/wpa/src/utils/http-utils.h projects/ifnet/contrib/wpa/src/utils/http_curl.c - copied unchanged from r281821, head/contrib/wpa/src/utils/http_curl.c projects/ifnet/contrib/wpa/src/utils/platform.h - copied unchanged from r281821, head/contrib/wpa/src/utils/platform.h projects/ifnet/contrib/wpa/src/utils/utils_module_tests.c - copied unchanged from r281821, head/contrib/wpa/src/utils/utils_module_tests.c projects/ifnet/contrib/wpa/src/utils/xml-utils.c - copied unchanged from r281821, head/contrib/wpa/src/utils/xml-utils.c projects/ifnet/contrib/wpa/src/utils/xml-utils.h - copied unchanged from r281821, head/contrib/wpa/src/utils/xml-utils.h projects/ifnet/contrib/wpa/src/utils/xml_libxml2.c - copied unchanged from r281821, head/contrib/wpa/src/utils/xml_libxml2.c projects/ifnet/contrib/wpa/src/wps/wps_module_tests.c - copied unchanged from r281821, head/contrib/wpa/src/wps/wps_module_tests.c projects/ifnet/contrib/wpa/wpa_supplicant/eap_proxy_dummy.mak - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/eap_proxy_dummy.mak projects/ifnet/contrib/wpa/wpa_supplicant/eap_proxy_dummy.mk - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/eap_proxy_dummy.mk projects/ifnet/contrib/wpa/wpa_supplicant/examples/p2p-nfc.py - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/examples/p2p-nfc.py projects/ifnet/contrib/wpa/wpa_supplicant/mesh.c - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/mesh.c projects/ifnet/contrib/wpa/wpa_supplicant/mesh.h - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/mesh.h projects/ifnet/contrib/wpa/wpa_supplicant/mesh_mpm.c - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/mesh_mpm.c projects/ifnet/contrib/wpa/wpa_supplicant/mesh_mpm.h - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/mesh_mpm.h projects/ifnet/contrib/wpa/wpa_supplicant/mesh_rsn.c - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/mesh_rsn.c projects/ifnet/contrib/wpa/wpa_supplicant/mesh_rsn.h - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/mesh_rsn.h projects/ifnet/contrib/wpa/wpa_supplicant/wmm_ac.c - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/wmm_ac.c projects/ifnet/contrib/wpa/wpa_supplicant/wmm_ac.h - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/wmm_ac.h projects/ifnet/contrib/wpa/wpa_supplicant/wpas_kay.c - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/wpas_kay.c projects/ifnet/contrib/wpa/wpa_supplicant/wpas_kay.h - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/wpas_kay.h projects/ifnet/contrib/wpa/wpa_supplicant/wpas_module_tests.c - copied unchanged from r281821, head/contrib/wpa/wpa_supplicant/wpas_module_tests.c projects/ifnet/lib/libc/sys/ppoll.c - copied unchanged from r281821, head/lib/libc/sys/ppoll.c projects/ifnet/lib/libc/sys/wait6.c - copied unchanged from r281821, head/lib/libc/sys/wait6.c projects/ifnet/release/arm64/ - copied from r281821, head/release/arm64/ projects/ifnet/share/man/man4/dtrace-io.4 - copied unchanged from r281821, head/share/man/man4/dtrace-io.4 projects/ifnet/share/man/man4/dtrace-ip.4 - copied unchanged from r281821, head/share/man/man4/dtrace-ip.4 projects/ifnet/share/man/man4/dtrace-proc.4 - copied unchanged from r281821, head/share/man/man4/dtrace-proc.4 projects/ifnet/share/man/man4/dtrace-sched.4 - copied unchanged from r281821, head/share/man/man4/dtrace-sched.4 projects/ifnet/share/man/man4/dtrace-tcp.4 - copied unchanged from r281821, head/share/man/man4/dtrace-tcp.4 projects/ifnet/share/man/man4/dtrace-udp.4 - copied unchanged from r281821, head/share/man/man4/dtrace-udp.4 projects/ifnet/sys/arm/allwinner/files.allwinner - copied unchanged from r281821, head/sys/arm/allwinner/files.allwinner projects/ifnet/sys/dev/hwpmc/hwpmc_e500.c - copied unchanged from r281821, head/sys/dev/hwpmc/hwpmc_e500.c projects/ifnet/sys/modules/dtb/allwinner/ - copied from r281821, head/sys/modules/dtb/allwinner/ projects/ifnet/usr.sbin/bluetooth/hccontrol/le.c - copied unchanged from r281821, head/usr.sbin/bluetooth/hccontrol/le.c Deleted: projects/ifnet/contrib/bmake/unit-tests/comment projects/ifnet/contrib/bmake/unit-tests/cond1 projects/ifnet/contrib/bmake/unit-tests/doterror projects/ifnet/contrib/bmake/unit-tests/dotwait projects/ifnet/contrib/bmake/unit-tests/error projects/ifnet/contrib/bmake/unit-tests/export projects/ifnet/contrib/bmake/unit-tests/export-all projects/ifnet/contrib/bmake/unit-tests/export-env projects/ifnet/contrib/bmake/unit-tests/forloop projects/ifnet/contrib/bmake/unit-tests/forsubst projects/ifnet/contrib/bmake/unit-tests/hash projects/ifnet/contrib/bmake/unit-tests/misc projects/ifnet/contrib/bmake/unit-tests/moderrs projects/ifnet/contrib/bmake/unit-tests/modmatch projects/ifnet/contrib/bmake/unit-tests/modmisc projects/ifnet/contrib/bmake/unit-tests/modorder projects/ifnet/contrib/bmake/unit-tests/modts projects/ifnet/contrib/bmake/unit-tests/modword projects/ifnet/contrib/bmake/unit-tests/order projects/ifnet/contrib/bmake/unit-tests/phony-end projects/ifnet/contrib/bmake/unit-tests/posix projects/ifnet/contrib/bmake/unit-tests/qequals projects/ifnet/contrib/bmake/unit-tests/sunshcmd projects/ifnet/contrib/bmake/unit-tests/sysv projects/ifnet/contrib/bmake/unit-tests/ternary projects/ifnet/contrib/bmake/unit-tests/test.exp projects/ifnet/contrib/bmake/unit-tests/unexport projects/ifnet/contrib/bmake/unit-tests/unexport-env projects/ifnet/contrib/bmake/unit-tests/varcmd projects/ifnet/contrib/wpa/hostapd/dump_state.c projects/ifnet/contrib/wpa/hostapd/dump_state.h projects/ifnet/contrib/wpa/patches/openssl-0.9.8-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.8d-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.8e-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.8g-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.8h-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.8i-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch projects/ifnet/contrib/wpa/patches/openssl-0.9.9-session-ticket.patch projects/ifnet/contrib/wpa/src/crypto/crypto_nss.c projects/ifnet/contrib/wpa/src/crypto/fips_prf_cryptoapi.c projects/ifnet/contrib/wpa/src/crypto/fips_prf_gnutls.c projects/ifnet/contrib/wpa/src/crypto/fips_prf_nss.c projects/ifnet/contrib/wpa/src/crypto/tls_nss.c projects/ifnet/contrib/wpa/src/utils/eloop_none.c projects/ifnet/lib/libc/sys/ftruncate.c projects/ifnet/lib/libc/sys/lseek.c projects/ifnet/lib/libc/sys/mmap.c projects/ifnet/lib/libc/sys/pread.c projects/ifnet/lib/libc/sys/pwrite.c projects/ifnet/lib/libc/sys/truncate.c projects/ifnet/sys/fs/ext2fs/ext2_hash.c projects/ifnet/sys/fs/ext2fs/ext2_htree.c projects/ifnet/sys/netipsec/xform_ipip.c projects/ifnet/tools/build/options/WITHOUT_SYSCALL_COMPAT projects/ifnet/usr.sbin/crunch/crunchide/exec_aout.c Modified: projects/ifnet/.arcconfig projects/ifnet/.arclint projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/README projects/ifnet/bin/ed/glbl.c projects/ifnet/bin/sh/sh.1 projects/ifnet/bin/sh/tests/builtins/Makefile projects/ifnet/bin/sh/trap.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/ifnet/contrib/bmake/ChangeLog projects/ifnet/contrib/bmake/FILES projects/ifnet/contrib/bmake/Makefile projects/ifnet/contrib/bmake/PSD.doc/Makefile projects/ifnet/contrib/bmake/PSD.doc/tutorial.ms projects/ifnet/contrib/bmake/bmake.1 projects/ifnet/contrib/bmake/bmake.cat1 projects/ifnet/contrib/bmake/compat.c projects/ifnet/contrib/bmake/configure projects/ifnet/contrib/bmake/configure.in projects/ifnet/contrib/bmake/job.c projects/ifnet/contrib/bmake/lst.h projects/ifnet/contrib/bmake/lst.lib/lstInt.h projects/ifnet/contrib/bmake/lst.lib/lstRemove.c projects/ifnet/contrib/bmake/main.c projects/ifnet/contrib/bmake/make.1 projects/ifnet/contrib/bmake/make.c projects/ifnet/contrib/bmake/make.h projects/ifnet/contrib/bmake/meta.c projects/ifnet/contrib/bmake/mk/ChangeLog projects/ifnet/contrib/bmake/mk/FILES projects/ifnet/contrib/bmake/mk/auto.dep.mk projects/ifnet/contrib/bmake/mk/auto.obj.mk projects/ifnet/contrib/bmake/mk/autodep.mk projects/ifnet/contrib/bmake/mk/dep.mk projects/ifnet/contrib/bmake/mk/dirdeps.mk projects/ifnet/contrib/bmake/mk/gendirdeps.mk projects/ifnet/contrib/bmake/mk/install-mk projects/ifnet/contrib/bmake/mk/links.mk projects/ifnet/contrib/bmake/mk/meta.autodep.mk projects/ifnet/contrib/bmake/mk/meta.stage.mk projects/ifnet/contrib/bmake/mk/meta.sys.mk projects/ifnet/contrib/bmake/mk/meta2deps.py projects/ifnet/contrib/bmake/mk/meta2deps.sh projects/ifnet/contrib/bmake/mk/mk-files.txt projects/ifnet/contrib/bmake/mk/own.mk projects/ifnet/contrib/bmake/mk/sys.dependfile.mk projects/ifnet/contrib/bmake/nonints.h projects/ifnet/contrib/bmake/parse.c projects/ifnet/contrib/bmake/suff.c projects/ifnet/contrib/bmake/targ.c projects/ifnet/contrib/bmake/unit-tests/Makefile.in projects/ifnet/contrib/bmake/var.c projects/ifnet/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/ifnet/contrib/wpa/COPYING projects/ifnet/contrib/wpa/README projects/ifnet/contrib/wpa/hostapd/ChangeLog projects/ifnet/contrib/wpa/hostapd/README projects/ifnet/contrib/wpa/hostapd/README-WPS projects/ifnet/contrib/wpa/hostapd/config_file.c projects/ifnet/contrib/wpa/hostapd/ctrl_iface.c projects/ifnet/contrib/wpa/hostapd/defconfig projects/ifnet/contrib/wpa/hostapd/eap_register.c projects/ifnet/contrib/wpa/hostapd/hlr_auc_gw.c projects/ifnet/contrib/wpa/hostapd/hostapd.8 projects/ifnet/contrib/wpa/hostapd/hostapd.conf projects/ifnet/contrib/wpa/hostapd/hostapd.eap_user projects/ifnet/contrib/wpa/hostapd/hostapd.eap_user_sqlite projects/ifnet/contrib/wpa/hostapd/hostapd_cli.c projects/ifnet/contrib/wpa/hostapd/main.c projects/ifnet/contrib/wpa/src/ap/accounting.c projects/ifnet/contrib/wpa/src/ap/ap_config.c projects/ifnet/contrib/wpa/src/ap/ap_config.h projects/ifnet/contrib/wpa/src/ap/ap_drv_ops.c projects/ifnet/contrib/wpa/src/ap/ap_drv_ops.h projects/ifnet/contrib/wpa/src/ap/ap_list.c projects/ifnet/contrib/wpa/src/ap/ap_list.h projects/ifnet/contrib/wpa/src/ap/ap_mlme.c projects/ifnet/contrib/wpa/src/ap/authsrv.c projects/ifnet/contrib/wpa/src/ap/beacon.c projects/ifnet/contrib/wpa/src/ap/beacon.h projects/ifnet/contrib/wpa/src/ap/ctrl_iface_ap.c projects/ifnet/contrib/wpa/src/ap/ctrl_iface_ap.h projects/ifnet/contrib/wpa/src/ap/drv_callbacks.c projects/ifnet/contrib/wpa/src/ap/eap_user_db.c projects/ifnet/contrib/wpa/src/ap/gas_serv.c projects/ifnet/contrib/wpa/src/ap/gas_serv.h projects/ifnet/contrib/wpa/src/ap/hostapd.c projects/ifnet/contrib/wpa/src/ap/hostapd.h projects/ifnet/contrib/wpa/src/ap/hs20.c projects/ifnet/contrib/wpa/src/ap/hs20.h projects/ifnet/contrib/wpa/src/ap/hw_features.c projects/ifnet/contrib/wpa/src/ap/hw_features.h projects/ifnet/contrib/wpa/src/ap/iapp.c projects/ifnet/contrib/wpa/src/ap/ieee802_11.c projects/ifnet/contrib/wpa/src/ap/ieee802_11.h projects/ifnet/contrib/wpa/src/ap/ieee802_11_auth.c projects/ifnet/contrib/wpa/src/ap/ieee802_11_ht.c projects/ifnet/contrib/wpa/src/ap/ieee802_11_shared.c projects/ifnet/contrib/wpa/src/ap/ieee802_11_vht.c projects/ifnet/contrib/wpa/src/ap/ieee802_1x.c projects/ifnet/contrib/wpa/src/ap/ieee802_1x.h projects/ifnet/contrib/wpa/src/ap/p2p_hostapd.c projects/ifnet/contrib/wpa/src/ap/peerkey_auth.c projects/ifnet/contrib/wpa/src/ap/pmksa_cache_auth.c projects/ifnet/contrib/wpa/src/ap/pmksa_cache_auth.h projects/ifnet/contrib/wpa/src/ap/sta_info.c projects/ifnet/contrib/wpa/src/ap/sta_info.h projects/ifnet/contrib/wpa/src/ap/tkip_countermeasures.c projects/ifnet/contrib/wpa/src/ap/vlan_init.c projects/ifnet/contrib/wpa/src/ap/vlan_init.h projects/ifnet/contrib/wpa/src/ap/wmm.c projects/ifnet/contrib/wpa/src/ap/wmm.h projects/ifnet/contrib/wpa/src/ap/wnm_ap.c projects/ifnet/contrib/wpa/src/ap/wnm_ap.h projects/ifnet/contrib/wpa/src/ap/wpa_auth.c projects/ifnet/contrib/wpa/src/ap/wpa_auth.h projects/ifnet/contrib/wpa/src/ap/wpa_auth_ft.c projects/ifnet/contrib/wpa/src/ap/wpa_auth_glue.c projects/ifnet/contrib/wpa/src/ap/wpa_auth_i.h projects/ifnet/contrib/wpa/src/ap/wpa_auth_ie.c projects/ifnet/contrib/wpa/src/ap/wpa_auth_ie.h projects/ifnet/contrib/wpa/src/ap/wps_hostapd.c projects/ifnet/contrib/wpa/src/ap/wps_hostapd.h projects/ifnet/contrib/wpa/src/common/defs.h projects/ifnet/contrib/wpa/src/common/eapol_common.h projects/ifnet/contrib/wpa/src/common/ieee802_11_common.c projects/ifnet/contrib/wpa/src/common/ieee802_11_common.h projects/ifnet/contrib/wpa/src/common/ieee802_11_defs.h projects/ifnet/contrib/wpa/src/common/privsep_commands.h projects/ifnet/contrib/wpa/src/common/version.h projects/ifnet/contrib/wpa/src/common/wpa_common.c projects/ifnet/contrib/wpa/src/common/wpa_common.h projects/ifnet/contrib/wpa/src/common/wpa_ctrl.c projects/ifnet/contrib/wpa/src/common/wpa_ctrl.h projects/ifnet/contrib/wpa/src/crypto/aes-ccm.c projects/ifnet/contrib/wpa/src/crypto/aes-eax.c projects/ifnet/contrib/wpa/src/crypto/aes-gcm.c projects/ifnet/contrib/wpa/src/crypto/aes-omac1.c projects/ifnet/contrib/wpa/src/crypto/aes-unwrap.c projects/ifnet/contrib/wpa/src/crypto/aes-wrap.c projects/ifnet/contrib/wpa/src/crypto/aes_wrap.h projects/ifnet/contrib/wpa/src/crypto/crypto.h projects/ifnet/contrib/wpa/src/crypto/crypto_internal-rsa.c projects/ifnet/contrib/wpa/src/crypto/crypto_openssl.c projects/ifnet/contrib/wpa/src/crypto/dh_groups.c projects/ifnet/contrib/wpa/src/crypto/dh_groups.h projects/ifnet/contrib/wpa/src/crypto/md5.c projects/ifnet/contrib/wpa/src/crypto/milenage.c projects/ifnet/contrib/wpa/src/crypto/ms_funcs.c projects/ifnet/contrib/wpa/src/crypto/random.c projects/ifnet/contrib/wpa/src/crypto/sha1-internal.c projects/ifnet/contrib/wpa/src/crypto/sha1-prf.c projects/ifnet/contrib/wpa/src/crypto/sha1.c projects/ifnet/contrib/wpa/src/crypto/sha256-prf.c projects/ifnet/contrib/wpa/src/crypto/sha256.h projects/ifnet/contrib/wpa/src/crypto/tls.h projects/ifnet/contrib/wpa/src/crypto/tls_gnutls.c projects/ifnet/contrib/wpa/src/crypto/tls_internal.c projects/ifnet/contrib/wpa/src/crypto/tls_none.c projects/ifnet/contrib/wpa/src/crypto/tls_openssl.c projects/ifnet/contrib/wpa/src/crypto/tls_schannel.c projects/ifnet/contrib/wpa/src/drivers/driver.h projects/ifnet/contrib/wpa/src/drivers/driver_bsd.c projects/ifnet/contrib/wpa/src/drivers/driver_common.c projects/ifnet/contrib/wpa/src/drivers/driver_ndis.c projects/ifnet/contrib/wpa/src/drivers/driver_privsep.c projects/ifnet/contrib/wpa/src/drivers/driver_wired.c projects/ifnet/contrib/wpa/src/drivers/drivers.c projects/ifnet/contrib/wpa/src/eap_common/eap_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_common.h projects/ifnet/contrib/wpa/src/eap_common/eap_defs.h projects/ifnet/contrib/wpa/src/eap_common/eap_fast_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_fast_common.h projects/ifnet/contrib/wpa/src/eap_common/eap_gpsk_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_gpsk_common.h projects/ifnet/contrib/wpa/src/eap_common/eap_ikev2_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_ikev2_common.h projects/ifnet/contrib/wpa/src/eap_common/eap_pax_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_pax_common.h projects/ifnet/contrib/wpa/src/eap_common/eap_pwd_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_pwd_common.h projects/ifnet/contrib/wpa/src/eap_common/eap_sim_common.c projects/ifnet/contrib/wpa/src/eap_common/eap_sim_common.h projects/ifnet/contrib/wpa/src/eap_common/ikev2_common.c projects/ifnet/contrib/wpa/src/eap_common/ikev2_common.h projects/ifnet/contrib/wpa/src/eap_peer/eap.c projects/ifnet/contrib/wpa/src/eap_peer/eap.h projects/ifnet/contrib/wpa/src/eap_peer/eap_aka.c projects/ifnet/contrib/wpa/src/eap_peer/eap_config.h projects/ifnet/contrib/wpa/src/eap_peer/eap_fast.c projects/ifnet/contrib/wpa/src/eap_peer/eap_fast_pac.c projects/ifnet/contrib/wpa/src/eap_peer/eap_gpsk.c projects/ifnet/contrib/wpa/src/eap_peer/eap_i.h projects/ifnet/contrib/wpa/src/eap_peer/eap_ikev2.c projects/ifnet/contrib/wpa/src/eap_peer/eap_leap.c projects/ifnet/contrib/wpa/src/eap_peer/eap_methods.c projects/ifnet/contrib/wpa/src/eap_peer/eap_methods.h projects/ifnet/contrib/wpa/src/eap_peer/eap_mschapv2.c projects/ifnet/contrib/wpa/src/eap_peer/eap_pax.c projects/ifnet/contrib/wpa/src/eap_peer/eap_peap.c projects/ifnet/contrib/wpa/src/eap_peer/eap_psk.c projects/ifnet/contrib/wpa/src/eap_peer/eap_pwd.c projects/ifnet/contrib/wpa/src/eap_peer/eap_sake.c projects/ifnet/contrib/wpa/src/eap_peer/eap_sim.c projects/ifnet/contrib/wpa/src/eap_peer/eap_tls.c projects/ifnet/contrib/wpa/src/eap_peer/eap_tls_common.c projects/ifnet/contrib/wpa/src/eap_peer/eap_tls_common.h projects/ifnet/contrib/wpa/src/eap_peer/eap_tnc.c projects/ifnet/contrib/wpa/src/eap_peer/eap_ttls.c projects/ifnet/contrib/wpa/src/eap_peer/eap_vendor_test.c projects/ifnet/contrib/wpa/src/eap_peer/eap_wsc.c projects/ifnet/contrib/wpa/src/eap_peer/ikev2.c projects/ifnet/contrib/wpa/src/eap_peer/mschapv2.c projects/ifnet/contrib/wpa/src/eap_peer/tncc.c projects/ifnet/contrib/wpa/src/eap_server/eap.h projects/ifnet/contrib/wpa/src/eap_server/eap_i.h projects/ifnet/contrib/wpa/src/eap_server/eap_methods.h projects/ifnet/contrib/wpa/src/eap_server/eap_server.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_aka.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_fast.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_gpsk.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_gtc.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_identity.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_ikev2.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_md5.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_methods.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_mschapv2.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_pax.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_peap.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_psk.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_pwd.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_sake.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_sim.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_tls.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_tls_common.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_tnc.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_ttls.c projects/ifnet/contrib/wpa/src/eap_server/eap_server_wsc.c projects/ifnet/contrib/wpa/src/eap_server/eap_sim_db.c projects/ifnet/contrib/wpa/src/eap_server/eap_tls_common.h projects/ifnet/contrib/wpa/src/eap_server/ikev2.c projects/ifnet/contrib/wpa/src/eap_server/tncs.c projects/ifnet/contrib/wpa/src/eapol_auth/eapol_auth_dump.c projects/ifnet/contrib/wpa/src/eapol_auth/eapol_auth_sm.c projects/ifnet/contrib/wpa/src/eapol_auth/eapol_auth_sm.h projects/ifnet/contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h projects/ifnet/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/ifnet/contrib/wpa/src/eapol_supp/eapol_supp_sm.h projects/ifnet/contrib/wpa/src/l2_packet/l2_packet.h projects/ifnet/contrib/wpa/src/l2_packet/l2_packet_freebsd.c projects/ifnet/contrib/wpa/src/l2_packet/l2_packet_ndis.c projects/ifnet/contrib/wpa/src/l2_packet/l2_packet_none.c projects/ifnet/contrib/wpa/src/l2_packet/l2_packet_privsep.c projects/ifnet/contrib/wpa/src/p2p/p2p.c projects/ifnet/contrib/wpa/src/p2p/p2p.h projects/ifnet/contrib/wpa/src/p2p/p2p_build.c projects/ifnet/contrib/wpa/src/p2p/p2p_dev_disc.c projects/ifnet/contrib/wpa/src/p2p/p2p_go_neg.c projects/ifnet/contrib/wpa/src/p2p/p2p_group.c projects/ifnet/contrib/wpa/src/p2p/p2p_i.h projects/ifnet/contrib/wpa/src/p2p/p2p_invitation.c projects/ifnet/contrib/wpa/src/p2p/p2p_parse.c projects/ifnet/contrib/wpa/src/p2p/p2p_pd.c projects/ifnet/contrib/wpa/src/p2p/p2p_sd.c projects/ifnet/contrib/wpa/src/p2p/p2p_utils.c projects/ifnet/contrib/wpa/src/radius/radius.c projects/ifnet/contrib/wpa/src/radius/radius.h projects/ifnet/contrib/wpa/src/radius/radius_client.c projects/ifnet/contrib/wpa/src/radius/radius_das.c projects/ifnet/contrib/wpa/src/radius/radius_das.h projects/ifnet/contrib/wpa/src/radius/radius_server.c projects/ifnet/contrib/wpa/src/radius/radius_server.h projects/ifnet/contrib/wpa/src/rsn_supp/peerkey.c projects/ifnet/contrib/wpa/src/rsn_supp/peerkey.h projects/ifnet/contrib/wpa/src/rsn_supp/pmksa_cache.c projects/ifnet/contrib/wpa/src/rsn_supp/pmksa_cache.h projects/ifnet/contrib/wpa/src/rsn_supp/preauth.c projects/ifnet/contrib/wpa/src/rsn_supp/preauth.h projects/ifnet/contrib/wpa/src/rsn_supp/tdls.c projects/ifnet/contrib/wpa/src/rsn_supp/wpa.c projects/ifnet/contrib/wpa/src/rsn_supp/wpa.h projects/ifnet/contrib/wpa/src/rsn_supp/wpa_ft.c projects/ifnet/contrib/wpa/src/rsn_supp/wpa_i.h projects/ifnet/contrib/wpa/src/rsn_supp/wpa_ie.c projects/ifnet/contrib/wpa/src/rsn_supp/wpa_ie.h projects/ifnet/contrib/wpa/src/tls/asn1.c projects/ifnet/contrib/wpa/src/tls/asn1.h projects/ifnet/contrib/wpa/src/tls/libtommath.c projects/ifnet/contrib/wpa/src/tls/pkcs1.c projects/ifnet/contrib/wpa/src/tls/pkcs1.h projects/ifnet/contrib/wpa/src/tls/rsa.c projects/ifnet/contrib/wpa/src/tls/rsa.h projects/ifnet/contrib/wpa/src/tls/tlsv1_client.c projects/ifnet/contrib/wpa/src/tls/tlsv1_client_read.c projects/ifnet/contrib/wpa/src/tls/tlsv1_client_write.c projects/ifnet/contrib/wpa/src/tls/tlsv1_common.c projects/ifnet/contrib/wpa/src/tls/tlsv1_common.h projects/ifnet/contrib/wpa/src/tls/tlsv1_record.c projects/ifnet/contrib/wpa/src/tls/tlsv1_server.c projects/ifnet/contrib/wpa/src/tls/tlsv1_server.h projects/ifnet/contrib/wpa/src/tls/tlsv1_server_i.h projects/ifnet/contrib/wpa/src/tls/tlsv1_server_read.c projects/ifnet/contrib/wpa/src/tls/tlsv1_server_write.c projects/ifnet/contrib/wpa/src/tls/x509v3.c projects/ifnet/contrib/wpa/src/utils/base64.c projects/ifnet/contrib/wpa/src/utils/build_config.h projects/ifnet/contrib/wpa/src/utils/common.c projects/ifnet/contrib/wpa/src/utils/common.h projects/ifnet/contrib/wpa/src/utils/edit.c projects/ifnet/contrib/wpa/src/utils/edit_readline.c projects/ifnet/contrib/wpa/src/utils/edit_simple.c projects/ifnet/contrib/wpa/src/utils/eloop.c projects/ifnet/contrib/wpa/src/utils/eloop.h projects/ifnet/contrib/wpa/src/utils/eloop_win.c projects/ifnet/contrib/wpa/src/utils/ext_password_test.c projects/ifnet/contrib/wpa/src/utils/ip_addr.c projects/ifnet/contrib/wpa/src/utils/ip_addr.h projects/ifnet/contrib/wpa/src/utils/list.h projects/ifnet/contrib/wpa/src/utils/os.h projects/ifnet/contrib/wpa/src/utils/os_internal.c projects/ifnet/contrib/wpa/src/utils/os_none.c projects/ifnet/contrib/wpa/src/utils/os_unix.c projects/ifnet/contrib/wpa/src/utils/os_win32.c projects/ifnet/contrib/wpa/src/utils/pcsc_funcs.c projects/ifnet/contrib/wpa/src/utils/pcsc_funcs.h projects/ifnet/contrib/wpa/src/utils/radiotap.c projects/ifnet/contrib/wpa/src/utils/radiotap.h projects/ifnet/contrib/wpa/src/utils/radiotap_iter.h projects/ifnet/contrib/wpa/src/utils/trace.c projects/ifnet/contrib/wpa/src/utils/trace.h projects/ifnet/contrib/wpa/src/utils/uuid.c projects/ifnet/contrib/wpa/src/utils/wpa_debug.c projects/ifnet/contrib/wpa/src/utils/wpa_debug.h projects/ifnet/contrib/wpa/src/utils/wpabuf.c projects/ifnet/contrib/wpa/src/utils/wpabuf.h projects/ifnet/contrib/wpa/src/wps/http_client.c projects/ifnet/contrib/wpa/src/wps/http_server.c projects/ifnet/contrib/wpa/src/wps/httpread.c projects/ifnet/contrib/wpa/src/wps/ndef.c projects/ifnet/contrib/wpa/src/wps/wps.c projects/ifnet/contrib/wpa/src/wps/wps.h projects/ifnet/contrib/wpa/src/wps/wps_attr_build.c projects/ifnet/contrib/wpa/src/wps/wps_attr_parse.c projects/ifnet/contrib/wpa/src/wps/wps_attr_parse.h projects/ifnet/contrib/wpa/src/wps/wps_attr_process.c projects/ifnet/contrib/wpa/src/wps/wps_common.c projects/ifnet/contrib/wpa/src/wps/wps_defs.h projects/ifnet/contrib/wpa/src/wps/wps_dev_attr.c projects/ifnet/contrib/wpa/src/wps/wps_dev_attr.h projects/ifnet/contrib/wpa/src/wps/wps_enrollee.c projects/ifnet/contrib/wpa/src/wps/wps_er.c projects/ifnet/contrib/wpa/src/wps/wps_er.h projects/ifnet/contrib/wpa/src/wps/wps_er_ssdp.c projects/ifnet/contrib/wpa/src/wps/wps_i.h projects/ifnet/contrib/wpa/src/wps/wps_registrar.c projects/ifnet/contrib/wpa/src/wps/wps_upnp.c projects/ifnet/contrib/wpa/src/wps/wps_upnp_ap.c projects/ifnet/contrib/wpa/src/wps/wps_upnp_i.h projects/ifnet/contrib/wpa/src/wps/wps_upnp_ssdp.c projects/ifnet/contrib/wpa/src/wps/wps_upnp_web.c projects/ifnet/contrib/wpa/src/wps/wps_validate.c projects/ifnet/contrib/wpa/wpa_supplicant/ChangeLog projects/ifnet/contrib/wpa/wpa_supplicant/README projects/ifnet/contrib/wpa/wpa_supplicant/README-HS20 projects/ifnet/contrib/wpa/wpa_supplicant/README-P2P projects/ifnet/contrib/wpa/wpa_supplicant/README-WPS projects/ifnet/contrib/wpa/wpa_supplicant/ap.c projects/ifnet/contrib/wpa/wpa_supplicant/ap.h projects/ifnet/contrib/wpa/wpa_supplicant/bgscan.c projects/ifnet/contrib/wpa/wpa_supplicant/bgscan.h projects/ifnet/contrib/wpa/wpa_supplicant/bgscan_learn.c projects/ifnet/contrib/wpa/wpa_supplicant/bgscan_simple.c projects/ifnet/contrib/wpa/wpa_supplicant/bss.c projects/ifnet/contrib/wpa/wpa_supplicant/bss.h projects/ifnet/contrib/wpa/wpa_supplicant/config.c projects/ifnet/contrib/wpa/wpa_supplicant/config.h projects/ifnet/contrib/wpa/wpa_supplicant/config_file.c projects/ifnet/contrib/wpa/wpa_supplicant/config_none.c projects/ifnet/contrib/wpa/wpa_supplicant/config_ssid.h projects/ifnet/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/ifnet/contrib/wpa/wpa_supplicant/ctrl_iface.h projects/ifnet/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c projects/ifnet/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c projects/ifnet/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/Makefile projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_common.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_new_introspect.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_old.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_old.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.h projects/ifnet/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers_wps.c projects/ifnet/contrib/wpa/wpa_supplicant/defconfig projects/ifnet/contrib/wpa/wpa_supplicant/driver_i.h projects/ifnet/contrib/wpa/wpa_supplicant/eap_register.c projects/ifnet/contrib/wpa/wpa_supplicant/eapol_test.c projects/ifnet/contrib/wpa/wpa_supplicant/events.c projects/ifnet/contrib/wpa/wpa_supplicant/examples/p2p-action.sh projects/ifnet/contrib/wpa/wpa_supplicant/examples/wps-ap-cli projects/ifnet/contrib/wpa/wpa_supplicant/examples/wps-nfc.py projects/ifnet/contrib/wpa/wpa_supplicant/gas_query.c projects/ifnet/contrib/wpa/wpa_supplicant/gas_query.h projects/ifnet/contrib/wpa/wpa_supplicant/hs20_supplicant.c projects/ifnet/contrib/wpa/wpa_supplicant/hs20_supplicant.h projects/ifnet/contrib/wpa/wpa_supplicant/ibss_rsn.c projects/ifnet/contrib/wpa/wpa_supplicant/ibss_rsn.h projects/ifnet/contrib/wpa/wpa_supplicant/interworking.c projects/ifnet/contrib/wpa/wpa_supplicant/interworking.h projects/ifnet/contrib/wpa/wpa_supplicant/main.c projects/ifnet/contrib/wpa/wpa_supplicant/main_none.c projects/ifnet/contrib/wpa/wpa_supplicant/notify.c projects/ifnet/contrib/wpa/wpa_supplicant/notify.h projects/ifnet/contrib/wpa/wpa_supplicant/offchannel.c projects/ifnet/contrib/wpa/wpa_supplicant/p2p_supplicant.c projects/ifnet/contrib/wpa/wpa_supplicant/p2p_supplicant.h projects/ifnet/contrib/wpa/wpa_supplicant/preauth_test.c projects/ifnet/contrib/wpa/wpa_supplicant/scan.c projects/ifnet/contrib/wpa/wpa_supplicant/scan.h projects/ifnet/contrib/wpa/wpa_supplicant/sme.c projects/ifnet/contrib/wpa/wpa_supplicant/sme.h projects/ifnet/contrib/wpa/wpa_supplicant/tests/test_wpa.c projects/ifnet/contrib/wpa/wpa_supplicant/todo.txt projects/ifnet/contrib/wpa/wpa_supplicant/wifi_display.c projects/ifnet/contrib/wpa/wpa_supplicant/wifi_display.h projects/ifnet/contrib/wpa/wpa_supplicant/wnm_sta.c projects/ifnet/contrib/wpa/wpa_supplicant/wnm_sta.h projects/ifnet/contrib/wpa/wpa_supplicant/wpa_cli.c projects/ifnet/contrib/wpa/wpa_supplicant/wpa_priv.c projects/ifnet/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/ifnet/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/ifnet/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/ifnet/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf projects/ifnet/contrib/wpa/wpa_supplicant/wpas_glue.c projects/ifnet/contrib/wpa/wpa_supplicant/wps_supplicant.c projects/ifnet/contrib/wpa/wpa_supplicant/wps_supplicant.h projects/ifnet/etc/defaults/rc.conf projects/ifnet/etc/rc.d/mountd projects/ifnet/etc/rc.d/nfsd projects/ifnet/lib/libc/Makefile projects/ifnet/lib/libc/amd64/sys/Makefile.inc projects/ifnet/lib/libc/arm/sys/Makefile.inc projects/ifnet/lib/libc/gen/setproctitle.c projects/ifnet/lib/libc/gen/waitid.c projects/ifnet/lib/libc/i386/sys/Makefile.inc projects/ifnet/lib/libc/iconv/citrus_prop.c projects/ifnet/lib/libc/include/compat.h projects/ifnet/lib/libc/include/libc_private.h projects/ifnet/lib/libc/mips/sys/Makefile.inc projects/ifnet/lib/libc/powerpc/sys/Makefile.inc projects/ifnet/lib/libc/powerpc64/sys/Makefile.inc projects/ifnet/lib/libc/sparc64/sys/Makefile.inc projects/ifnet/lib/libc/sys/Makefile.inc projects/ifnet/lib/libc/sys/fcntl.c projects/ifnet/lib/libc/sys/interposing_table.c projects/ifnet/lib/libmt/mt.3 projects/ifnet/lib/libpmc/libpmc.c projects/ifnet/lib/libpmc/pmc.haswellxeon.3 projects/ifnet/lib/libthr/Makefile projects/ifnet/lib/libthr/thread/thr_syscalls.c projects/ifnet/release/release.conf.sample projects/ifnet/release/release.sh projects/ifnet/release/tools/vmimage.subr projects/ifnet/sbin/dmesg/dmesg.c projects/ifnet/sbin/ipfw/nat.c projects/ifnet/sbin/mount/mount.8 projects/ifnet/sbin/mount/mount.c projects/ifnet/sbin/mount_nfs/Makefile projects/ifnet/sbin/mount_nfs/mount_nfs.8 projects/ifnet/share/man/man3/pthread_testcancel.3 projects/ifnet/share/man/man3/queue.3 projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/ata.4 projects/ifnet/share/man/man4/run.4 projects/ifnet/share/man/man5/rc.conf.5 projects/ifnet/share/man/man5/src.conf.5 projects/ifnet/share/man/man9/SDT.9 projects/ifnet/share/man/man9/printf.9 projects/ifnet/share/mk/src.opts.mk projects/ifnet/sys/amd64/amd64/machdep.c projects/ifnet/sys/amd64/amd64/pmap.c projects/ifnet/sys/arm/allwinner/a10_clk.h projects/ifnet/sys/arm/allwinner/a20/a20_mp.c projects/ifnet/sys/arm/allwinner/a20/files.a20 projects/ifnet/sys/arm/allwinner/a20/std.a20 projects/ifnet/sys/arm/allwinner/files.a10 projects/ifnet/sys/arm/allwinner/if_emac.c projects/ifnet/sys/arm/allwinner/if_emacreg.h projects/ifnet/sys/arm/allwinner/std.a10 projects/ifnet/sys/arm/conf/CUBIEBOARD projects/ifnet/sys/arm/conf/CUBIEBOARD2 projects/ifnet/sys/arm64/arm64/trap.c projects/ifnet/sys/cam/scsi/scsi_all.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/ifnet/sys/compat/linux/linux_file.c projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.powerpc projects/ifnet/sys/dev/acpica/acpi.c projects/ifnet/sys/dev/acpica/acpivar.h projects/ifnet/sys/dev/atkbdc/psm.c projects/ifnet/sys/dev/etherswitch/miiproxy.c projects/ifnet/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/ifnet/sys/dev/hwpmc/hwpmc_powerpc.c projects/ifnet/sys/dev/hwpmc/hwpmc_powerpc.h projects/ifnet/sys/dev/hwpmc/hwpmc_ppc970.c projects/ifnet/sys/dev/hwpmc/pmc_events.h projects/ifnet/sys/dev/ixgbe/if_ix.c projects/ifnet/sys/dev/mii/acphy.c projects/ifnet/sys/dev/mii/brgphy.c projects/ifnet/sys/dev/mii/lxtphy.c projects/ifnet/sys/dev/mii/mii_physubr.c projects/ifnet/sys/dev/mii/miivar.h projects/ifnet/sys/dev/mii/mlphy.c projects/ifnet/sys/dev/mii/xmphy.c projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/usb/video/udl.c projects/ifnet/sys/dev/usb/wlan/if_run.c projects/ifnet/sys/dev/virtio/block/virtio_blk.c projects/ifnet/sys/dev/xen/netfront/netfront.c projects/ifnet/sys/fs/ext2fs/ext2_dir.h projects/ifnet/sys/fs/ext2fs/ext2_extern.h projects/ifnet/sys/fs/ext2fs/ext2_lookup.c projects/ifnet/sys/fs/ext2fs/ext2_vfsops.c projects/ifnet/sys/fs/ext2fs/ext2fs.h projects/ifnet/sys/fs/nfs/nfs_commonport.c projects/ifnet/sys/fs/nfsclient/nfs_clrpcops.c projects/ifnet/sys/fs/nfsclient/nfs_clvfsops.c projects/ifnet/sys/fs/nfsserver/nfs_nfsdport.c projects/ifnet/sys/geom/uncompress/g_uncompress.c projects/ifnet/sys/i386/i386/apic_vector.s projects/ifnet/sys/i386/i386/db_trace.c projects/ifnet/sys/i386/i386/machdep.c projects/ifnet/sys/i386/i386/mp_machdep.c projects/ifnet/sys/i386/i386/pmap.c projects/ifnet/sys/i386/i386/swtch.s projects/ifnet/sys/i386/include/smp.h projects/ifnet/sys/i386/xen/mp_machdep.c projects/ifnet/sys/i386/xen/pmap.c projects/ifnet/sys/kern/init_sysent.c projects/ifnet/sys/kern/kern_synch.c projects/ifnet/sys/kern/kern_thread.c projects/ifnet/sys/kern/subr_prf.c projects/ifnet/sys/kern/sys_generic.c projects/ifnet/sys/kern/syscalls.c projects/ifnet/sys/kern/syscalls.master projects/ifnet/sys/kern/systrace_args.c projects/ifnet/sys/kern/vfs_cache.c projects/ifnet/sys/kern/vfs_syscalls.c projects/ifnet/sys/modules/ext2fs/Makefile projects/ifnet/sys/modules/hwpmc/Makefile projects/ifnet/sys/net/bpf.c projects/ifnet/sys/net/bpf.h projects/ifnet/sys/netgraph/bluetooth/include/ng_hci.h projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netipsec/ipsec.c projects/ifnet/sys/netipsec/ipsec.h projects/ifnet/sys/netipsec/ipsec_input.c projects/ifnet/sys/netipsec/ipsec_output.c projects/ifnet/sys/netipsec/key.c projects/ifnet/sys/netipsec/xform.h projects/ifnet/sys/netipsec/xform_ah.c projects/ifnet/sys/netipsec/xform_esp.c projects/ifnet/sys/netipsec/xform_ipcomp.c projects/ifnet/sys/nfsclient/nfs.h projects/ifnet/sys/powerpc/booke/interrupt.c projects/ifnet/sys/powerpc/booke/locore.S projects/ifnet/sys/powerpc/booke/machdep.c projects/ifnet/sys/powerpc/booke/trap_subr.S projects/ifnet/sys/powerpc/include/pmc_mdep.h projects/ifnet/sys/sys/pmc.h projects/ifnet/sys/sys/syscall.h projects/ifnet/sys/sys/syscall.mk projects/ifnet/sys/sys/sysproto.h projects/ifnet/sys/vm/device_pager.c projects/ifnet/sys/vm/uma_core.c projects/ifnet/sys/vm/vm_mmap.c projects/ifnet/sys/x86/x86/mca.c projects/ifnet/sys/x86/xen/xen_apic.c projects/ifnet/tools/build/check-links.sh projects/ifnet/tools/tools/netmap/pkt-gen.c projects/ifnet/usr.bin/bmake/Makefile projects/ifnet/usr.bin/bmake/unit-tests/Makefile projects/ifnet/usr.bin/calendar/io.c projects/ifnet/usr.bin/find/find.1 projects/ifnet/usr.bin/nfsstat/nfsstat.c projects/ifnet/usr.bin/patch/inp.c projects/ifnet/usr.bin/patch/pch.c projects/ifnet/usr.bin/patch/util.c projects/ifnet/usr.bin/rpcgen/rpc_sample.c projects/ifnet/usr.sbin/bhyve/block_if.c projects/ifnet/usr.sbin/bhyve/block_if.h projects/ifnet/usr.sbin/bhyve/pci_ahci.c projects/ifnet/usr.sbin/bhyve/pci_virtio_block.c projects/ifnet/usr.sbin/bhyve/pci_virtio_net.c projects/ifnet/usr.sbin/bluetooth/hccontrol/Makefile projects/ifnet/usr.sbin/bluetooth/hccontrol/hccontrol.c projects/ifnet/usr.sbin/bluetooth/hccontrol/hccontrol.h projects/ifnet/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c projects/ifnet/usr.sbin/config/main.c projects/ifnet/usr.sbin/crunch/crunchide/Makefile projects/ifnet/usr.sbin/crunch/crunchide/crunchide.c projects/ifnet/usr.sbin/crunch/crunchide/exec_elf32.c projects/ifnet/usr.sbin/crunch/crunchide/extern.h projects/ifnet/usr.sbin/ctld/ctl.conf.5 projects/ifnet/usr.sbin/inetd/inetd.c projects/ifnet/usr.sbin/mountd/mountd.c projects/ifnet/usr.sbin/nfsd/nfsd.8 projects/ifnet/usr.sbin/sysrc/sysrc projects/ifnet/usr.sbin/tzsetup/tzsetup.c projects/ifnet/usr.sbin/vidcontrol/vidcontrol.c projects/ifnet/usr.sbin/wpa/Makefile.crypto projects/ifnet/usr.sbin/wpa/hostapd/Makefile projects/ifnet/usr.sbin/wpa/wpa_passphrase/Makefile projects/ifnet/usr.sbin/wpa/wpa_supplicant/Makefile Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/contrib/bmake/ (props changed) projects/ifnet/contrib/llvm/ (props changed) projects/ifnet/contrib/wpa/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/sbin/ipfw/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/usr.bin/calendar/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) Modified: projects/ifnet/.arcconfig ============================================================================== --- projects/ifnet/.arcconfig Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/.arcconfig Tue Apr 21 09:47:27 2015 (r281822) @@ -1,5 +1,4 @@ { "project.name": "S", - "phabricator.uri" : "https://reviews.freebsd.org/", - "history.immutable" : true + "phabricator.uri" : "https://reviews.freebsd.org/" } Modified: projects/ifnet/.arclint ============================================================================== --- projects/ifnet/.arclint Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/.arclint Tue Apr 21 09:47:27 2015 (r281822) @@ -1,9 +1,25 @@ { + "exclude": "(contrib|crypto)", "linters": { "python": { "type": "pep8", - "exclude": "(contrib)", "include": "(\\.py$)" + }, + "spelling": { + "type": "spelling" + }, + "chmod": { + "type": "chmod" + }, + "merge-conflict": { + "type": "merge-conflict" + }, + "filename": { + "type": "filename" + }, + "json": { + "type": "json", + "include": "(\\.arclint|\\.json$)" } } } Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/Makefile.inc1 Tue Apr 21 09:47:27 2015 (r281822) @@ -1281,10 +1281,6 @@ _m4= lib/libohash \ ${_bt}-usr.bin/m4: ${_bt}-lib/libohash .endif -.if ${BOOTSTRAPPING} < 1000014 -_crunch= usr.sbin/crunch -.endif - .if ${BOOTSTRAPPING} < 1000026 _nmtree= lib/libnetbsd \ usr.sbin/nmtree @@ -1300,6 +1296,10 @@ _cat= bin/cat _lex= usr.bin/lex .endif +.if ${BOOTSTRAPPING} < 1001507 +_crunch= usr.sbin/crunch +.endif + .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 _awk= usr.bin/awk .endif @@ -1469,12 +1469,9 @@ _btxld= usr.sbin/btxld .endif .endif .if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ${MK_RESCUE} != "no" || defined(RELEASEDIR) +.if ${MK_RESCUE} != "no" _crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) -_kgzip= usr.sbin/kgzip -.endif .endif # If we're given an XAS, don't build binutils. @@ -1520,7 +1517,6 @@ cross-tools: .MAKE ${_cc} \ ${_btxld} \ ${_crunchide} \ - ${_kgzip} \ sys/boot/usb/tools ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/ObsoleteFiles.inc Tue Apr 21 09:47:27 2015 (r281822) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20150418 +OLD_FILES+=sbin/mount_oldnfs +OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz # 20150416: ALTQ moved to net/altq OLD_FILES+=usr/include/altq/altq_rmclass_debug.h OLD_FILES+=usr/include/altq/altq.h Modified: projects/ifnet/README ============================================================================== --- projects/ifnet/README Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/README Tue Apr 21 09:47:27 2015 (r281822) @@ -8,37 +8,32 @@ sources in this tree - please see the sp more information). The Makefile in this directory supports a number of targets for -building components (or all) of the FreeBSD source tree, the most -commonly used one being ``world'', which rebuilds and installs -everything in the FreeBSD system from the source tree except the -kernel, the kernel-modules and the contents of /etc. The ``world'' -target should only be used in cases where the source tree has not -changed from the currently running version. See: -http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +building components (or all) of the FreeBSD source tree. See build(7) +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html for more information, including setting make(1) variables. -The ``buildkernel'' and ``installkernel'' targets build and install +The `buildkernel` and `installkernel` targets build and install the kernel and the modules (see below). Please see the top of the Makefile in this directory for more information on the standard build targets and compile-time flags. -Building a kernel is a somewhat more involved process, documentation -for which can be found at: - http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html -And in the config(8) man page. +Building a kernel is a somewhat more involved process. See build(7), config(8), +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +for more information. + Note: If you want to build and install the kernel with the -``buildkernel'' and ``installkernel'' targets, you might need to build +`buildkernel` and `installkernel` targets, you might need to build world before. More information is available in the handbook. -The sample kernel configuration files reside in the sys/<arch>/conf -sub-directory (assuming that you've installed the kernel sources), the -file named GENERIC being the one used to build your initial installation -kernel. The file NOTES contains entries and documentation for all possible +The kernel configuration files reside in the sys/<arch>/conf +sub-directory. GENERIC is the default configuration used in release builds. +NOTES contains entries and documentation for all possible devices, not just those commonly used. Source Roadmap: --------------- + bin System/user commands. cddl Various commands and libraries under the Common Development Modified: projects/ifnet/bin/ed/glbl.c ============================================================================== --- projects/ifnet/bin/ed/glbl.c Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/bin/ed/glbl.c Tue Apr 21 09:47:27 2015 (r281822) @@ -60,7 +60,7 @@ build_active_list(int isgcmd) return ERR; if (isbinary) NUL_TO_NEWLINE(s, lp->len); - if (!regexec(pat, s, 0, NULL, 0) == isgcmd && + if (!(regexec(pat, s, 0, NULL, 0) == isgcmd) && set_active_node(lp) < 0) return ERR; } @@ -153,7 +153,7 @@ set_active_node(line_t *lp) if (active_list != NULL) { #endif if ((ts = (line_t **) realloc(active_list, - (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) { + (ti += MINBUFSZ) * sizeof(line_t *))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; SPL0(); Modified: projects/ifnet/bin/sh/sh.1 ============================================================================== --- projects/ifnet/bin/sh/sh.1 Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/bin/sh/sh.1 Tue Apr 21 09:47:27 2015 (r281822) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd February 22, 2015 +.Dd April 18, 2015 .Dt SH 1 .Os .Sh NAME @@ -2574,8 +2574,7 @@ the former causes the specified signal t and the latter causes the default action to be taken. Omitting the .Ar action -is another way to request the default action, for compatibility reasons this -usage is not recommended though. +and using only signal numbers is another way to request the default action. In a subshell or utility environment, the shell resets trapped (but not ignored) signals to the default action. The Modified: projects/ifnet/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/ifnet/bin/sh/tests/builtins/Makefile Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/bin/sh/tests/builtins/Makefile Tue Apr 21 09:47:27 2015 (r281822) @@ -137,6 +137,8 @@ FILES+= trap11.0 FILES+= trap12.0 FILES+= trap13.0 FILES+= trap14.0 +FILES+= trap15.0 +FILES+= trap16.0 FILES+= trap2.0 FILES+= trap3.0 FILES+= trap4.0 Copied: projects/ifnet/bin/sh/tests/builtins/trap15.0 (from r281821, head/bin/sh/tests/builtins/trap15.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/bin/sh/tests/builtins/trap15.0 Tue Apr 21 09:47:27 2015 (r281822, copy of r281821, head/bin/sh/tests/builtins/trap15.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +(${SH} -c 'term(){ exit 5;}; trap term TERM; kill -TERM $$') & +wait >/dev/null 2>&1 $! +[ $? -eq 5 ] Copied: projects/ifnet/bin/sh/tests/builtins/trap16.0 (from r281821, head/bin/sh/tests/builtins/trap16.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/bin/sh/tests/builtins/trap16.0 Tue Apr 21 09:47:27 2015 (r281822, copy of r281821, head/bin/sh/tests/builtins/trap16.0) @@ -0,0 +1,20 @@ +# $FreeBSD$ + +traps=$(${SH} -c 'trap "echo bad" 0; trap - 0; trap') +[ -z "$traps" ] || exit 1 +traps=$(${SH} -c 'trap "echo bad" 0; trap "" 0; trap') +expected_traps=$(${SH} -c 'trap "" EXIT; trap') +[ "$traps" = "$expected_traps" ] || exit 2 +traps=$(${SH} -c 'trap "echo bad" 0; trap 0; trap') +[ -z "$traps" ] || exit 3 +traps=$(${SH} -c 'trap "echo bad" 0; trap -- 0; trap') +[ -z "$traps" ] || exit 4 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap - 0 1 2; trap') +[ -z "$traps" ] || exit 5 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap "" 0 1 2; trap') +expected_traps=$(${SH} -c 'trap "" EXIT HUP INT; trap') +[ "$traps" = "$expected_traps" ] || exit 6 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap 0 1 2; trap') +[ -z "$traps" ] || exit 7 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap -- 0 1 2; trap') +[ -z "$traps" ] || exit 8 Modified: projects/ifnet/bin/sh/trap.c ============================================================================== --- projects/ifnet/bin/sh/trap.c Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/bin/sh/trap.c Tue Apr 21 09:47:27 2015 (r281822) @@ -183,7 +183,7 @@ trapcmd(int argc __unused, char **argv) return 0; } action = NULL; - if (*argv && sigstring_to_signum(*argv) == -1) { + if (*argv && !is_number(*argv)) { if (strcmp(*argv, "-") == 0) argv++; else { Modified: projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Tue Apr 21 09:47:27 2015 (r281822) @@ -21,7 +21,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2013 +.Dd April 18, 2015 .Dt DTRACE 1 .Os .Sh NAME @@ -670,7 +670,8 @@ Invalid command line options or argument .Sh SEE ALSO .Xr cpp 1 , .Xr dtruss 1 , -.Xr elf 5 +.Xr elf 5 , +.Xr SDT 9 .Rs .%T Solaris Dynamic Tracing Guide .Re Modified: projects/ifnet/contrib/bmake/ChangeLog ============================================================================== --- projects/ifnet/contrib/bmake/ChangeLog Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/ChangeLog Tue Apr 21 09:47:27 2015 (r281822) @@ -1,8 +1,76 @@ +2015-04-18 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20150418 + Merge with NetBSD make, pick up + o job.c: use memmove() rather than memcpy() + + * unit-tests/varshell.mk: SunOS cannot handle the TERMINATED_BY_SIGNAL + case, so skip it. + +2015-04-11 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20150411 + bump version - only mk/ changes. + +2015-04-10 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20150410 + Merge with NetBSD make, pick up + o document different handling of '-' in jobs mode vs compat + o fix jobs mode so that '-' only applies to whole job + when shell lacks hasErrCtl + o meta.c: use separate vars to track lcwd and latestdir (read) + per process + +2015-04-01 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20150401 + Merge with NetBSD make, pick up + o meta.c: close meta file in child + + * Makefile: use BINDIR.bmake if set. + Same for MANDIR and SHAREDIR + Handy for testing release candidates + in various environments. + +2015-03-26 Simon J. Gerraty <sjg@bad.crufty.net> + + * move initialization of savederr to block where it is used + to avoid spurious warning from gcc5 + +2014-11-11 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20141111 + just a cooler number + +2014-11-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20141105 + Merge with NetBSD make, pick up + o revert major overhaul of suffix handling + and POSIX compliance - too much breakage + and impossible to make backwards compatible. + o we still have the new unit test structure which is ok. + o meta.c ensure "-- filemon" is at start of line. + +2014-09-17 Simon J. Gerraty <sjg@bad.crufty.net> + + * configure.in: test that result of getconf PATH_MAX is numeric + and discard if not. Apparently needed for Hurd. + +2014-08-30 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140830 + Merge with NetBSD make, pick up + o major overhaul of suffix handling + o improved POSIX compliance + o overhauled unit-tests + 2014-06-20 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (MAKE_VERSION): 20140620 Merge with NetBSD make, pick up - o var.c return varNoError rather than var_Error for ::= modidiers. + o var.c return varNoError rather than var_Error for ::= modifiers. 2014-05-22 Simon J. Gerraty <sjg@bad.crufty.net> Modified: projects/ifnet/contrib/bmake/FILES ============================================================================== --- projects/ifnet/contrib/bmake/FILES Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/FILES Tue Apr 21 09:47:27 2015 (r281822) @@ -92,35 +92,74 @@ targ.c trace.c trace.h unit-tests/Makefile.in -unit-tests/comment -unit-tests/cond1 -unit-tests/doterror -unit-tests/dotwait -unit-tests/error -unit-tests/export -unit-tests/export-all -unit-tests/export-env -unit-tests/forloop -unit-tests/forsubst -unit-tests/hash -unit-tests/misc -unit-tests/moderrs -unit-tests/modmatch -unit-tests/modmisc -unit-tests/modorder -unit-tests/modts -unit-tests/modword -unit-tests/order -unit-tests/phony-end -unit-tests/posix -unit-tests/qequals -unit-tests/sunshcmd -unit-tests/sysv -unit-tests/ternary -unit-tests/test.exp -unit-tests/unexport -unit-tests/unexport-env -unit-tests/varcmd +unit-tests/comment.exp +unit-tests/comment.mk +unit-tests/cond1.exp +unit-tests/cond1.mk +unit-tests/doterror.exp +unit-tests/doterror.mk +unit-tests/dotwait.exp +unit-tests/dotwait.mk +unit-tests/error.exp +unit-tests/error.mk +unit-tests/escape.exp +unit-tests/escape.mk +unit-tests/export-all.exp +unit-tests/export-all.mk +unit-tests/export-env.exp +unit-tests/export-env.mk +unit-tests/export.exp +unit-tests/export.mk +unit-tests/forloop.exp +unit-tests/forloop.mk +unit-tests/forsubst.exp +unit-tests/forsubst.mk +unit-tests/hash.exp +unit-tests/hash.mk +unit-tests/impsrc.exp +unit-tests/impsrc.mk +unit-tests/misc.exp +unit-tests/misc.mk +unit-tests/moderrs.exp +unit-tests/moderrs.mk +unit-tests/modmatch.exp +unit-tests/modmatch.mk +unit-tests/modmisc.exp +unit-tests/modmisc.mk +unit-tests/modorder.exp +unit-tests/modorder.mk +unit-tests/modts.exp +unit-tests/modts.mk +unit-tests/modword.exp +unit-tests/modword.mk +unit-tests/order.exp +unit-tests/order.mk +unit-tests/phony-end.exp +unit-tests/phony-end.mk +unit-tests/posix.exp +unit-tests/posix.mk +unit-tests/posix1.exp +unit-tests/posix1.mk +unit-tests/qequals.exp +unit-tests/qequals.mk +unit-tests/suffixes.exp +unit-tests/suffixes.mk +unit-tests/sunshcmd.exp +unit-tests/sunshcmd.mk +unit-tests/sysv.exp +unit-tests/sysv.mk +unit-tests/ternary.exp +unit-tests/ternary.mk +unit-tests/unexport-env.exp +unit-tests/unexport-env.mk +unit-tests/unexport.exp +unit-tests/unexport.mk +unit-tests/varcmd.exp +unit-tests/varcmd.mk +unit-tests/varmisc.exp +unit-tests/varmisc.mk +unit-tests/varshell.exp +unit-tests/varshell.mk util.c var.c wait.h Modified: projects/ifnet/contrib/bmake/Makefile ============================================================================== --- projects/ifnet/contrib/bmake/Makefile Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/Makefile Tue Apr 21 09:47:27 2015 (r281822) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.27 2014/06/20 14:51:54 sjg Exp $ +# $Id: Makefile,v 1.36 2015/04/18 19:58:53 sjg Exp $ # Base version on src date -MAKE_VERSION= 20140620 +MAKE_VERSION= 20150418 PROG= bmake @@ -180,9 +180,9 @@ COPTS.parse.c += -Wno-format-nonliteral COPTS.var.c += -Wno-format-nonliteral # Force these -SHAREDIR= ${prefix}/share -BINDIR= ${prefix}/bin -MANDIR= ${SHAREDIR}/man +SHAREDIR= ${SHAREDIR.bmake:U${prefix}/share} +BINDIR= ${BINDIR.bmake:U${prefix}/bin} +MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} .if !exists(.depend) ${OBJS}: config.h Modified: projects/ifnet/contrib/bmake/PSD.doc/Makefile ============================================================================== --- projects/ifnet/contrib/bmake/PSD.doc/Makefile Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/PSD.doc/Makefile Tue Apr 21 09:47:27 2015 (r281822) @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.2 1995/06/14 15:20:23 christos Exp $ +# $NetBSD: Makefile,v 1.4 2014/07/05 19:22:43 dholland Exp $ # @(#)Makefile 8.1 (Berkeley) 8/14/93 -DIR= psd/12.make +SECTION=reference/ref1 +ARTICLE=make SRCS= tutorial.ms MACROS= -ms +EXTRAHTMLFILES=make1.png make2.png .include <bsd.doc.mk> Modified: projects/ifnet/contrib/bmake/PSD.doc/tutorial.ms ============================================================================== --- projects/ifnet/contrib/bmake/PSD.doc/tutorial.ms Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/PSD.doc/tutorial.ms Tue Apr 21 09:47:27 2015 (r281822) @@ -1,4 +1,4 @@ -.\" $NetBSD: tutorial.ms,v 1.11 2011/08/18 15:19:30 sjg Exp $ +.\" $NetBSD: tutorial.ms,v 1.12 2014/09/30 21:33:14 christos Exp $ .\" Copyright (c) 1988, 1989, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -67,6 +67,16 @@ .\" .EH 'PSD:12-%''PMake \*- A Tutorial' .OH 'PMake \*- A Tutorial''PSD:12-%' +.\" Ix is an indexing macro similar to .IX but I've disabled it for now +.\" Since that would require 2 passes and I am not in the mood for that. +.de Ix +.. +.\" Rd is section (region) define and Rm is region mention? Again disable for +.\" now. +.de Rd +.. +.de Rm +.. .\" xH is a macro to provide numbered headers that are automatically stuffed .\" into a table-of-contents, properly indented, etc. If the first argument .\" is numeric, it is taken as the depth for numbering (as for .NH), else Modified: projects/ifnet/contrib/bmake/bmake.1 ============================================================================== --- projects/ifnet/contrib/bmake/bmake.1 Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/bmake.1 Tue Apr 21 09:47:27 2015 (r281822) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.229 2014/01/19 10:23:29 apb Exp $ +.\" $NetBSD: make.1,v 1.247 2015/04/10 08:43:32 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd February 14, 2014 +.Dd April 9, 2015 .Dt MAKE 1 .Os .Sh NAME @@ -209,8 +209,6 @@ Force the option to print raw values of variables. .It Ar v Print debugging information about variable assignment. -.It Ar w -Print entering and leaving directory messages, pre and post processing. .It Ar x Run shell commands with .Fl x @@ -352,6 +350,8 @@ contains a then the value will be expanded before printing. .It Fl W Treat any warnings during makefile parsing as errors. +.It Fl w +Print entering and leaving directory messages, pre and post processing. .It Fl X Don't export variables passed on the command line to the environment individually. @@ -441,17 +441,29 @@ The value need not necessarily be used to describe existing files. Expansion is in directory order, not alphabetically as done in the shell. .Sh SHELL COMMANDS -Each target may have associated with it a series of shell commands, normally +Each target may have associated with it one or more lines of shell +commands, normally used to create the target. -Each of the commands in this script +Each of the lines in this script .Em must be preceded by a tab. -While any target may appear on a dependency line, only one of these -dependencies may be followed by a creation script, unless the +(For historical reasons, spaces are not accepted.) +While targets can appear in many dependency lines if desired, by +default only one of these rules may be followed by a creation +script. +If the .Ql Ic \&:: -operator is used. +operator is used, however, all rules may include scripts and the +scripts are executed in the order found. .Pp -If the first characters of the command line are any combination of +Each line is treated as a separate shell command, unless the end of +line is escaped with a backslash +.Pq Ql \e +in which case that line and the next are combined. +.\" The escaped newline is retained and passed to the shell, which +.\" normally ignores it. +.\" However, the tab at the beginning of the following line is removed. +If the first characters of the command are any combination of .Ql Ic @ , .Ql Ic + , or @@ -469,6 +481,7 @@ This is similar to the effect of the .MA except that the effect can be limited to a single line of a script. A .Ql Ic \- +in compatibility mode causes any non-zero exit status of the command line to be ignored. .Pp When @@ -477,22 +490,21 @@ is run in jobs mode with .Fl j Ar max_jobs , the entire script for the target is fed to a single instance of the shell. -.Pp In compatibility (non-jobs) mode, each command is run in a separate process. If the command contains any shell meta characters .Pq Ql #=|^(){};&<>*?[]:$`\e\en -it will be passed to the shell, otherwise +it will be passed to the shell; otherwise .Nm will attempt direct execution. -.Pp -Since -.Nm -will -.Xr chdir 2 -to -.Ql Va .OBJDIR -before executing any targets, each child process -starts with that as its current working directory. +If a line starts with +.Ql Ic \- +and the shell has ErrCtl enabled then failure of the command line +will be ignored as in compatibility mode. +Otherwise +.Ql Ic \- +affects the entire job; +the script will stop at the first command line that fails, +but the target will not be deemed to have failed. .Pp Makefiles should be written so that the mode of .Nm @@ -500,20 +512,32 @@ operation does not change their behavior For example, any command which needs to use .Dq cd or -.Dq chdir , -without side-effect should be put in parenthesis: +.Dq chdir +without potentially changing the directory for subsequent commands +should be put in parentheses so it executes in a subshell. +To force the use of one shell, escape the line breaks so as to make +the whole script one command. +For example: .Bd -literal -offset indent - avoid-chdir-side-effects: @echo Building $@ in `pwd` - @(cd ${.CURDIR} && ${.MAKE} $@) + @(cd ${.CURDIR} && ${MAKE} $@) @echo Back in `pwd` ensure-one-shell-regardless-of-mode: - @echo Building $@ in `pwd`; \\ - (cd ${.CURDIR} && ${.MAKE} $@); \\ + @echo Building $@ in `pwd`; \e + (cd ${.CURDIR} && ${MAKE} $@); \e echo Back in `pwd` .Ed +.Pp +Since +.Nm +will +.Xr chdir 2 +to +.Ql Va .OBJDIR +before executing any targets, each child process +starts with that as its current working directory. .Sh VARIABLE ASSIGNMENTS Variables in make are much like variables in the shell, and, by tradition, consist of all upper-case letters. @@ -624,13 +648,19 @@ Variables defined in the makefile or in Variables defined as part of the command line. .It Local variables Variables that are defined specific to a certain target. +.El +.Pp +Local variables are all built in and their values vary magically from +target to target. +It is not currently possible to define new local variables. The seven local variables are as follows: -.Bl -tag -width ".ARCHIVE" +.Bl -tag -width ".ARCHIVE" -offset indent .It Va .ALLSRC The list of all sources for this target; also known as .Ql Va \&\*[Gt] . .It Va .ARCHIVE -The name of the archive file. +The name of the archive file; also known as +.Ql Va \&! . .It Va .IMPSRC In suffix-transformation rules, the name/path of the source from which the target is to be transformed (the @@ -639,7 +669,8 @@ source); also known as .Ql Va \&\*[Lt] . It is not defined in explicit rules. .It Va .MEMBER -The name of the archive member. +The name of the archive member; also known as +.Ql Va % . .It Va .OODATE The list of sources for this target that were deemed out-of-date; also known as @@ -648,31 +679,41 @@ known as The file prefix of the target, containing only the file portion, no suffix or preceding directory components; also known as .Ql Va * . +The suffix must be one of the known suffixes declared with +.Ic .SUFFIXES +or it will not be recognized. .It Va .TARGET The name of the target; also known as .Ql Va @ . .El .Pp The shorter forms -.Ql Va @ , +.Ql ( Va \*[Gt] , +.Ql Va \&! , +.Ql Va \*[Lt] , +.Ql Va % , .Ql Va \&? , -.Ql Va \&\*[Lt] , -.Ql Va \&\*[Gt] , +.Ql Va * , and -.Ql Va * +.Ql Va @ ) are permitted for backward -compatibility with historical makefiles and are not recommended. -The six variables -.Ql Va "@F" , -.Ql Va "@D" , -.Ql Va "\*[Lt]F" , -.Ql Va "\*[Lt]D" , -.Ql Va "*F" , +compatibility with historical makefiles and legacy POSIX make and are +not recommended. +.Pp +Variants of these variables with the punctuation followed immediately by +.Ql D +or +.Ql F , +e.g. +.Ql Va $(@D) , +are legacy forms equivalent to using the +.Ql :H and -.Ql Va "*D" -are permitted for compatibility with +.Ql :T +modifiers. +These forms are accepted for compatibility with .At V -makefiles and are not recommended. +makefiles and POSIX but are not recommended. .Pp Four of the local variables may be used in sources on dependency lines because they expand to the proper value for each target on the line. @@ -682,7 +723,6 @@ These variables are .Ql Va .ARCHIVE , and .Ql Va .MEMBER . -.El .Ss Additional built-in variables In addition, .Nm @@ -2119,19 +2159,87 @@ system makefile system makefile directory .El .Sh COMPATIBILITY -The basic make syntax is compatible between different versions of make, +The basic make syntax is compatible between different versions of make; however the special variables, variable modifiers and conditionals are not. -.Pp -The way that parallel makes are scheduled changed in -NetBSD 4.0 -so that .ORDER and .WAIT apply recursively to the dependent nodes. -The algorithms used may change again in the future. +.Ss Older versions +An incomplete list of changes in older versions of +.Nm : .Pp The way that .for loop variables are substituted changed after NetBSD 5.0 so that they still appear to be variable expansions. In particular this stops them being treated as syntax, and removes some obscure problems using them in .if statements. +.Pp +The way that parallel makes are scheduled changed in +NetBSD 4.0 +so that .ORDER and .WAIT apply recursively to the dependent nodes. +The algorithms used may change again in the future. +.Ss Other make dialects +Other make dialects (GNU make, SVR4 make, POSIX make, etc.) do not +support most of the features of +.Nm +as described in this manual. +Most notably: +.Bl -bullet -offset indent +.It +The +.Ic .WAIT +and +.Ic .ORDER +declarations and most functionality pertaining to parallelization. +(GNU make supports parallelization but lacks these features needed to +control it effectively.) +.It +Directives, including for loops and conditionals and most of the +forms of include files. +(GNU make has its own incompatible and less powerful syntax for +conditionals.) +.It +All built-in variables that begin with a dot. +.It +Most of the special sources and targets that begin with a dot, +with the notable exception of +.Ic .PHONY , +.Ic .PRECIOUS , +and +.Ic .SUFFIXES . +.It +Variable modifiers, except for the +.Dl :old=new +string substitution, which does not portably support globbing with +.Ql % +and historically only works on declared suffixes. +.It +The +.Ic $> +variable even in its short form; most makes support this functionality +but its name varies. +.El +.Pp +Some features are somewhat more portable, such as assignment with +.Ic += , +.Ic ?= , +and +.Ic != . +The +.Ic .PATH +functionality is based on an older feature +.Ic VPATH +found in GNU make and many versions of SVR4 make; however, +historically its behavior is too ill-defined (and too buggy) to rely +upon. +.Pp +The +.Ic $@ +and +.Ic $< +variables are more or less universally portable, as is the +.Ic $(MAKE) +variable. +Basic use of suffix rules (for files only in the current directory, +not trying to chain transformations together, etc.) is also reasonably +portable. .Sh SEE ALSO .Xr mkdep 1 .Sh HISTORY Modified: projects/ifnet/contrib/bmake/bmake.cat1 ============================================================================== --- projects/ifnet/contrib/bmake/bmake.cat1 Tue Apr 21 09:39:48 2015 (r281821) +++ projects/ifnet/contrib/bmake/bmake.cat1 Tue Apr 21 09:47:27 2015 (r281822) @@ -122,9 +122,6 @@ DDEESSCCRRIIPPTTIIOONN _v Print debugging information about variable assignment. - _w Print entering and leaving directory messages, pre and - post processing. - _x Run shell commands with --xx so the actual commands are printed as they are executed. @@ -221,6 +218,9 @@ DDEESSCCRRIIPPTTIIOONN --WW Treat any warnings during makefile parsing as errors. + --ww Print entering and leaving directory messages, pre and post pro- + cessing. + --XX Don't export variables passed on the command line to the environ- ment individually. Variables passed on the command line are still exported via the _M_A_K_E_F_L_A_G_S environment variable. This @@ -273,46 +273,55 @@ FFIILLEE DDEEPPEENNDDEENNCC done in the shell. SSHHEELLLL CCOOMMMMAANNDDSS - Each target may have associated with it a series of shell commands, nor- - mally used to create the target. Each of the commands in this script - _m_u_s_t be preceded by a tab. While any target may appear on a dependency - line, only one of these dependencies may be followed by a creation - script, unless the `::::' operator is used. - - If the first characters of the command line are any combination of `@@', - `++', or `--', the command is treated specially. A `@@' causes the command - not to be echoed before it is executed. A `++' causes the command to be - executed even when --nn is given. This is similar to the effect of the - .MAKE special source, except that the effect can be limited to a single - line of a script. A `--' causes any non-zero exit status of the command - line to be ignored. + Each target may have associated with it one or more lines of shell com- + mands, normally used to create the target. Each of the lines in this + script _m_u_s_t be preceded by a tab. (For historical reasons, spaces are + not accepted.) While targets can appear in many dependency lines if + desired, by default only one of these rules may be followed by a creation + script. If the `::::' operator is used, however, all rules may include + scripts and the scripts are executed in the order found. + + Each line is treated as a separate shell command, unless the end of line + is escaped with a backslash (`\') in which case that line and the next + are combined. If the first characters of the command are any combination + of `@@', `++', or `--', the command is treated specially. A `@@' causes the + command not to be echoed before it is executed. A `++' causes the command + to be executed even when --nn is given. This is similar to the effect of + the .MAKE special source, except that the effect can be limited to a sin- + gle line of a script. A `--' in compatibility mode causes any non-zero + exit status of the command line to be ignored. When bbmmaakkee is run in jobs mode with --jj _m_a_x___j_o_b_s, the entire script for - the target is fed to a single instance of the shell. - - In compatibility (non-jobs) mode, each command is run in a separate - process. If the command contains any shell meta characters - (`#=|^(){};&<>*?[]:$`\\n') it will be passed to the shell, otherwise - bbmmaakkee will attempt direct execution. - - Since bbmmaakkee will chdir(2) to `_._O_B_J_D_I_R' before executing any targets, each - child process starts with that as its current working directory. + the target is fed to a single instance of the shell. In compatibility + (non-jobs) mode, each command is run in a separate process. If the com- + mand contains any shell meta characters (`#=|^(){};&<>*?[]:$`\\n') it + will be passed to the shell; otherwise bbmmaakkee will attempt direct execu- + tion. If a line starts with `--' and the shell has ErrCtl enabled then + failure of the command line will be ignored as in compatibility mode. + Otherwise `--' affects the entire job; the script will stop at the first + command line that fails, but the target will not be deemed to have + failed. Makefiles should be written so that the mode of bbmmaakkee operation does not change their behavior. For example, any command which needs to use - ``cd'' or ``chdir'', without side-effect should be put in parenthesis: - + ``cd'' or ``chdir'' without potentially changing the directory for subse- + quent commands should be put in parentheses so it executes in a subshell. + To force the use of one shell, escape the line breaks so as to make the + whole script one command. For example: avoid-chdir-side-effects: @echo Building $@ in `pwd` - @(cd ${.CURDIR} && ${.MAKE} $@) + @(cd ${.CURDIR} && ${MAKE} $@) @echo Back in `pwd` ensure-one-shell-regardless-of-mode: @echo Building $@ in `pwd`; \ - (cd ${.CURDIR} && ${.MAKE} $@); \ + (cd ${.CURDIR} && ${MAKE} $@); \ echo Back in `pwd` + Since bbmmaakkee will chdir(2) to `_._O_B_J_D_I_R' before executing any targets, each + child process starts with that as its current working directory. + VVAARRIIAABBLLEE AASSSSIIGGNNMMEENNTTSS Variables in make are much like variables in the shell, and, by tradi- tion, consist of all upper-case letters. @@ -402,40 +411,47 @@ VVAARRIIAABBLLEE AASSSSIIGG Variables defined as part of the command line. Local variables - Variables that are defined specific to a certain target. The - seven local variables are as follows: + Variables that are defined specific to a certain target. - _._A_L_L_S_R_C The list of all sources for this target; also known as - `_>'. + Local variables are all built in and their values vary magically from + target to target. It is not currently possible to define new local vari- + ables. The seven local variables are as follows: - _._A_R_C_H_I_V_E The name of the archive file. + _._A_L_L_S_R_C The list of all sources for this target; also known as + `_>'. - _._I_M_P_S_R_C In suffix-transformation rules, the name/path of the - source from which the target is to be transformed (the - ``implied'' source); also known as `_<'. It is not - defined in explicit rules. + _._A_R_C_H_I_V_E The name of the archive file; also known as `_!'. - _._M_E_M_B_E_R The name of the archive member. + _._I_M_P_S_R_C In suffix-transformation rules, the name/path of the + source from which the target is to be transformed (the + ``implied'' source); also known as `_<'. It is not + defined in explicit rules. - _._O_O_D_A_T_E The list of sources for this target that were deemed - out-of-date; also known as `_?'. + _._M_E_M_B_E_R The name of the archive member; also known as `_%'. - _._P_R_E_F_I_X The file prefix of the target, containing only the file - portion, no suffix or preceding directory components; - also known as `_*'. + _._O_O_D_A_T_E The list of sources for this target that were deemed out- + of-date; also known as `_?'. - _._T_A_R_G_E_T The name of the target; also known as `_@'. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504210947.t3L9lSwe068807>