From 2c2a3845368a8a342a3b8f08402cf69842434559 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 11 Jun 2015 17:12:05 +0200 Subject: [PATCH] Fix NAP connections (rh #1230461) --- ...-Fix-not-being-able-to-initiate-conn.patch | 36 +++++++++++++++++++ bluez.spec | 9 +++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 0001-profiles-network-Fix-not-being-able-to-initiate-conn.patch diff --git a/0001-profiles-network-Fix-not-being-able-to-initiate-conn.patch b/0001-profiles-network-Fix-not-being-able-to-initiate-conn.patch new file mode 100644 index 0000000..764d71b --- /dev/null +++ b/0001-profiles-network-Fix-not-being-able-to-initiate-conn.patch @@ -0,0 +1,36 @@ +From 546ec13c0df3ecbd60e66213f4aef49f8f39dfeb Mon Sep 17 00:00:00 2001 +From: Szymon Janc +Date: Thu, 9 Apr 2015 14:11:29 +0200 +Subject: [PATCH] profiles/network: Fix not being able to initiate connection + +This was due to incorrect use of bt_uuid_to_uuid128 where source +and destination parameters were reversed. +--- + profiles/network/connection.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/profiles/network/connection.c b/profiles/network/connection.c +index 2b07771..77e0a34 100644 +--- a/profiles/network/connection.c ++++ b/profiles/network/connection.c +@@ -293,7 +293,7 @@ static DBusMessage *local_connect(DBusConnection *conn, + + id = get_pan_srv_id(svc); + bt_uuid16_create(&uuid16, id); +- bt_uuid_to_uuid128(&uuid128, &uuid16); ++ bt_uuid_to_uuid128(&uuid16, &uuid128); + + if (bt_uuid_to_string(&uuid128, uuid_str, MAX_LEN_UUID_STR) < 0) + return btd_error_invalid_args(msg); +@@ -447,7 +447,7 @@ static gboolean network_property_get_uuid(const GDBusPropertyTable *property, + return FALSE; + + bt_uuid16_create(&uuid16, nc->id); +- bt_uuid_to_uuid128(&uuid128, &uuid16); ++ bt_uuid_to_uuid128(&uuid16, &uuid128); + bt_uuid_to_string(&uuid128, uuid_str, MAX_LEN_UUID_STR); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid_str); +-- +2.4.2 + diff --git a/bluez.spec b/bluez.spec index 6dbbba0..45b0128 100644 --- a/bluez.spec +++ b/bluez.spec @@ -3,7 +3,7 @@ Summary: Bluetooth utilities Name: bluez Version: 5.30 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.bluez.org/ @@ -18,6 +18,8 @@ Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch4: 0002-autopair-Don-t-handle-the-iCade.patch Patch5: 0004-agent-Assert-possible-infinite-loop.patch +# Upstream +Patch6: 0001-profiles-network-Fix-not-being-able-to-initiate-conn.patch BuildRequires: git BuildRequires: dbus-devel >= 1.6 @@ -238,7 +240,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/ /lib/udev/rules.d/97-hid2hci.rules %changelog -* Wed Apr 29 2015 Peter Robinson +* Thu Jun 11 2015 Lubomir Rintel - 5.30-2 +- Fix NAP connections (rh #1230461) + +* Wed Apr 29 2015 Peter Robinson - 5.30-1 - Update to 5.30 - Use %%license