PERFORCE change 138553 for review
Sam Leffler
sam at FreeBSD.org
Tue Mar 25 21:36:19 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=138553
Change 138553 by sam at sam_ebb on 2008/03/25 21:36:11
IFC @ 138552
Affected files ...
.. //depot/projects/vap/Makefile#5 integrate
.. //depot/projects/vap/contrib/hostapd/ChangeLog#4 integrate
.. //depot/projects/vap/contrib/hostapd/Makefile#4 integrate
.. //depot/projects/vap/contrib/hostapd/README#4 integrate
.. //depot/projects/vap/contrib/hostapd/aes_wrap.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/aes_wrap.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/common.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/common.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/defconfig#4 integrate
.. //depot/projects/vap/contrib/hostapd/driver.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/driver_test.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_aka.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_gpsk.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_gpsk_common.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_gpsk_common.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_sim.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_sim_common.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_sim_db.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eap_tls_common.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/eapol_version.patch#3 delete
.. //depot/projects/vap/contrib/hostapd/hostapd.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/hostapd.conf#4 integrate
.. //depot/projects/vap/contrib/hostapd/ieee802_11.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/ieee802_11_auth.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/ieee802_1x.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/madwifi.conf#4 integrate
.. //depot/projects/vap/contrib/hostapd/os.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/os_unix.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/radius.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/radius.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/radius_client.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/radius_server.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/tls_openssl.c#4 integrate
.. //depot/projects/vap/contrib/hostapd/version.h#4 integrate
.. //depot/projects/vap/contrib/hostapd/wpa.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/ChangeLog#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/Makefile#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/README#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/asn1.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/common.c#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/common.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/config.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/config_ssid.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/config_winreg.c#3 delete
.. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#3 delete
.. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_unix.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/defconfig#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_background.8#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/driver_hostap.h#3 delete
.. //depot/projects/vap/contrib/wpa_supplicant/driver_ndis.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_peap.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_sim.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_sim_common.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eapol_sm.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eapol_test.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/eloop_win.c#3 delete
.. //depot/projects/vap/contrib/wpa_supplicant/events.c#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/main.c#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/os.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/os_unix.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/pcsc_funcs.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/radius.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/radius.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/radius_client.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/vap/contrib/wpa_supplicant/tls_openssl.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/version.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_cli.c#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.conf#4 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant_i.h#5 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/x509v3.c#4 integrate
.. //depot/projects/vap/etc/freebsd-update.conf#3 integrate
.. //depot/projects/vap/etc/periodic/security/410.logincheck#3 integrate
.. //depot/projects/vap/lib/libc/include/namespace.h#4 integrate
.. //depot/projects/vap/lib/libc/include/un-namespace.h#4 integrate
.. //depot/projects/vap/lib/libthr/Makefile#5 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_attr.c#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_exit.c#6 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_mutex.c#6 integrate
.. //depot/projects/vap/share/man/man4/malo.4#1 branch
.. //depot/projects/vap/share/man/man9/malloc.9#3 integrate
.. //depot/projects/vap/share/man/man9/mbchain.9#3 integrate
.. //depot/projects/vap/share/man/man9/mbuf.9#4 integrate
.. //depot/projects/vap/share/zoneinfo/asia#4 integrate
.. //depot/projects/vap/share/zoneinfo/backward#4 integrate
.. //depot/projects/vap/share/zoneinfo/northamerica#4 integrate
.. //depot/projects/vap/share/zoneinfo/southamerica#5 integrate
.. //depot/projects/vap/share/zoneinfo/zone.tab#4 integrate
.. //depot/projects/vap/sys/amd64/conf/NOTES#8 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/vap/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/vap/sys/ddb/db_command.c#9 integrate
.. //depot/projects/vap/sys/ddb/db_ps.c#6 integrate
.. //depot/projects/vap/sys/ddb/ddb.h#8 integrate
.. //depot/projects/vap/sys/dev/aac/aac.c#9 integrate
.. //depot/projects/vap/sys/dev/aac/aac_cam.c#7 integrate
.. //depot/projects/vap/sys/dev/aac/aac_debug.c#5 integrate
.. //depot/projects/vap/sys/dev/aac/aac_disk.c#4 integrate
.. //depot/projects/vap/sys/dev/aac/aac_pci.c#7 integrate
.. //depot/projects/vap/sys/dev/aac/aacvar.h#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate
.. //depot/projects/vap/sys/dev/en/midway.c#5 integrate
.. //depot/projects/vap/sys/dev/fatm/if_fatm.c#6 integrate
.. //depot/projects/vap/sys/dev/firewire/if_fwe.c#5 integrate
.. //depot/projects/vap/sys/dev/firewire/if_fwip.c#5 integrate
.. //depot/projects/vap/sys/dev/iscsi/initiator/isc_soc.c#4 integrate
.. //depot/projects/vap/sys/i386/conf/NOTES#8 integrate
.. //depot/projects/vap/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/vap/sys/kern/makesyscalls.sh#5 integrate
.. //depot/projects/vap/sys/kern/subr_mchain.c#5 integrate
.. //depot/projects/vap/sys/kern/syscalls.c#11 integrate
.. //depot/projects/vap/sys/kern/syscalls.master#11 integrate
.. //depot/projects/vap/sys/kern/systrace_args.c#8 integrate
.. //depot/projects/vap/sys/kern/uipc_mbuf.c#8 integrate
.. //depot/projects/vap/sys/kern/uipc_socket.c#9 integrate
.. //depot/projects/vap/sys/kern/uipc_syscalls.c#11 integrate
.. //depot/projects/vap/sys/net/bpf.c#10 integrate
.. //depot/projects/vap/sys/net/bpf_buffer.c#2 integrate
.. //depot/projects/vap/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/vap/sys/net/if.c#10 integrate
.. //depot/projects/vap/sys/net/if_ef.c#6 integrate
.. //depot/projects/vap/sys/net/if_enc.c#4 integrate
.. //depot/projects/vap/sys/net/if_fddisubr.c#6 integrate
.. //depot/projects/vap/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/vap/sys/net/if_loop.c#7 integrate
.. //depot/projects/vap/sys/net/if_media.h#8 integrate
.. //depot/projects/vap/sys/net/if_sl.c#5 integrate
.. //depot/projects/vap/sys/net/if_var.h#8 integrate
.. //depot/projects/vap/sys/net/raw_cb.c#6 integrate
.. //depot/projects/vap/sys/netatalk/aarp.c#6 integrate
.. //depot/projects/vap/sys/netatm/port.h#3 integrate
.. //depot/projects/vap/sys/netgraph/ng_pptpgre.c#5 integrate
.. //depot/projects/vap/sys/netgraph/ng_pptpgre.h#3 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.c#10 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.h#7 integrate
.. //depot/projects/vap/sys/netinet/ip_output.c#7 integrate
.. //depot/projects/vap/sys/netinet6/ip6_output.c#10 integrate
.. //depot/projects/vap/sys/netncp/ncp_sock.c#6 integrate
.. //depot/projects/vap/sys/netsmb/smb_iod.c#6 integrate
.. //depot/projects/vap/sys/netsmb/smb_rq.c#5 integrate
.. //depot/projects/vap/sys/netsmb/smb_trantcp.c#6 integrate
.. //depot/projects/vap/sys/nfs/nfs_common.c#5 integrate
.. //depot/projects/vap/sys/nfsclient/krpc_subr.c#6 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_socket.c#8 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_subs.c#11 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_serv.c#9 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvcache.c#5 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsock.c#7 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#8 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#6 integrate
.. //depot/projects/vap/sys/pc98/conf/NOTES#6 integrate
.. //depot/projects/vap/sys/pci/if_mn.c#6 integrate
.. //depot/projects/vap/sys/rpc/rpcclnt.c#6 integrate
.. //depot/projects/vap/sys/sys/cpuset.h#3 integrate
.. //depot/projects/vap/sys/sys/mbuf.h#10 integrate
.. //depot/projects/vap/sys/sys/syscall.h#11 integrate
.. //depot/projects/vap/sys/sys/syscall.mk#11 integrate
.. //depot/projects/vap/sys/sys/sysproto.h#11 integrate
.. //depot/projects/vap/usr.sbin/arp/arp.8#4 integrate
.. //depot/projects/vap/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate
Differences ...
==== //depot/projects/vap/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
#
# The user-driven targets are:
#
@@ -172,6 +172,10 @@
.MAIN: all
STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
#
==== //depot/projects/vap/contrib/hostapd/ChangeLog#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/Makefile#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/README#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/aes_wrap.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/aes_wrap.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/common.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/common.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/defconfig#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/driver.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/driver_test.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_aka.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_gpsk.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_gpsk_common.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_gpsk_common.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_sim.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_sim_common.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_sim_db.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/eap_tls_common.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/hostapd.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/hostapd.conf#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/ieee802_11.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/ieee802_11_auth.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/ieee802_1x.c#4 (text+ko) ====
@@ -10,6 +10,7 @@
* license.
*
* See README and COPYING for more details.
+ * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.6 2008/03/24 21:08:25 sam Exp $
*/
#include "includes.h"
==== //depot/projects/vap/contrib/hostapd/madwifi.conf#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/os.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/os_unix.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/radius.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/radius.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/radius_client.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/radius_server.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/tls_openssl.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/version.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/hostapd/wpa.c#4 (text+ko) ====
@@ -10,6 +10,7 @@
* license.
*
* See README and COPYING for more details.
+ * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.6 2008/03/24 21:08:25 sam Exp $
*/
#include "includes.h"
==== //depot/projects/vap/contrib/wpa_supplicant/ChangeLog#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-Xlist#3 (text+ko) ====
@@ -1,10 +1,13 @@
-$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.4 2007/07/11 15:59:42 sam Exp $
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.5 2008/03/24 19:59:12 sam Exp $
.cvsignore
README-Windows.txt
+config_winreg.c
+ctrl_iface_named_pipe.c
driver_atmel.c
driver_broadcom.c
driver_bsd.c
driver_hostap.c
+driver_hostap.h
driver_ipw.c
driver_madwifi.c
driver_ndiswrapper.c
@@ -13,6 +16,7 @@
driver_test.c
driver_wext.c
driver_wext.h
+eloop_win.c
l2_packet_freebsd.c
l2_packet_linux.c
l2_packet_ndis.c
==== //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-upgrade#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.2 2007/07/11 15:59:42 sam Exp $
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.3 2008/03/24 19:59:12 sam Exp $
WPA Supplicant
originals can be found at: http://hostap.epitest.fi/releases/
@@ -6,12 +6,12 @@
For the import files and directories were pruned by:
- tar -X FREEBSD-Xlist -zxf wpa_supplicant-0.5.8.tar.gz
+ tar -X FREEBSD-Xlist -zxf wpa_supplicant-0.5.10.tar.gz
then imported by:
- cvs import -m 'Import of WPA supplicant 0.5.8' \
- src/contrib/wpa_supplicant MALINEN v0_5_8
+ cvs import -m 'Import of WPA supplicant 0.5.10' \
+ src/contrib/wpa_supplicant MALINEN v0_5_10
To make local changes to wpa_supplcaint, simply patch and commit
to the main branch (aka HEAD). Never make local changes on the
@@ -21,4 +21,4 @@
the next vendor release.
sam at FreeBSD.org
-11-July-2007
+24-March-2008
==== //depot/projects/vap/contrib/wpa_supplicant/Makefile#5 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/README#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/asn1.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/common.c#5 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/common.h#4 (text+ko) ====
@@ -10,6 +10,7 @@
* license.
*
* See README and COPYING for more details.
+ * $FreeBSD: src/contrib/wpa_supplicant/common.h,v 1.5 2008/03/24 19:57:51 sam Exp $
*/
#ifndef COMMON_H
==== //depot/projects/vap/contrib/wpa_supplicant/config.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/config_ssid.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_unix.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/defconfig#5 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_background.8#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/driver_ndis.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_peap.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_sim.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_sim_common.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eapol_sm.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/eapol_test.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/events.c#5 (text) ====
@@ -10,6 +10,7 @@
* license.
*
* See README and COPYING for more details.
+ * $FreeBSD: src/contrib/wpa_supplicant/events.c,v 1.4 2008/03/24 19:57:51 sam Exp $
*/
#include "includes.h"
==== //depot/projects/vap/contrib/wpa_supplicant/main.c#5 (text) ====
@@ -10,6 +10,8 @@
* license.
*
* See README and COPYING for more details.
+ *
+ * $FreeBSD: src/contrib/wpa_supplicant/main.c,v 1.3 2008/03/24 19:57:51 sam Exp $
*/
#include "includes.h"
==== //depot/projects/vap/contrib/wpa_supplicant/os.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/os_unix.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/pcsc_funcs.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/radius.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/radius.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/radius_client.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/tls_openssl.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/version.h#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_cli.c#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#4 (text) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#5 (text+ko) ====
@@ -14,6 +14,7 @@
* This file implements functions for registering and unregistering
* %wpa_supplicant interfaces. In addition, this file contains number of
* functions for managing network connections.
+ * $FreeBSD: src/contrib/wpa_supplicant/wpa_supplicant.c,v 1.5 2008/03/24 19:57:51 sam Exp $
*/
#include "includes.h"
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.conf#4 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant_i.h#5 (text+ko) ====
==== //depot/projects/vap/contrib/wpa_supplicant/x509v3.c#4 (text+ko) ====
==== //depot/projects/vap/etc/freebsd-update.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/freebsd-update.conf,v 1.3 2007/11/28 22:45:09 cperciva Exp $
+# $FreeBSD: src/etc/freebsd-update.conf,v 1.4 2008/03/25 12:13:12 cperciva Exp $
# Trusted keyprint. Changing this is a Bad Idea unless you've received
# a PGP-signed email from <security-officer at FreeBSD.org> telling you to
@@ -28,7 +28,7 @@
# When upgrading to a new FreeBSD release, files which match MergeChanges
# will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/
+MergeChanges /etc/ /var/named/etc/ /boot/device.hints
### Default configuration options:
==== //depot/projects/vap/etc/periodic/security/410.logincheck#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/410.logincheck,v 1.1 2006/08/25 07:34:36 trhodes Exp $
+# $FreeBSD: src/etc/periodic/security/410.logincheck,v 1.2 2008/03/25 15:16:19 remko Exp $
#
# If there is a global system configuration file, suck it in.
@@ -39,7 +39,7 @@
[Yy][Ee][Ss])
echo ""
echo 'Checking login.conf permissions:'
- if [ -G /etc/login.conf -a -O /etc/login.conf ] then
+ if [ -G /etc/login.conf -a -O /etc/login.conf ]; then
n=0
else
echo "Bad ownership of /etc/login.conf"
==== //depot/projects/vap/lib/libc/include/namespace.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/namespace.h,v 1.21 2008/02/06 20:42:35 des Exp $
+ * $FreeBSD: src/lib/libc/include/namespace.h,v 1.22 2008/03/25 15:33:00 ru Exp $
*/
#ifndef _NAMESPACE_H_
@@ -84,6 +84,7 @@
#define pthread_atfork _pthread_atfork
#define pthread_attr_destroy _pthread_attr_destroy
#define pthread_attr_get_np _pthread_attr_get_np
+#define pthread_attr_getaffinity_np _pthread_attr_getaffinity_np
#define pthread_attr_getdetachstate _pthread_attr_getdetachstate
#define pthread_attr_getguardsize _pthread_attr_getguardsize
#define pthread_attr_getinheritsched _pthread_attr_getinheritsched
@@ -94,6 +95,7 @@
#define pthread_attr_getstackaddr _pthread_attr_getstackaddr
#define pthread_attr_getstacksize _pthread_attr_getstacksize
#define pthread_attr_init _pthread_attr_init
+#define pthread_attr_setaffinity_np _pthread_attr_setaffinity_np
#define pthread_attr_setcreatesuspend_np _pthread_attr_setcreatesuspend_np
#define pthread_attr_setdetachstate _pthread_attr_setdetachstate
#define pthread_attr_setguardsize _pthread_attr_setguardsize
@@ -131,6 +133,7 @@
#define pthread_equal _pthread_equal
#define pthread_exit _pthread_exit
#define pthread_getconcurrency _pthread_getconcurrency
+#define pthread_getcpuclockid _pthread_getcpuclockid
#define pthread_getprio _pthread_getprio
#define pthread_getschedparam _pthread_getschedparam
#define pthread_getspecific _pthread_getspecific
==== //depot/projects/vap/lib/libc/include/un-namespace.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.18 2008/02/06 20:42:35 des Exp $
+ * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.19 2008/03/25 13:28:12 ru Exp $
*/
#ifndef _UN_NAMESPACE_H_
@@ -65,6 +65,7 @@
#undef pthread_atfork
#undef pthread_attr_destroy
#undef pthread_attr_get_np
+#undef pthread_attr_getaffinity_np
#undef pthread_attr_getdetachstate
#undef pthread_attr_getguardsize
#undef pthread_attr_getinheritsched
@@ -75,6 +76,7 @@
#undef pthread_attr_getstackaddr
#undef pthread_attr_getstacksize
#undef pthread_attr_init
+#undef pthread_attr_setaffinity_np
#undef pthread_attr_setcreatesuspend_np
#undef pthread_attr_setdetachstate
#undef pthread_attr_setguardsize
@@ -112,6 +114,7 @@
#undef pthread_equal
#undef pthread_exit
#undef pthread_getconcurrency
+#undef pthread_getcpuclockid
#undef pthread_getprio
#undef pthread_getschedparam
#undef pthread_getspecific
==== //depot/projects/vap/lib/libthr/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.32 2008/02/06 20:25:00 des Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.33 2008/03/25 13:28:12 ru Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -17,6 +17,7 @@
LIB=thr
SHLIB_MAJOR= 3
+WARNS?= 3
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
==== //depot/projects/vap/lib/libthr/thread/thr_attr.c#4 (text+ko) ====
@@ -90,7 +90,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.11 2008/03/06 03:24:03 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.12 2008/03/25 13:28:12 ru Exp $
*/
#include "namespace.h"
@@ -547,13 +547,13 @@
return(ret);
}
-static int
-_get_kern_cpuset_size()
+static size_t
+_get_kern_cpuset_size(void)
{
static int kern_cpuset_size = 0;
if (kern_cpuset_size == 0) {
- int len;
+ size_t len;
len = sizeof(kern_cpuset_size);
if (sysctlbyname("kern.smp.maxcpus", &kern_cpuset_size,
@@ -587,9 +587,9 @@
}
if (cpusetsize > attr->cpusetsize) {
- int kern_size = _get_kern_cpuset_size();
+ size_t kern_size = _get_kern_cpuset_size();
if (cpusetsize > kern_size) {
- int i;
+ size_t i;
for (i = kern_size; i < cpusetsize; ++i) {
if (((char *)cpuset)[i])
return (EINVAL);
@@ -627,7 +627,7 @@
memset(((char *)cpuset) + attr->cpusetsize, 0,
cpusetsize - attr->cpusetsize);
} else {
- int kern_size = _get_kern_cpuset_size();
+ size_t kern_size = _get_kern_cpuset_size();
memset(cpuset, -1, MIN(cpusetsize, kern_size));
if (cpusetsize > kern_size)
memset(((char *)cpuset) + kern_size, 0,
==== //depot/projects/vap/lib/libthr/thread/thr_exit.c#6 (text+ko) ====
@@ -26,13 +26,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.26 2008/03/18 02:06:51 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.27 2008/03/25 13:28:12 ru Exp $
*/
+#include "namespace.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <pthread.h>
+#include "un-namespace.h"
#include "thr_private.h"
==== //depot/projects/vap/lib/libthr/thread/thr_mutex.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.71 2008/02/14 12:37:58 des Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.72 2008/03/25 09:48:10 ru Exp $
*/
#include "namespace.h"
@@ -40,6 +40,7 @@
#include <sys/param.h>
#include <sys/queue.h>
#include <pthread.h>
+#include <pthread_np.h>
#include "un-namespace.h"
#include "thr_private.h"
@@ -793,8 +794,9 @@
_pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count)
{
if (*mutex == NULL)
- return (0);
- return (*mutex)->m_spinloops;
+ return (EINVAL);
+ *count = (*mutex)->m_spinloops;
+ return (0);
}
int
@@ -831,8 +833,9 @@
_pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count)
{
if (*mutex == NULL)
- return (0);
- return (*mutex)->m_yieldloops;
+ return (EINVAL);
+ *count = (*mutex)->m_yieldloops;
+ return (0);
}
int
==== //depot/projects/vap/share/man/man9/malloc.9#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
-.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.42 2005/02/22 17:20:20 brueffer Exp $
+.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $
.\"
.Dd June 12, 2003
.Dt MALLOC 9
@@ -247,7 +247,7 @@
flags
.Dv M_DONTWAIT
and
-.Dv M_TRYWAIT .
+.Dv M_WAIT .
.Sh CONTEXT
.Fn malloc ,
.Fn realloc
==== //depot/projects/vap/share/man/man9/mbchain.9#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/mbchain.9,v 1.6 2005/01/28 10:48:52 ru Exp $
+.\" $FreeBSD: src/share/man/man9/mbchain.9,v 1.7 2008/03/25 15:44:02 ru Exp $
.\"
.Dd February 20, 2001
.Dt MBCHAIN 9
@@ -210,7 +210,7 @@
mb_init(mbp);
mb_put_uint8(mbp, 33);
mb_put_uint16le(mbp, length);
-m = m_copym(mbp->mb_top, 0, M_COPYALL, M_TRYWAIT);
+m = m_copym(mbp->mb_top, 0, M_COPYALL, M_WAIT);
send(m);
mb_done(mbp);
.Ed
==== //depot/projects/vap/share/man/man9/mbuf.9#4 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.66 2008/02/01 19:36:21 phk Exp $
+.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.67 2008/03/25 09:39:02 ru Exp $
.\"
-.Dd February 26, 2007
+.Dd March 25, 2008
.Dt MBUF 9
.Os
.\"
@@ -356,20 +356,10 @@
The
.Fa how
argument is to be set to
-.Dv M_TRYWAIT
+.Dv M_WAIT
or
.Dv M_DONTWAIT .
It specifies whether the caller is willing to block if necessary.
-If
-.Fa how
-is set to
-.Dv M_TRYWAIT ,
-a failed allocation will result in the caller being put
-to sleep for a designated
-kern.ipc.mbuf_wait
-.Xr ( sysctl 8
-tunable)
-number of ticks.
A number of other functions and macros related to
.Vt mbufs
have the same argument because they may
@@ -922,7 +912,7 @@
chain will be returned.
.Fa how
should be either
-.Dv M_TRYWAIT
+.Dv M_WAIT
or
.Dv M_DONTWAIT ,
depending on the caller's preference.
@@ -940,7 +930,7 @@
count of any shared mbuf clusters is decremented.
.Fa how
should be either
-.Dv M_TRYWAIT
+.Dv M_WAIT
or
.Dv M_DONTWAIT ,
depending on the caller's preference.
==== //depot/projects/vap/share/zoneinfo/asia#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)asia 8.14
+# @(#)asia 8.18
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -446,13 +446,13 @@
# India
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Calcutta 5:53:28 - LMT 1880 # Kolkata
+Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
6:30 - BURT 1942 May 15 # Burma Time
5:30 - IST 1942 Sep
5:30 1:00 IST 1945 Oct 15
5:30 - IST
-# The following are like Asia/Calcutta:
+# The following are like Asia/Kolkata:
# Andaman Is
# Lakshadweep (Laccadive, Minicoy and Amindivi Is)
# Nicobar Is
@@ -660,6 +660,21 @@
#
# So we'll ignore the Economist's claim.
+# From Steffen Thorsen (2008-03-10):
+# The cabinet in Iraq abolished DST last week, according to the following
+# news sources (in Arabic):
+# <a href="http://www.aljeeran.net/wesima_articles/news-20080305-98602.html">
+# http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
+# </a>
+# <a href="http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10">
+# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
+# </a>
+#
+# We have published a short article in English about the change:
+# <a href="http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html">
+# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+# </a>
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Iraq 1982 only - May 1 0:00 1:00 D
Rule Iraq 1982 1984 - Oct 1 0:00 0 S
@@ -670,8 +685,8 @@
# IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
# Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
#
-Rule Iraq 1991 max - Apr 1 3:00s 1:00 D
-Rule Iraq 1991 max - Oct 1 3:00s 0 S
+Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 D
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list