From edcf062f25efe833c8ad0a832b6c7fe5539d6c0236906d1ede95651f6749ff51 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Sat, 26 Dec 2009 12:59:36 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=5
---
 wpa_supplicant-fix_dbus_config.patch  | 28 +++++++++------------------
 wpa_supplicant-fix_dbus_config2.patch | 18 +++++++++++++++++
 wpa_supplicant.changes                |  5 -----
 wpa_supplicant.spec                   |  4 ++--
 4 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 wpa_supplicant-fix_dbus_config2.patch

diff --git a/wpa_supplicant-fix_dbus_config.patch b/wpa_supplicant-fix_dbus_config.patch
index 7db1cde..c2032a4 100644
--- a/wpa_supplicant-fix_dbus_config.patch
+++ b/wpa_supplicant-fix_dbus_config.patch
@@ -1,23 +1,13 @@
-Index: wpa_supplicant-0.6.9/wpa_supplicant/dbus-wpa_supplicant.conf
-===================================================================
---- wpa_supplicant-0.6.9.orig/wpa_supplicant/dbus-wpa_supplicant.conf
-+++ wpa_supplicant-0.6.9/wpa_supplicant/dbus-wpa_supplicant.conf
-@@ -4,13 +4,10 @@
- <busconfig>
+--- wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf
++++ wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf
+@@ -5,8 +5,8 @@
          <policy user="root">
                  <allow own="fi.epitest.hostap.WPASupplicant"/>
--
-                 <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
+ 
+-                <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
 -                <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
--        </policy>
--        <policy context="default">
--                <deny own="fi.epitest.hostap.WPASupplicant"/>
--                <deny send_destination="fi.epitest.hostap.WPASupplicant"/>
--                <deny send_interface="fi.epitest.hostap.WPASupplicant"/>
--        </policy>
-+         </policy>
-+         <policy context="default">
 +                <allow send_destination="fi.epitest.hostap.WPASupplicant"
-+                       send_interface="org.freedesktop.DBus.Introspectable"/>
-+         </policy>
- </busconfig>
++                       send_interface="fi.epitest.hostap.WPASupplicant"/>
+         </policy>
+         <policy context="default">
+                 <deny own="fi.epitest.hostap.WPASupplicant"/>
diff --git a/wpa_supplicant-fix_dbus_config2.patch b/wpa_supplicant-fix_dbus_config2.patch
new file mode 100644
index 0000000..a0b8552
--- /dev/null
+++ b/wpa_supplicant-fix_dbus_config2.patch
@@ -0,0 +1,18 @@
+diff -ur BUILD/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf BUILD2/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf
+--- BUILD/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf	2009-01-28 10:43:48.000000000 +0100
++++ BUILD2/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf	2009-01-27 11:05:48.000000000 +0100
+@@ -7,7 +7,13 @@
+ 
+                 <allow send_destination="fi.epitest.hostap.WPASupplicant"
+                        send_interface="fi.epitest.hostap.WPASupplicant"/>
+-        </policy>
++                <allow send_destination="fi.epitest.hostap.WPASupplicant"
++                       send_interface="fi.epitest.hostap.WPASupplicant.Interface"/>
++                <allow send_destination="fi.epitest.hostap.WPASupplicant"
++                       send_interface="fi.epitest.hostap.WPASupplicant.Network"/>
++                <allow send_destination="fi.epitest.hostap.WPASupplicant"
++                       send_interface="fi.epitest.hostap.WPASupplicant.BSSID"/>
++         </policy>
+         <policy context="default">
+                 <deny own="fi.epitest.hostap.WPASupplicant"/>
+                 <deny send_destination="fi.epitest.hostap.WPASupplicant"/>
diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index 156da4e..0c789c9 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Sep 28 08:44:02 UTC 2009 - lnussel@suse.de
-
-- simplify dbus config, allow introspection
-
 -------------------------------------------------------------------
 Mon Sep  7 19:41:35 UTC 2009 - claes.backstrom@fsfe.org
 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index a7fbb14..d18118b 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -42,7 +42,7 @@ Patch3:         wpa_supplicant-dbus-iface-segfault-fix.patch
 Patch4:         wpa_supplicant-errormsg.patch
 Patch5:         wpa_supplicant-dbus-reset-eapol.patch
 Patch6:         wpa_supplicant-fix_dbus_config.patch
-#Patch7:         wpa_supplicant-fix_dbus_config2.patch
+Patch7:         wpa_supplicant-fix_dbus_config2.patch
 # wpa_supplicant-roaming.patch won't go upstream as it is an ugly hack, once
 # roaming is implemented in a clean way this patch should be removed
 Patch8:         wpa_supplicant-roaming.patch
@@ -88,7 +88,7 @@ cp %{SOURCE1} wpa_supplicant/.config
 %patch4 -p2
 %patch5 -p1
 %patch6 -p1
-#patch7 -p1
+%patch7 -p2
 %patch8 -p2
 %patch9 -p2