PERFORCE change 93261 for review
Peter Wemm
peter at FreeBSD.org
Mon Mar 13 20:48:52 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=93261
Change 93261 by peter at peter_daintree on 2006/03/13 20:48:02
IFC @93260
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#113 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#15 integrate
.. //depot/projects/hammer/UPDATING#92 integrate
.. //depot/projects/hammer/bin/chflags/chflags.1#12 integrate
.. //depot/projects/hammer/bin/getfacl/getfacl.1#6 integrate
.. //depot/projects/hammer/bin/getfacl/getfacl.c#5 integrate
.. //depot/projects/hammer/bin/ps/keyword.c#15 integrate
.. //depot/projects/hammer/contrib/bsnmp/FREEBSD-Xlist#5 integrate
.. //depot/projects/hammer/contrib/hostapd/ChangeLog#3 integrate
.. //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#2 integrate
.. //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#2 integrate
.. //depot/projects/hammer/contrib/hostapd/Makefile#3 integrate
.. //depot/projects/hammer/contrib/hostapd/README#2 integrate
.. //depot/projects/hammer/contrib/hostapd/accounting.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/aes.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/aes_wrap.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/aes_wrap.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/common.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/common.h#3 integrate
.. //depot/projects/hammer/contrib/hostapd/config.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/config.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/config_types.h#1 branch
.. //depot/projects/hammer/contrib/hostapd/crypto.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/crypto.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/defconfig#2 integrate
.. //depot/projects/hammer/contrib/hostapd/defs.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/driver.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/driver_test.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/driver_wired.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_defs.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_i.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_identity.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_md5.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_pax.c#1 branch
.. //depot/projects/hammer/contrib/hostapd/eap_pax_common.c#1 branch
.. //depot/projects/hammer/contrib/hostapd/eap_pax_common.h#1 branch
.. //depot/projects/hammer/contrib/hostapd/eap_peap.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_psk.c#1 branch
.. //depot/projects/hammer/contrib/hostapd/eap_psk_common.c#1 branch
.. //depot/projects/hammer/contrib/hostapd/eap_psk_common.h#1 branch
.. //depot/projects/hammer/contrib/hostapd/eap_sim.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_sim_common.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_sim_common.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_sim_db.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_tls.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_tls_common.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_ttls.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_ttls.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eapol_sm.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/eapol_sm.h#3 integrate
.. //depot/projects/hammer/contrib/hostapd/eloop.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eloop.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostap_common.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd.8#1 branch
.. //depot/projects/hammer/contrib/hostapd/hostapd.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd.conf#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd.eap_user#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd_cli.1#1 branch
.. //depot/projects/hammer/contrib/hostapd/hostapd_cli.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd_ctrl.c#2 delete
.. //depot/projects/hammer/contrib/hostapd/hostapd_ctrl.h#2 delete
.. //depot/projects/hammer/contrib/hostapd/iapp.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_11.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_1x.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/l2_packet.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/logwatch/README#1 branch
.. //depot/projects/hammer/contrib/hostapd/logwatch/hostapd#1 branch
.. //depot/projects/hammer/contrib/hostapd/logwatch/hostapd.conf#1 branch
.. //depot/projects/hammer/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/hammer/contrib/hostapd/md5.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/md5.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/ms_funcs.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/ms_funcs.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/radius.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/radius.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/radius_client.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/radius_client.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/radius_server.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/radius_server.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/rc4.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/rc4.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/sha1.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/sha1.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/sta_info.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/sta_info.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/tls.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/tls_none.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/version.h#3 integrate
.. //depot/projects/hammer/contrib/hostapd/wired.conf#2 integrate
.. //depot/projects/hammer/contrib/hostapd/wpa.c#3 integrate
.. //depot/projects/hammer/contrib/hostapd/wpa.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.c#1 branch
.. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.h#1 branch
.. //depot/projects/hammer/contrib/netcat/nc.1#3 integrate
.. //depot/projects/hammer/contrib/ngatm/man/libngatm.3#4 integrate
.. //depot/projects/hammer/contrib/ngatm/man/uniaddr.3#4 integrate
.. //depot/projects/hammer/contrib/ngatm/man/unifunc.3#4 integrate
.. //depot/projects/hammer/contrib/ngatm/man/unimsg.3#3 integrate
.. //depot/projects/hammer/contrib/ngatm/man/unisap.3#3 integrate
.. //depot/projects/hammer/contrib/ngatm/man/unistruct.3#4 integrate
.. //depot/projects/hammer/contrib/openbsm/FREEBSD-upgrade#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/README#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/aes.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/base64.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/base64.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/common.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/common.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config_file.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/config_ssid.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config_types.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/crypto.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/crypto.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/crypto_gnutls.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/defconfig#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/defs.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/developer.txt#2 delete
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/doxygen.fast#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/doxygen.full#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/eap.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/porting.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/driver.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_hostap.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_wired.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/drivers.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_aka.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_defs.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_fast.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_gtc.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_i.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_leap.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_md5.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_mschapv2.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_otp.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax_common.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax_common.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk_common.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk_common.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_testing.txt#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eapol_test.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eloop.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eloop.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/events.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/examples/plaintext.conf#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/examples/wep.conf#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/hostap_common.h#2 delete
.. //depot/projects/hammer/contrib/wpa_supplicant/hostapd.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/l2_packet.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/main.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/md5.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/md5.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/preauth.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/preauth.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/preauth_test.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/rc4.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/rc4.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/sha1.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/sha1.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/tls.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/tls_gnutls.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tls_none.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/tls_schannel.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/todo.txt#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/version.h#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_cli.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_i.h#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate
.. //depot/projects/hammer/etc/Makefile#48 integrate
.. //depot/projects/hammer/etc/devd.conf#25 integrate
.. //depot/projects/hammer/etc/isdn/Makefile#5 integrate
.. //depot/projects/hammer/etc/periodic/daily/440.status-mailq#4 integrate
.. //depot/projects/hammer/etc/periodic/security/800.loginfail#4 integrate
.. //depot/projects/hammer/etc/rc.d/jail#17 integrate
.. //depot/projects/hammer/etc/rc.d/syscons#8 integrate
.. //depot/projects/hammer/include/Makefile#54 integrate
.. //depot/projects/hammer/include/arpa/nameser.h#2 integrate
.. //depot/projects/hammer/lib/Makefile#56 integrate
.. //depot/projects/hammer/lib/libarchive/INSTALL#2 delete
.. //depot/projects/hammer/lib/libarchive/Makefile#32 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile.am#4 delete
.. //depot/projects/hammer/lib/libarchive/archive.h.in#10 integrate
.. //depot/projects/hammer/lib/libarchive/archive_platform.h#14 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tp.c#3 delete
.. //depot/projects/hammer/lib/libarchive/configure.ac.in#10 delete
.. //depot/projects/hammer/lib/libc/Makefile#23 integrate
.. //depot/projects/hammer/lib/libc/Versions.def#1 branch
.. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/alpha/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/amd64/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/arm/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/arm/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/compat-43/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/db/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/db/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#9 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#26 integrate
.. //depot/projects/hammer/lib/libc/gen/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#7 integrate
.. //depot/projects/hammer/lib/libc/gen/_spinlock_stub.c#3 integrate
.. //depot/projects/hammer/lib/libc/gmon/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/libc/gmon/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/i386/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/i386/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/ia64/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/include/libc_private.h#8 integrate
.. //depot/projects/hammer/lib/libc/include/namespace.h#9 integrate
.. //depot/projects/hammer/lib/libc/include/un-namespace.h#8 integrate
.. //depot/projects/hammer/lib/libc/locale/Makefile.inc#24 integrate
.. //depot/projects/hammer/lib/libc/locale/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/net/Makefile.inc#13 integrate
.. //depot/projects/hammer/lib/libc/net/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/nls/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libc/nls/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#11 integrate
.. //depot/projects/hammer/lib/libc/posix1e/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/powerpc/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/powerpc/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/quad/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/quad/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/regex/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/regex/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#11 integrate
.. //depot/projects/hammer/lib/libc/rpc/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/softfloat/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/sparc64/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#15 integrate
.. //depot/projects/hammer/lib/libc/stdio/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#14 integrate
.. //depot/projects/hammer/lib/libc/stdlib/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/stdtime/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/string/Makefile.inc#11 integrate
.. //depot/projects/hammer/lib/libc/string/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#22 integrate
.. //depot/projects/hammer/lib/libc/sys/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/sys/mq.c#2 delete
.. //depot/projects/hammer/lib/libc/sys/recv.2#12 integrate
.. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/uuid/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/xdr/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libc/xdr/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/yp/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/libc/yp/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libpam/modules/pam_login_access/Makefile#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_login_access/login.access.5#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_login_access/pam_login_access.8#3 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#19 integrate
.. //depot/projects/hammer/lib/libpthread/pthread.map#15 integrate
.. //depot/projects/hammer/lib/libpthread/sys/thr_error.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_accept.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_aio_suspend.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_atfork.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_destroy.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_get_np.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getscope.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstack.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_init.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setguardsize.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setschedparam.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setscope.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstack.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_barrier.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_barrierattr.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#16 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_clean.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_close.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#19 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_init.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_connect.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_creat.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#19 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_equal.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_execve.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#11 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_fcntl.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_fork.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_fsync.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_getprio.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_getschedparam.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#22 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kill.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_main_np.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_init.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_msync.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_multi_np.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#18 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_protocol.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#10 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_once.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_open.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_pause.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_poll.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#34 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_pselect.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_pspinlock.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_raise.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_read.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_readv.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_rwlock.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_rwlockattr.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_select.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_self.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_setprio.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_setschedparam.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#26 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigaltstack.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#9 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#14 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_single_np.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sleep.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#13 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_suspend_np.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_switch_np.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_symbols.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_system.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_tcdrain.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_vfork.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_wait.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_wait4.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_waitpid.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_write.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_writev.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#7 integrate
.. //depot/projects/hammer/lib/librt/aio.c#2 integrate
.. //depot/projects/hammer/lib/librt/mq.c#2 integrate
.. //depot/projects/hammer/lib/librt/sigev_thread.c#2 integrate
.. //depot/projects/hammer/lib/librt/sigev_thread.h#2 integrate
.. //depot/projects/hammer/lib/librt/timer.c#2 integrate
.. //depot/projects/hammer/lib/libstand/printf.c#6 integrate
.. //depot/projects/hammer/lib/libthr/pthread.map#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#20 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_timer.c#3 delete
.. //depot/projects/hammer/release/Makefile#83 integrate
.. //depot/projects/hammer/release/amd64/boot_crunch.conf#6 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#4 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#8 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate
.. //depot/projects/hammer/release/i386/boot_crunch.conf#7 integrate
.. //depot/projects/hammer/release/ia64/boot_crunch.conf#9 integrate
.. //depot/projects/hammer/release/pc98/boot_crunch.conf#8 integrate
.. //depot/projects/hammer/release/scripts/kernels-install.sh#1 branch
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#13 integrate
.. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#13 integrate
.. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.c#4 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#29 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#7 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#53 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#49 integrate
.. //depot/projects/hammer/share/examples/netgraph/ether.bridge#2 integrate
.. //depot/projects/hammer/share/man/man4/cpufreq.4#10 integrate
.. //depot/projects/hammer/share/man/man4/ipw.4#8 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#10 integrate
.. //depot/projects/hammer/share/man/man4/netgraph.4#10 integrate
.. //depot/projects/hammer/share/man/man4/ng_fec.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#7 integrate
.. //depot/projects/hammer/share/man/man4/sysmouse.4#6 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#72 integrate
.. //depot/projects/hammer/share/man/man9/firmware.9#3 integrate
.. //depot/projects/hammer/share/mk/bsd.README#9 integrate
.. //depot/projects/hammer/sys/alpha/alpha/clock.c#13 integrate
.. //depot/projects/hammer/sys/alpha/include/pcpu.h#3 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#117 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#133 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#94 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#10 integrate
.. //depot/projects/hammer/sys/arm/arm/in_cksum.c#6 integrate
.. //depot/projects/hammer/sys/arm/include/in_cksum.h#4 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#17 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#12 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/smbios.c#4 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#41 integrate
.. //depot/projects/hammer/sys/conf/NOTES#107 integrate
.. //depot/projects/hammer/sys/conf/files#138 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#24 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#85 integrate
.. //depot/projects/hammer/sys/conf/files.i386#71 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#34 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#54 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#16 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#35 integrate
.. //depot/projects/hammer/sys/conf/options#94 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.h#7 integrate
.. //depot/projects/hammer/sys/ddb/db_command.c#17 integrate
.. //depot/projects/hammer/sys/ddb/ddb.h#12 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#17 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#59 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#39 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#71 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#39 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#42 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#31 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#36 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-usb.c#1 branch
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#33 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#18 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.h#8 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#7 integrate
.. //depot/projects/hammer/sys/dev/cs/if_cs.c#19 integrate
.. //depot/projects/hammer/sys/dev/exca/exca.c#13 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#5 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#12 integrate
.. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#7 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#13 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipwreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipwvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#16 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#8 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#8 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#12 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.h#9 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#5 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ral.c#15 delete
.. //depot/projects/hammer/sys/dev/ral/if_ral_pccard.c#5 delete
.. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ralreg.h#4 delete
.. //depot/projects/hammer/sys/dev/ral/if_ralvar.h#4 delete
.. //depot/projects/hammer/sys/dev/ral/rt2560.c#1 branch
.. //depot/projects/hammer/sys/dev/ral/rt2560reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ral/rt2560var.h#1 branch
.. //depot/projects/hammer/sys/dev/ral/rt2661.c#1 branch
.. //depot/projects/hammer/sys/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/hammer/sys/dev/ral/rt2661reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ral/rt2661var.h#1 branch
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#28 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#38 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#24 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#35 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#29 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#10 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#8 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#22 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#11 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#10 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#3 integrate
.. //depot/projects/hammer/sys/i386/i386/geode.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#55 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#52 integrate
.. //depot/projects/hammer/sys/kern/kern_environment.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#61 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#70 integrate
.. //depot/projects/hammer/sys/kern/kern_tc.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#87 integrate
.. //depot/projects/hammer/sys/kern/subr_prf.c#25 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#38 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#69 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#101 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#40 integrate
.. //depot/projects/hammer/sys/modules/ata/atausb/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/iwi/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/pf/Makefile#10 integrate
.. //depot/projects/hammer/sys/modules/pflog/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/ral/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/smbfs/Makefile#8 integrate
.. //depot/projects/hammer/sys/net/bridgestp.c#9 integrate
.. //depot/projects/hammer/sys/net/if_bridgevar.h#8 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#37 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#30 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#32 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.h#19 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#23 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#25 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#33 integrate
.. //depot/projects/hammer/sys/netsmb/smb_crypt.c#6 integrate
.. //depot/projects/hammer/sys/netsmb/smb_smb.c#7 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#46 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#29 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#17 integrate
.. //depot/projects/hammer/sys/sys/ata.h#15 integrate
.. //depot/projects/hammer/sys/sys/cdefs.h#23 integrate
.. //depot/projects/hammer/sys/sys/disk.h#6 integrate
.. //depot/projects/hammer/sys/sys/hash.h#1 branch
.. //depot/projects/hammer/sys/sys/mount.h#43 integrate
.. //depot/projects/hammer/sys/sys/proc.h#96 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#65 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#13 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#41 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#35 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#57 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_inode.c#18 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#15 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#18 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufsmount.h#9 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#44 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#30 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#38 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#54 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#50 integrate
.. //depot/projects/hammer/sys/vm/vm_pageq.c#15 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/resolv/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#9 integrate
.. //depot/projects/hammer/tools/tools/ncpus/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/ncpus/acpi.c#2 integrate
.. //depot/projects/hammer/tools/tools/ncpus/biosmptable.c#2 integrate
.. //depot/projects/hammer/tools/tools/ncpus/ncpus.c#2 integrate
.. //depot/projects/hammer/tools/tools/umastat/umastat.c#3 integrate
.. //depot/projects/hammer/usr.bin/login/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/login/README#2 integrate
.. //depot/projects/hammer/usr.bin/login/login.1#7 integrate
.. //depot/projects/hammer/usr.bin/login/login.access.5#4 delete
.. //depot/projects/hammer/usr.bin/login/login_access.c#2 delete
.. //depot/projects/hammer/usr.bin/login/pathnames.h#2 integrate
.. //depot/projects/hammer/usr.bin/rpcinfo/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#15 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile.am#4 delete
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#26 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#11 integrate
.. //depot/projects/hammer/usr.bin/tar/configure.ac.in#8 delete
.. //depot/projects/hammer/usr.bin/tar/read.c#15 integrate
.. //depot/projects/hammer/usr.bin/xinstall/install.1#9 integrate
.. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#10 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#9 integrate
.. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2855/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2alt/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/lpr/filters/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#15 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#14 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#5 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#13 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/acpi.c#1 branch
.. //depot/projects/hammer/usr.sbin/sysinstall/acpidump.h#1 branch
.. //depot/projects/hammer/usr.sbin/sysinstall/biosmptable.c#1 branch
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#24 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#10 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#27 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#39 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#24 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#13 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#26 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.c#10 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/driver_freebsd.c#3 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/wpa/l2_packet.c#3 integrate
.. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.8#3 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#7 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#113 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -836,6 +836,10 @@
_pwd_mkdb= usr.sbin/pwd_mkdb
.endif
+.if ${BOOTSTRAPPING} < 700014
+_gensnmptree= usr.sbin/bsnmpd/gensnmptree
+.endif
+
bootstrap-tools:
.for _tool in \
${_strfile} \
@@ -851,6 +855,7 @@
usr.bin/rpcgen \
usr.bin/xinstall \
usr.sbin/config \
+ ${_gensnmptree} \
${_crunchgen} \
${_pwd_mkdb}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
==== //depot/projects/hammer/ObsoleteFiles.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.30 2006/03/13 09:28:46 harti Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20060127: revert libdisk to static-only
+OLD_FILES+=usr/lib/libdisk.so
# 20051215: rescue/nextboot.sh renamed to rescue/nextboot
OLD_FILES+=rescue/nextboot.sh
# 20051214: usbd(8) removed
@@ -270,6 +272,8 @@
OLD_FILES+=usr/lib/libkse.a
OLD_FILES+=usr/lib/libkse.so
.endif
+# 20040119: installed as `isdntel' in newer systems
+OLD_FILES+=etc/isdn/isdntel.sh
# 200XYYZZ: /lib transition clitches
OLD_FILES+=lib/libalias.so
OLD_FILES+=lib/libatm.so
@@ -2648,6 +2652,8 @@
OLD_FILES+=usr/games/worms
OLD_FILES+=usr/games/wump
+# 20060127: revert libdisk to static-only
+OLD_LIBS+=usr/lib/libdisk.so.3
# 20050722: bump for 6.0-RELEASE
OLD_LIBS+=lib/libalias.so.4
OLD_LIBS+=lib/libatm.so.2
==== //depot/projects/hammer/UPDATING#92 (text+ko) ====
@@ -21,12 +21,21 @@
developers choose to disable these features on build machines
to maximize performance.
+20060305:
+ The NETSMBCRYPTO kernel option has been retired because its
+ functionality is always included in NETSMB and smbfs.ko now.
+
20060303:
The TDFX_LINUX kernel option was retired and replaced by the
- tdfx_linux device. The latter can be loaded as a kernel module.
- Loading it alone should suffice to get 3dfx support for Linux
- apps because it will pull in tdfx.ko and linux.ko through its
- dependencies.
+ tdfx_linux device. The latter can be loaded as the 3dfx_linux.ko
+ kernel module. Loading it alone should suffice to get 3dfx support
+ for Linux apps because it will pull in 3dfx.ko and linux.ko through
+ its dependencies.
+
+20060204:
+ The 'audit' group was added to support the new auditing functionality
+ in the base system. Be sure to follow the directions for updating,
+ including the requirement to run mergemaster -p.
20060201:
The kernel ABI to file system modules was changed on i386.
@@ -164,6 +173,10 @@
must now run devd. Also, DNS updating was lost so you will need
to find a workaround if you use this feature.
+ The '_dhcp' user was added to support the OpenBSD dhclient. Be
+ sure to run mergemaster -p (like you are supposed to do every time
+ anyway).
+
20050605:
if_bridge was added to the tree. This has changed struct ifnet.
Please recompile userland and all network related modules.
@@ -517,4 +530,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $
+$FreeBSD: src/UPDATING,v 1.443 2006/03/10 18:40:31 imp Exp $
==== //depot/projects/hammer/bin/chflags/chflags.1#12 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chflags.1 8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $
.\"
.Dd March 3, 2006
.Dt CHFLAGS 1
@@ -85,24 +85,24 @@
of keywords.
The following keywords are currently defined:
.Pp
-.Bl -tag -offset indent -width ".Ar opaque"
-.It Ar arch , archived
+.Bl -tag -offset indent -width ".Cm opaque"
+.It Cm arch , archived
set the archived flag (super-user only)
-.It Ar opaque
+.It Cm opaque
set the opaque flag (owner or super-user only)
-.It Ar nodump
+.It Cm nodump
set the nodump flag (owner or super-user only)
-.It Ar sappnd , sappend
+.It Cm sappnd , sappend
set the system append-only flag (super-user only)
-.It Ar schg , schange , simmutable
+.It Cm schg , schange , simmutable
set the system immutable flag (super-user only)
-.It Ar sunlnk , sunlink
+.It Cm sunlnk , sunlink
set the system undeletable flag (super-user only)
-.It Ar uappnd , uappend
+.It Cm uappnd , uappend
set the user append-only flag (owner or super-user only)
-.It Ar uchg , uchange , uimmutable
+.It Cm uchg , uchange , uimmutable
set the user immutable flag (owner or super-user only)
-.It Ar uunlnk , uunlink
+.It Cm uunlnk , uunlink
set the user undeletable flag (owner or super-user only)
.El
.Pp
@@ -114,39 +114,39 @@
For example:
.Pp
.Bl -tag -offset indent -width "nouchg" -compact
-.It Ar nouchg
+.It Cm nouchg
clear the user immutable flag (owner or super-user only)
-.It Ar dump
+.It Cm dump
clear the nodump flag (owner or super-user only)
.El
.Pp
A few of the octal values include:
-.Bl -tag -offset indent -width ".Ar 10"
+.Bl -tag -offset indent -width ".Li 10"
.It Li 0
Clear all file flags.
.It Li 1
Translates to the
-.Ar nodump
+.Cm nodump
keyword.
.It Li 2
Translates to the
-.Ar uchg
+.Cm uchg
keyword.
.It Li 3
Translates to the
-.Ar uchg , nodump
+.Cm uchg , nodump
keywords.
.It Li 4
Translates to the
-.Ar uappnd
+.Cm uappnd
keyword.
.It Li 10
Translates to the
-.Ar opaque
+.Cm opaque
keyword.
.It Li 20
translates to the
-uunlnk
+.Cm uunlnk
keyword.
.El
.Pp
@@ -176,7 +176,7 @@
.Pp
Note that the ability to change certain flags is dependent
on the current kernel
-.Em securelevel
+.Va securelevel
setting.
See
.Xr security 7
==== //depot/projects/hammer/bin/getfacl/getfacl.1#6 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.9 2005/01/16 16:41:57 ru Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.10 2006/03/13 11:45:29 rwatson Exp $
.\"
.\" Developed by the TrustedBSD Project.
.\" Support for POSIX.1e access control lists.
@@ -38,7 +38,7 @@
.Nd get ACL information
.Sh SYNOPSIS
.Nm
-.Op Fl dh
+.Op Fl dhq
.Op Ar
.Sh DESCRIPTION
The
@@ -64,6 +64,9 @@
.It Fl h
If the target of the operation is a symbolic link, return the ACL from
the symbolic link itself rather than following the link.
+.It Fl q
+Don't write commented information about file name and ownership. This is
+useful when dealing with filenames with unprintable characters.
.El
.Pp
The following operand is available:
==== //depot/projects/hammer/bin/getfacl/getfacl.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.10 2005/02/09 17:37:37 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,7 +52,7 @@
usage(void)
{
- fprintf(stderr, "getfacl [-dh] [file ...]\n");
+ fprintf(stderr, "getfacl [-dhq] [file ...]\n");
}
/*
@@ -147,7 +147,7 @@
}
static int
-print_acl(char *path, acl_type_t type, int hflag)
+print_acl(char *path, acl_type_t type, int hflag, int qflag)
{
struct stat sb;
acl_t acl;
@@ -168,7 +168,9 @@
else
more_than_one++;
- printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid);
+ if (!qflag)
+ printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid,
+ sb.st_gid);
if (hflag)
acl = acl_get_link_np(path, type);
@@ -204,7 +206,7 @@
}
static int
-print_acl_from_stdin(acl_type_t type, int hflag)
+print_acl_from_stdin(acl_type_t type, int hflag, int qflag)
{
char *p, pathname[PATH_MAX];
int carried_error = 0;
@@ -212,7 +214,7 @@
while (fgets(pathname, (int)sizeof(pathname), stdin)) {
if ((p = strchr(pathname, '\n')) != NULL)
*p = '\0';
- if (print_acl(pathname, type, hflag) == -1) {
+ if (print_acl(pathname, type, hflag, qflag) == -1) {
carried_error = -1;
}
}
@@ -226,10 +228,11 @@
acl_type_t type = ACL_TYPE_ACCESS;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list