Update to 1.0-rc1 + git

.gitignore

@@ -10,3 +10,4 @@ wpa_supplicant-0.6.4.tar.gz
 wpa_supplicant-0.6.7.tar.gz
 wpa_supplicant-0.6.8.tar.gz
 /wpa_supplicant-0.7.3.tar.gz
+/wpa_supplicant-1.0-rc1.tar.gz

sources

@@ -1 +1 @@
-f516f191384a9a546e3f5145c08addda  wpa_supplicant-0.7.3.tar.gz
+5e16238b661b5230a753b355d4845477  wpa_supplicant-1.0-rc1.tar.gz

wpa_supplicant-bss-changed-prop-notify.patch

@@ -1,44 +0,0 @@
-diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
-index bdfbbac..8bd42c5 100644
---- a/wpa_supplicant/dbus/dbus_new.c
-+++ b/wpa_supplicant/dbus/dbus_new.c
-@@ -691,6 +691,11 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- 			wpas_dbus_getter_current_network;
- 		prop = "CurrentNetwork";
- 		break;
-+	case WPAS_DBUS_PROP_BSSS:
-+		getter = (WPADBusPropertyAccessor)
-+			wpas_dbus_getter_bsss;
-+		prop = "BSSs";
-+		break;
- 	default:
- 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
- 			   __func__, property);
-@@ -1199,6 +1204,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed (wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- }
-@@ -1263,6 +1269,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed (wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- 
-diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
-index 80ea98c..9cdefcb 100644
---- a/wpa_supplicant/dbus/dbus_new.h
-+++ b/wpa_supplicant/dbus/dbus_new.h
-@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
- 	WPAS_DBUS_PROP_STATE,
- 	WPAS_DBUS_PROP_CURRENT_BSS,
- 	WPAS_DBUS_PROP_CURRENT_NETWORK,
-+	WPAS_DBUS_PROP_BSSS,
- };
- 
- enum wpas_dbus_bss_prop {

wpa_supplicant-dbus-service-file-args.patch

@@ -1,19 +1,20 @@
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.fedora	2008-03-02 20:58:35.000000000 -0500
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2008-03-02 20:58:41.000000000 -0500
-@@ -1,4 +1,4 @@
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora	2008-03-02 20:58:35.000000000 -0500
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2008-03-02 20:58:41.000000000 -0500
+@@ -1,5 +1,5 @@
  [D-BUS Service]
  Name=fi.w1.wpa_supplicant1
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
  User=root
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.fedora	2008-03-02 20:58:35.000000000 -0500
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2008-03-02 20:58:41.000000000 -0500
-@@ -1,4 +1,4 @@
+ SystemdService=wpa_supplicant.service
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora	2008-03-02 20:58:35.000000000 -0500
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2008-03-02 20:58:41.000000000 -0500
+@@ -1,5 +1,5 @@
  [D-BUS Service]
  Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
  User=root
-
+ SystemdService=wpa_supplicant.service

wpa_supplicant-openssl-more-algs.patch

@@ -11,5 +11,6 @@ diff -up wpa_supplicant-0.7.3/src/crypto/tls_openssl.c.more-openssl-algs wpa_sup
 +		if (!conf || !conf->fips_mode)
 +			OpenSSL_add_all_algorithms();
  		SSL_library_init();
- #ifndef OPENSSL_NO_SHA256
+ #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
  		EVP_add_digest(EVP_sha256());
+

wpa_supplicant-quiet-scan-results-message.patch

@@ -4,7 +4,7 @@ diff -up wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg wpa_suppl
 @@ -911,7 +911,7 @@ static void wpa_supplicant_event_scan_re
  	}
  
- 	wpa_printf(MSG_DEBUG, "New scan results available");
+ 	wpa_dbg(wpa_s, MSG_DEBUG, "New scan results available");
 -	wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
 +	wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
  	wpas_notify_scan_results(wpa_s);

wpa_supplicant-squelch-driver-disconnect-spam.patch

@@ -15,23 +15,23 @@ diff -up wpa_supplicant-0.6.8/wpa_supplicant/events.c.disconnect-spam wpa_suppli
 +	}
 +
  	wpa_supplicant_mark_disassoc(wpa_s);
- 	bgscan_deinit(wpa_s);
- 	wpa_s->bgscan_ssid = NULL;
+ 
+ 	if (authenticating && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME))
 diff -up wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c.disconnect-spam wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c
 --- wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c.disconnect-spam	2010-05-06 18:10:51.340288662 -0700
 +++ wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c	2010-05-06 18:12:06.090413976 -0700
 @@ -382,6 +382,9 @@ static void wpa_supplicant_cleanup(struc
+ 
  	wpa_supplicant_cancel_scan(wpa_s);
  	wpa_supplicant_cancel_auth_timeout(wpa_s);
- 
 +	if (eloop_is_timeout_registered(wpa_disconnect_spam_handle, wpa_s, NULL))
 +		eloop_cancel_timeout(wpa_disconnect_spam_handle, wpa_s, NULL);
 +
- 	ieee80211_sta_deinit(wpa_s);
- 
- 	wpas_wps_deinit(wpa_s);
+ 	eloop_cancel_timeout(wpa_supplicant_stop_countermeasures, wpa_s, NULL);
+ #ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
+ 	eloop_cancel_timeout(wpa_supplicant_delayed_mic_error_report,
 @@ -461,6 +464,23 @@ const char * wpa_supplicant_state_txt(in
- }
+ #endif /* CONFIG_BGSCAN */
  
  
 +void wpa_disconnect_spam_handle(void *eloop_ctx, void *timeout_ctx)
@@ -91,6 +91,6 @@ diff -up wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant_i.h.disconnect-spam
  			      enum wpa_states state);
 +void wpa_disconnect_spam_handle(void *eloop_ctx, void *timeout_ctx);
  struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s);
+ const char * wpa_supplicant_get_eap_mode(struct wpa_supplicant *wpa_s);
  void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
- void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
 

wpa_supplicant.spec

@@ -1,11 +1,11 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
-Version: 0.7.3
-Release: 11%{?dist}
+Version: 1.0
+Release: 0.1%{?dist}
 License: BSD
 Group: System Environment/Base
-Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz
+Source0: http://w1.fi/releases/%{name}-%{version}-rc1.tar.gz
 Source1: build-config
 Source2: %{name}.conf
 Source3: %{name}.service
@@ -33,10 +33,6 @@ Patch4: wpa_supplicant-squelch-driver-disconnect-spam.patch
 Patch5: wpa_supplicant-openssl-more-algs.patch
 # distro specific customization for Qt4 build tools, not suitable for upstream
 Patch6: wpa_supplicant-gui-qt4.patch
-# Send PropertyChanged notificationes when the BSS list changes
-Patch7: wpa_supplicant-bss-changed-prop-notify.patch
-# Don't crash trying to pass NULL to dbus
-Patch8: 0001-dbus-clean-up-new-D-Bus-interface-getters-setters.patch
 # Dirty hack for WiMAX
 # http://linuxwimax.org/Download?action=AttachFile&do=get&target=wpa-1.5-README.txt
 Patch100: wpa_supplicant-0.7.2-generate-libeap-peer.patch
@@ -92,7 +88,7 @@ This package contains header files for using the EAP peer library.
 Don't use this unless you know what you're doing.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1 -b .assoc-timeout
 %patch1 -p1 -b .flush-debug-output
 %patch2 -p1 -b .dbus-service-file
@@ -100,8 +96,6 @@ Don't use this unless you know what you're doing.
 %patch4 -p1 -b .disconnect-spam
 %patch5 -p1 -b .more-openssl-algs
 %patch6 -p1 -b .qt4
-%patch7 -p1 -b .bss-changed-prop-notify
-%patch8 -p1 -b .dbus-rework
 
 %build
 pushd wpa_supplicant
@@ -226,6 +220,9 @@ fi
 %postun -n libeap -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 10 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-0.1
+- Update to 1.0-rc1 + git
+
 * Fri Sep  9 2011 Tom Callaway <spot@fedoraproject.org> - 1:0.7.3-11
 - add missing systemd scriptlets