From e950a446cc721c05cd2dfa11643fec5cbb6546e7 Mon Sep 17 00:00:00 2001
From: Jaehyun Kim <jeik01.kim@samsung.com>
Date: Mon, 17 Dec 2012 16:34:01 +0900
Subject: [PATCH] Apply an omitted patch

- Fix BCM4334 first scan
- BCM4334 is not support MAX SCAN SSID

Change-Id: Ie31177932470243a2ff36a184fad1bfddf06c5c1
---
 packaging/wpa_supplicant.manifest       |  5 +++++
 packaging/wpasupplicant.spec            | 11 +++++++----
 wpa_supplicant/dbus/dbus_new_handlers.c |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 packaging/wpa_supplicant.manifest

diff --git a/packaging/wpa_supplicant.manifest b/packaging/wpa_supplicant.manifest
new file mode 100644
index 0000000..017d22d
--- /dev/null
+++ b/packaging/wpa_supplicant.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/wpasupplicant.spec b/packaging/wpasupplicant.spec
index db1a54e..0a92cb6 100644
--- a/packaging/wpasupplicant.spec
+++ b/packaging/wpasupplicant.spec
@@ -1,5 +1,3 @@
-#sbs-git:pkgs/w/wpasupplicant
-
 Name:	    wpasupplicant
 Summary:    Support for WPA and WPA2 (IEEE 802.11i / RSN)
 Version:    0.8.0
@@ -8,13 +6,15 @@ Group:      System/Network
 License:    BSD license
 Source0:    %{name}-%{version}.tar.gz
 Source1:        wpa_supplicant.service
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Source1001:     wpa_supplicant.manifest
+
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(libssl)
 BuildRequires: pkgconfig(libcrypto)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libnl-2.0)
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 WPA and WPA2 are methods for securing wireless networks, the former
@@ -26,6 +26,7 @@ association with IEEE 802.11i networks.
 %setup -q
 
 %build
+cp %{SOURCE1001} .
 cp -v configurations/tizen.config wpa_supplicant/.config
 cp -v configurations/tizen_hostapd.config hostapd/.config
 make %{?_smp_mflags} -C wpa_supplicant all
@@ -78,7 +79,9 @@ rm -rf %{buildroot}%{_sbindir}/wpa_passphrase
 
 %postun -p /sbin/ldconfig
 
+
 %files
+%manifest wpa_supplicant.manifest
 %{_sbindir}/wpa_cli
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/hostapd
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 8fc8aee..154a6d3 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2091,6 +2091,8 @@ dbus_bool_t wpas_dbus_getter_capabilities(DBusMessageIter *iter,
 		goto nomem;
 	/***** Modes end */
 
+#if !defined TIZEN_EXT
+	/* Fix BCM4334 first scan */
 	if (res >= 0) {
 		dbus_int32_t max_scan_ssid = capa.max_scan_ssids;
 
@@ -2098,6 +2100,7 @@ dbus_bool_t wpas_dbus_getter_capabilities(DBusMessageIter *iter,
 						max_scan_ssid))
 			goto nomem;
 	}
+#endif
 
 	if (!wpa_dbus_dict_close_write(&variant_iter, &iter_dict))
 		goto nomem;
-- 
2.7.4