From 64ed66fd7a13df0840d68f324ee8c4b64a70ec0d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:29:36 +0000 Subject: import bluez-5.44-2.el7 --- diff --git a/.bluez.metadata b/.bluez.metadata index 2fc9d28..aae403a 100644 --- a/.bluez.metadata +++ b/.bluez.metadata @@ -1 +1 @@ -a912b80299f6fe4f9d48502b3cf8c99854ed54b3 SOURCES/bluez-5.41.tar.xz +60776c3d6eb2c160d20b2de12f2af63ee8508f0a SOURCES/bluez-5.44.tar.xz diff --git a/.gitignore b/.gitignore index de88661..2aa648c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/bluez-5.41.tar.xz +SOURCES/bluez-5.44.tar.xz diff --git a/SOURCES/0001-Remove-experimental-flag-for-BLE.patch b/SOURCES/0001-Remove-experimental-flag-for-BLE.patch deleted file mode 100644 index ac94ead..0000000 --- a/SOURCES/0001-Remove-experimental-flag-for-BLE.patch +++ /dev/null @@ -1,202 +0,0 @@ -From 8d5e7877c12c0ed4c2f23ba383dcf689e4f1b8ee Mon Sep 17 00:00:00 2001 -From: Fedora Bluez maintainers -Date: Tue, 17 May 2016 15:39:40 -0400 -Subject: [PATCH 1/3] Remove experimental flag for BLE - -Upstream says the BLE should be mostly stable by now. Remove the flag -prematurely (for just the BLE pieces), so we can say we are supporting -this API in RHEL-7.3. ---- - src/adapter.c | 4 ++-- - src/advertising.c | 4 ++-- - src/device.c | 8 ++++---- - src/gatt-client.c | 36 +++++++++++++++++++----------------- - src/gatt-database.c | 4 ++-- - 5 files changed, 29 insertions(+), 27 deletions(-) - -diff --git a/src/adapter.c b/src/adapter.c -index f4fbf82..e166b25 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -7450,7 +7450,7 @@ static int adapter_register(struct btd_adapter *adapter) - return -EINVAL; - } - -- if (g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL) { -+ //if (g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL) { - /* Don't start advertising managers on non-LE controllers. */ - if (adapter->supported_settings & MGMT_SETTING_LE) { - adapter->adv_manager = -@@ -7459,7 +7459,7 @@ static int adapter_register(struct btd_adapter *adapter) - btd_info(adapter->dev_id, - "LEAdvertisingManager skipped, LE unavailable"); - } -- } -+ //} - - db = btd_gatt_database_get_db(adapter->database); - adapter->db_id = gatt_db_register(db, services_modified, -diff --git a/src/advertising.c b/src/advertising.c -index d2019de..7200d3d 100644 ---- a/src/advertising.c -+++ b/src/advertising.c -@@ -704,11 +704,11 @@ static DBusMessage *unregister_advertisement(DBusConnection *conn, - } - - static const GDBusMethodTable methods[] = { -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("RegisterAdvertisement", -+ { GDBUS_ASYNC_METHOD("RegisterAdvertisement", - GDBUS_ARGS({ "advertisement", "o" }, - { "options", "a{sv}" }), - NULL, register_advertisement) }, -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("UnregisterAdvertisement", -+ { GDBUS_ASYNC_METHOD("UnregisterAdvertisement", - GDBUS_ARGS({ "service", "o" }), - NULL, - unregister_advertisement) }, -diff --git a/src/device.c b/src/device.c -index 83a794e..05020cb 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2524,15 +2524,15 @@ static const GDBusPropertyTable device_properties[] = { - { "Adapter", "o", dev_property_get_adapter }, - { "ManufacturerData", "a{qv}", dev_property_get_manufacturer_data, - NULL, dev_property_manufacturer_data_exist, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "ServiceData", "a{sv}", dev_property_get_service_data, - NULL, dev_property_service_data_exist, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "TxPower", "n", dev_property_get_tx_power, NULL, - dev_property_exists_tx_power, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "ServicesResolved", "b", dev_property_get_svc_resolved, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - - { } - }; -diff --git a/src/gatt-client.c b/src/gatt-client.c -index 0cbacca..8c6441b 100644 ---- a/src/gatt-client.c -+++ b/src/gatt-client.c -@@ -609,20 +609,20 @@ static DBusMessage *descriptor_write_value(DBusConnection *conn, - - static const GDBusPropertyTable descriptor_properties[] = { - { "UUID", "s", descriptor_get_uuid, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Characteristic", "o", descriptor_get_characteristic, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Value", "ay", descriptor_get_value, NULL, descriptor_value_exists, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { } - }; - - static const GDBusMethodTable descriptor_methods[] = { -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("ReadValue", -+ { GDBUS_ASYNC_METHOD("ReadValue", - GDBUS_ARGS({ "options", "a{sv}" }), - GDBUS_ARGS({ "value", "ay" }), - descriptor_read_value) }, -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("WriteValue", -+ { GDBUS_ASYNC_METHOD("WriteValue", - GDBUS_ARGS({ "value", "ay" }, - { "options", "a{sv}" }), - NULL, -@@ -1285,33 +1285,33 @@ static DBusMessage *characteristic_stop_notify(DBusConnection *conn, - - static const GDBusPropertyTable characteristic_properties[] = { - { "UUID", "s", characteristic_get_uuid, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Service", "o", characteristic_get_service, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Value", "ay", characteristic_get_value, NULL, - characteristic_value_exists, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Notifying", "b", characteristic_get_notifying, NULL, - characteristic_notifying_exists, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Flags", "as", characteristic_get_flags, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { } - }; - - static const GDBusMethodTable characteristic_methods[] = { -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("ReadValue", -+ { GDBUS_ASYNC_METHOD("ReadValue", - GDBUS_ARGS({ "options", "a{sv}" }), - GDBUS_ARGS({ "value", "ay" }), - characteristic_read_value) }, -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("WriteValue", -+ { GDBUS_ASYNC_METHOD("WriteValue", - GDBUS_ARGS({ "value", "ay" }, - { "options", "a{sv}" }), - NULL, - characteristic_write_value) }, -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("StartNotify", NULL, NULL, -+ { GDBUS_ASYNC_METHOD("StartNotify", NULL, NULL, - characteristic_start_notify) }, -- { GDBUS_EXPERIMENTAL_METHOD("StopNotify", NULL, NULL, -+ { GDBUS_METHOD("StopNotify", NULL, NULL, - characteristic_stop_notify) }, - { } - }; -@@ -1445,11 +1445,11 @@ static gboolean service_get_primary(const GDBusPropertyTable *property, - - static const GDBusPropertyTable service_properties[] = { - { "UUID", "s", service_get_uuid, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Device", "o", service_get_device, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { "Primary", "b", service_get_primary, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ }, - { } - }; - -@@ -1618,10 +1618,12 @@ static void export_service(struct gatt_db_attribute *attr, void *user_data) - static void create_services(struct btd_gatt_client *client) - { - /* Don't attempt to create any objects if experimental is disabled */ -+ /* - if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) { - info("GATT service objects disabled"); - return; - } -+ */ - - DBG("Exporting objects for GATT services: %s", client->devaddr); - -diff --git a/src/gatt-database.c b/src/gatt-database.c -index e287b98..87b4f56 100644 ---- a/src/gatt-database.c -+++ b/src/gatt-database.c -@@ -2578,11 +2578,11 @@ static DBusMessage *manager_unregister_app(DBusConnection *conn, - } - - static const GDBusMethodTable manager_methods[] = { -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("RegisterApplication", -+ { GDBUS_ASYNC_METHOD("RegisterApplication", - GDBUS_ARGS({ "application", "o" }, - { "options", "a{sv}" }), NULL, - manager_register_app) }, -- { GDBUS_EXPERIMENTAL_ASYNC_METHOD("UnregisterApplication", -+ { GDBUS_ASYNC_METHOD("UnregisterApplication", - GDBUS_ARGS({ "application", "o" }), - NULL, manager_unregister_app) }, - { } --- -1.8.4 - diff --git a/SPECS/bluez.spec b/SPECS/bluez.spec index 3a60c6a..92954ba 100644 --- a/SPECS/bluez.spec +++ b/SPECS/bluez.spec @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez -Version: 5.41 -Release: 1%{?dist} +Version: 5.44 +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.bluez.org/ @@ -16,7 +16,6 @@ Patch3: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch4: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch5: 0002-autopair-Don-t-handle-the-iCade.patch Patch7: 0004-agent-Assert-possible-infinite-loop.patch -Patch8: 0001-Remove-experimental-flag-for-BLE.patch %global _hardened_build 1 @@ -39,6 +38,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Provides: bluez-obexd + # Dropped in Fedora 20: Obsoletes: bluez-alsa < 5.0 Obsoletes: bluez-compat < 5.0 @@ -136,7 +137,7 @@ git am -p1 %{patches} < /dev/null libtoolize -f -c autoreconf -f -i %configure --enable-cups --enable-tools --enable-library \ - --enable-sixaxis --enable-pie \ + --enable-sixaxis --enable-pie --enable-deprecated \ --with-systemdsystemunitdir=%{_unitdir} \ --with-systemduserunitdir=%{_userunitdir} make %{?_smp_mflags} V=1 @@ -175,9 +176,11 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=false/' ${RPM %post %systemd_post bluetooth.service +%systemd_user_post obex.service %preun %systemd_preun bluetooth.service +%systemd_user_preun obex.service %postun %systemd_postun_with_restart bluetooth.service @@ -187,6 +190,7 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=false/' ${RPM %files %doc AUTHORS COPYING ChangeLog README +%{_bindir}/btattach %{_bindir}/ciptool %{_bindir}/hcitool %{_bindir}/l2ping @@ -204,6 +208,7 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=false/' ${RPM %{_bindir}/mpris-proxy %{_bindir}/gatttool %{_bindir}/rctest +%{_mandir}/man1/btattach.1.gz %{_mandir}/man1/ciptool.1.gz %{_mandir}/man1/hcitool.1.gz %{_mandir}/man1/rfcomm.1.gz @@ -246,6 +251,17 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=false/' ${RPM /lib/udev/rules.d/97-hid2hci.rules %changelog +* Mon Mar 27 2017 David Arcari 5.44-2 +- added missing updates for sources and .gitignore +Resolves: #1434581, #1401501 + +* Tue Mar 21 2017 David Arcari 5.44-1 +- Update to 5.44 +- Ship btattach tool +- Configure systemctl settings for bluez-obex correctly +- Add Provides: bluez-obexd +Resolves: #1434581, #1401501 + * Fri Aug 5 2016 Don Zickus 5.41-1 - Update to 5.41 - obexd fixes to prevent crashes