diff --git a/wpa_supplicant-0.6.7-no-unrequested-reply.patch b/wpa_supplicant-0.6.7-no-unrequested-reply.patch deleted file mode 100644 index 30c92c8..0000000 --- a/wpa_supplicant-0.6.7-no-unrequested-reply.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Helmut Schaa -Date: Mon, 9 Feb 2009 17:45:06 +0000 (+0200) -Subject: Send a dbus reply only if requested by the caller -X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=c3f5b1e16d119392ec30e3b5a0d015ee2aa3d664;hp=02a89365abba33fb462f739c325dc9cc3e847dae - -Send a dbus reply only if requested by the caller - -wpa_supplicant should not send a dbus reply as response to a method call -if no reply was requested by the caller. Sending a reply even if not -requested is basically no problem but triggers dbus warnings like the -one below. - -Feb 9 07:31:23 linux-gvjr dbus-daemon: Rejected send message, 2 matched -rules; type="error", sender=":1.129" (uid=0 pid=30228 -comm="/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wp") -interface="(unset)" member="(unset)" error -name="fi.epitest.hostap.WPASupplicant.InvalidInterface" -requested_reply=0 destination=":1.128" (uid=0 pid=30226 -comm="/usr/sbin/NetworkManager ")) - -Signed-off-by: Helmut Schaa ---- - -diff --git a/wpa_supplicant/ctrl_iface_dbus.c b/wpa_supplicant/ctrl_iface_dbus.c -index b772247..c4e329c 100644 ---- a/wpa_supplicant/ctrl_iface_dbus.c -+++ b/wpa_supplicant/ctrl_iface_dbus.c -@@ -548,7 +548,8 @@ static DBusHandlerResult wpas_iface_message_handler(DBusConnection *connection, - - /* If the message was handled, send back the reply */ - if (reply) { -- dbus_connection_send(connection, reply, NULL); -+ if (!dbus_message_get_no_reply(message)) -+ dbus_connection_send(connection, reply, NULL); - dbus_message_unref(reply); - } - -@@ -607,7 +608,8 @@ static DBusHandlerResult wpas_message_handler(DBusConnection *connection, - - /* If the message was handled, send back the reply */ - if (reply) { -- dbus_connection_send(connection, reply, NULL); -+ if (!dbus_message_get_no_reply(message)) -+ dbus_connection_send(connection, reply, NULL); - dbus_message_unref(reply); - } - diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 97f1a2f..ffe8b88 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -17,8 +17,6 @@ Patch1: wpa_supplicant-0.5.7-qmake-location.patch Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch Patch5: wpa_supplicant-0.6.7-quiet-scan-results-message.patch -# Upstream: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff;h=c3f5b1e16d119392ec30e3b5a0d015ee2aa3d664;hp=02a89365abba33fb462f739c325dc9cc3e847dae#patch1 -Patch8: wpa_supplicant-0.6.7-no-unrequested-reply.patch URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +49,6 @@ Graphical User Interface for wpa_supplicant written using QT3 %patch2 -p1 -b .flush-debug-output %patch4 -p1 -b .dbus-service-file %patch5 -p1 -b .quiet-scan-results-msg -%patch8 -p1 -b .no-unrequested-reply %build pushd wpa_supplicant