[arch-commits] Commit in bluez/repos/extra-x86_64 (8 files)
Andreas Radke
andyrtr at archlinux.org
Tue May 15 16:55:05 UTC 2018
Date: Tuesday, May 15, 2018 @ 16:55:04
Author: andyrtr
Revision: 324294
archrelease: copy trunk to extra-x86_64
Added:
bluez/repos/extra-x86_64/PKGBUILD
(from rev 324293, bluez/trunk/PKGBUILD)
bluez/repos/extra-x86_64/bluetooth.modprobe
(from rev 324293, bluez/trunk/bluetooth.modprobe)
bluez/repos/extra-x86_64/gatt_fix_crash.diff
(from rev 324293, bluez/trunk/gatt_fix_crash.diff)
bluez/repos/extra-x86_64/refresh_adv_manager_for_non-LE_devices.diff
(from rev 324293, bluez/trunk/refresh_adv_manager_for_non-LE_devices.diff)
Deleted:
bluez/repos/extra-x86_64/PKGBUILD
bluez/repos/extra-x86_64/bluetooth.modprobe
bluez/repos/extra-x86_64/gatt_fix_crash.diff
bluez/repos/extra-x86_64/refresh_adv_manager_for_non-LE_devices.diff
---------------------------------------------+
PKGBUILD | 313 +++++++++++++-------------
bluetooth.modprobe | 6
gatt_fix_crash.diff | 86 +++----
refresh_adv_manager_for_non-LE_devices.diff | 104 ++++----
4 files changed, 255 insertions(+), 254 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-15 16:54:48 UTC (rev 324293)
+++ PKGBUILD 2018-05-15 16:55:04 UTC (rev 324294)
@@ -1,156 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-
-pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.49
-pkgrel=3
-url="http://www.bluez.org/"
-arch=('x86_64')
-license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd' 'alsa-lib')
-source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
- bluetooth.modprobe
- refresh_adv_manager_for_non-LE_devices.diff
- gatt_fix_crash.diff)
-# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95'
- 'SKIP'
- '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
- 'ae195834cdc9d3d1961ae3c49da6381c820883a5af580e61aebed05a3e911d48'
- 'f40030e01136271e8009cc322c584369ed1101a5710a48509d89079606b6d666')
-validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
- patch -Np1 -i ../gatt_fix_crash.diff
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --enable-midi \
- --enable-sixaxis \
- --enable-experimental \
- --enable-library # this is deprecated
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check || /bin/true # https://bugzilla.kernel.org/show_bug.cgi?id=196621
-}
-
-
-package_bluez() {
- pkgdesc="Daemons for the bluetooth protocol stack"
- depends=('libical' 'dbus' 'glib2' 'alsa-lib')
- backup=('etc/dbus-1/system.d/bluetooth.conf'
- 'etc/bluetooth/main.conf')
- conflicts=('obexd-client' 'obexd-server')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-libexecPROGRAMS \
- install-dbussessionbusDATA \
- install-systemdsystemunitDATA \
- install-systemduserunitDATA \
- install-dbussystembusDATA \
- install-dbusDATA \
- install-man8
-
- # ship upstream main config file
- install -dm755 ${pkgdir}/etc/bluetooth
- install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
-
- # add basic documention
- install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
- cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
- # fix module loading errors
- install -dm755 ${pkgdir}/usr/lib/modprobe.d
- install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
- # load module at system start required by some functions
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621
- install -dm755 $pkgdir/usr/lib/modules-load.d
- echo "crypto_user" > $pkgdir/usr/lib/modules-load.d/bluez.conf
-
- # fix obex file transfer - https://bugs.archlinux.org/task/45816
- ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
-}
-
-package_bluez-utils() {
- pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
- depends=('dbus' 'systemd' 'glib2')
- conflicts=('bluez-hcidump')
- provides=('bluez-hcidump')
- replaces=('bluez-hcidump' 'bluez<=4.101')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-binPROGRAMS \
- install-man1
-
- # add missing tools FS#41132, FS#41687, FS#42716
- for files in `find tools/ -type f -perm -755`; do
- filename=$(basename $files)
- install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
- done
-
- # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
- #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
- #rmdir ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/lib
-
- # move the hid2hci man page out
- mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
-}
-
-package_bluez-libs() {
- pkgdesc="Deprecated libraries for the bluetooth protocol stack"
- depends=('glibc')
- license=('LGPL2.1')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
-}
-
-package_bluez-cups() {
- pkgdesc="CUPS printer backend for Bluetooth printers"
- depends=('cups')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} install-cupsPROGRAMS
-}
-
-package_bluez-hid2hci() {
- pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
- depends=('systemd')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-udevPROGRAMS \
- install-rulesDATA
-
- install -dm755 ${pkgdir}/usr/share/man/man1
- mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
-}
-
-package_bluez-plugins() {
- pkgdesc="bluez plugins (PS3 Sixaxis controller)"
- depends=('systemd')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} \
- install-pluginLTLIBRARIES
-}
Copied: bluez/repos/extra-x86_64/PKGBUILD (from rev 324293, bluez/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-15 16:55:04 UTC (rev 324294)
@@ -0,0 +1,157 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+
+pkgbase=bluez
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
+pkgver=5.49
+pkgrel=4
+url="http://www.bluez.org/"
+arch=('x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd' 'alsa-lib')
+source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+ bluetooth.modprobe
+ refresh_adv_manager_for_non-LE_devices.diff
+ gatt_fix_crash.diff)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95'
+ 'SKIP'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+ 'ae195834cdc9d3d1961ae3c49da6381c820883a5af580e61aebed05a3e911d48'
+ 'f40030e01136271e8009cc322c584369ed1101a5710a48509d89079606b6d666')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
+ patch -Np1 -i ../gatt_fix_crash.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-midi \
+ --enable-sixaxis \
+ --enable-mesh \
+ --enable-experimental \
+ --enable-library # this is deprecated
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check || /bin/true # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2' 'alsa-lib')
+ backup=('etc/dbus-1/system.d/bluetooth.conf'
+ 'etc/bluetooth/main.conf')
+ conflicts=('obexd-client' 'obexd-server')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-libexecPROGRAMS \
+ install-dbussessionbusDATA \
+ install-systemdsystemunitDATA \
+ install-systemduserunitDATA \
+ install-dbussystembusDATA \
+ install-dbusDATA \
+ install-man8
+
+ # ship upstream main config file
+ install -dm755 ${pkgdir}/etc/bluetooth
+ install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
+
+ # add basic documention
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+ cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+ # fix module loading errors
+ install -dm755 ${pkgdir}/usr/lib/modprobe.d
+ install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
+ # load module at system start required by some functions
+ # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+ install -dm755 $pkgdir/usr/lib/modules-load.d
+ echo "crypto_user" > $pkgdir/usr/lib/modules-load.d/bluez.conf
+
+ # fix obex file transfer - https://bugs.archlinux.org/task/45816
+ ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
+}
+
+package_bluez-utils() {
+ pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+ depends=('dbus' 'systemd' 'glib2')
+ conflicts=('bluez-hcidump')
+ provides=('bluez-hcidump')
+ replaces=('bluez-hcidump' 'bluez<=4.101')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-binPROGRAMS \
+ install-man1
+
+ # add missing tools FS#41132, FS#41687, FS#42716
+ for files in `find tools/ -type f -perm -755`; do
+ filename=$(basename $files)
+ install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
+ done
+
+ # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+ #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+ #rmdir ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/lib
+
+ # move the hid2hci man page out
+ mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+ pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+ depends=('glibc')
+ license=('LGPL2.1')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-includeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
+}
+
+package_bluez-cups() {
+ pkgdesc="CUPS printer backend for Bluetooth printers"
+ depends=('cups')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+ pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-udevPROGRAMS \
+ install-rulesDATA
+
+ install -dm755 ${pkgdir}/usr/share/man/man1
+ mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
+
+package_bluez-plugins() {
+ pkgdesc="bluez plugins (PS3 Sixaxis controller)"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-pluginLTLIBRARIES
+}
Deleted: bluetooth.modprobe
===================================================================
--- bluetooth.modprobe 2018-05-15 16:54:48 UTC (rev 324293)
+++ bluetooth.modprobe 2018-05-15 16:55:04 UTC (rev 324294)
@@ -1,3 +0,0 @@
-# use "reset=1" as default, since it should be safe for recent devices and
-# solves all kind of problems.
-options btusb reset=1
Copied: bluez/repos/extra-x86_64/bluetooth.modprobe (from rev 324293, bluez/trunk/bluetooth.modprobe)
===================================================================
--- bluetooth.modprobe (rev 0)
+++ bluetooth.modprobe 2018-05-15 16:55:04 UTC (rev 324294)
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
Deleted: gatt_fix_crash.diff
===================================================================
--- gatt_fix_crash.diff 2018-05-15 16:54:48 UTC (rev 324293)
+++ gatt_fix_crash.diff 2018-05-15 16:55:04 UTC (rev 324294)
@@ -1,43 +0,0 @@
-From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001
-From: Szymon Janc <szymon.janc at codecoup.pl>
-Date: Wed, 4 Apr 2018 09:28:56 +0200
-Subject: gatt: Fix crash with BR/EDR only adapter
-
-adapter->database can be NULL if controller is BR/EDR only or LE was
-disabled. Make btd_gatt_database_restore_svc_chng_ccc accept NULL
-pointer and silently ignore it similiar to rest of btd_gatt_database
-API.
-
-Invalid read of size 8
- at 0x164DCB: btd_gatt_database_restore_svc_chng_ccc (src/bluez-git/src/bluetoothd)
- by 0x17B70F: read_info_complete (src/bluez-git/src/bluetoothd)
- by 0x1A7E58: request_complete (src/bluez-git/src/bluetoothd)
- by 0x1A89AD: can_read_data (src/bluez-git/src/bluetoothd)
- by 0x1B5752: watch_callback (src/bluez-git/src/bluetoothd)
- by 0x4E852C5: g_main_context_dispatch (in /usr/lib/libglib-2.0.so.0.5600.0)
- by 0x4E856A0: ??? (in /usr/lib/libglib-2.0.so.0.5600.0)
- by 0x4E859D1: g_main_loop_run (in /usr/lib/libglib-2.0.so.0.5600.0)
- by 0x125058: main (src/bluez-git/src/bluetoothd)
- Address 0x40 is not stack'd, malloc'd or (recently) free'd
----
- src/gatt-database.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gatt-database.c b/src/gatt-database.c
-index 1cdc72e..0ac5b75 100644
---- a/src/gatt-database.c
-+++ b/src/gatt-database.c
-@@ -3330,6 +3330,9 @@ void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database)
- uint8_t value[4];
- uint16_t handle, ccc_handle;
-
-+ if (!database)
-+ return;
-+
- handle = gatt_db_attribute_get_handle(database->svc_chngd);
- ccc_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc);
-
---
-cgit v1.1
-
-
Copied: bluez/repos/extra-x86_64/gatt_fix_crash.diff (from rev 324293, bluez/trunk/gatt_fix_crash.diff)
===================================================================
--- gatt_fix_crash.diff (rev 0)
+++ gatt_fix_crash.diff 2018-05-15 16:55:04 UTC (rev 324294)
@@ -0,0 +1,43 @@
+From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001
+From: Szymon Janc <szymon.janc at codecoup.pl>
+Date: Wed, 4 Apr 2018 09:28:56 +0200
+Subject: gatt: Fix crash with BR/EDR only adapter
+
+adapter->database can be NULL if controller is BR/EDR only or LE was
+disabled. Make btd_gatt_database_restore_svc_chng_ccc accept NULL
+pointer and silently ignore it similiar to rest of btd_gatt_database
+API.
+
+Invalid read of size 8
+ at 0x164DCB: btd_gatt_database_restore_svc_chng_ccc (src/bluez-git/src/bluetoothd)
+ by 0x17B70F: read_info_complete (src/bluez-git/src/bluetoothd)
+ by 0x1A7E58: request_complete (src/bluez-git/src/bluetoothd)
+ by 0x1A89AD: can_read_data (src/bluez-git/src/bluetoothd)
+ by 0x1B5752: watch_callback (src/bluez-git/src/bluetoothd)
+ by 0x4E852C5: g_main_context_dispatch (in /usr/lib/libglib-2.0.so.0.5600.0)
+ by 0x4E856A0: ??? (in /usr/lib/libglib-2.0.so.0.5600.0)
+ by 0x4E859D1: g_main_loop_run (in /usr/lib/libglib-2.0.so.0.5600.0)
+ by 0x125058: main (src/bluez-git/src/bluetoothd)
+ Address 0x40 is not stack'd, malloc'd or (recently) free'd
+---
+ src/gatt-database.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gatt-database.c b/src/gatt-database.c
+index 1cdc72e..0ac5b75 100644
+--- a/src/gatt-database.c
++++ b/src/gatt-database.c
+@@ -3330,6 +3330,9 @@ void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database)
+ uint8_t value[4];
+ uint16_t handle, ccc_handle;
+
++ if (!database)
++ return;
++
+ handle = gatt_db_attribute_get_handle(database->svc_chngd);
+ ccc_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc);
+
+--
+cgit v1.1
+
+
Deleted: refresh_adv_manager_for_non-LE_devices.diff
===================================================================
--- refresh_adv_manager_for_non-LE_devices.diff 2018-05-15 16:54:48 UTC (rev 324293)
+++ refresh_adv_manager_for_non-LE_devices.diff 2018-05-15 16:55:04 UTC (rev 324294)
@@ -1,52 +0,0 @@
-From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
-From: "antoine.belvire at laposte.net" <antoine.belvire at laposte.net>
-Date: Tue, 27 Mar 2018 20:30:26 +0200
-Subject: adapter: Don't refresh adv_manager for non-LE devices
-
-btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
-but as only LE adapters have an adv_manager, this leads to segmentation fault
-for non-LE devices:
-
-0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
-1 0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
- adapter=0x556fe53f7c70) at src/adapter.c:543
-2 new_settings_callback (index=<optimized out>, length=<optimized out>,
- param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
-3 0x0000556fe462c278 in request_complete (mgmt=mgmt at entry=0x556fe53f20c0,
- status=<optimized out>, opcode=opcode at entry=7, index=index at entry=0,
- length=length at entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
-4 0x0000556fe462cd9d in can_read_data (io=<optimized out>,
- user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
-5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
- cond=<optimized out>, user_data=<optimized out>)
- at src/shared/io-glib.c:170
-6 0x00007fe351c980e5 in g_main_context_dispatch ()
- from /usr/lib64/libglib-2.0.so.0
-7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
-8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
-9 0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
- at src/main.c:770
-
-This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
----
- src/adapter.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/adapter.c b/src/adapter.c
-index 6b9222b..daccfdc 100644
---- a/src/adapter.c
-+++ b/src/adapter.c
-@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
- g_dbus_emit_property_changed(dbus_conn, adapter->path,
- ADAPTER_INTERFACE, "Discoverable");
- store_adapter_info(adapter);
-- btd_adv_manager_refresh(adapter->adv_manager);
-+ if (adapter->supported_settings & MGMT_SETTING_LE)
-+ btd_adv_manager_refresh(adapter->adv_manager);
- }
-
- if (changed_mask & MGMT_SETTING_BONDABLE) {
---
-cgit v1.1
-
-
Copied: bluez/repos/extra-x86_64/refresh_adv_manager_for_non-LE_devices.diff (from rev 324293, bluez/trunk/refresh_adv_manager_for_non-LE_devices.diff)
===================================================================
--- refresh_adv_manager_for_non-LE_devices.diff (rev 0)
+++ refresh_adv_manager_for_non-LE_devices.diff 2018-05-15 16:55:04 UTC (rev 324294)
@@ -0,0 +1,52 @@
+From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
+From: "antoine.belvire at laposte.net" <antoine.belvire at laposte.net>
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
+but as only LE adapters have an adv_manager, this leads to segmentation fault
+for non-LE devices:
+
+0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
+1 0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
+ adapter=0x556fe53f7c70) at src/adapter.c:543
+2 new_settings_callback (index=<optimized out>, length=<optimized out>,
+ param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
+3 0x0000556fe462c278 in request_complete (mgmt=mgmt at entry=0x556fe53f20c0,
+ status=<optimized out>, opcode=opcode at entry=7, index=index at entry=0,
+ length=length at entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
+4 0x0000556fe462cd9d in can_read_data (io=<optimized out>,
+ user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
+5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
+ cond=<optimized out>, user_data=<optimized out>)
+ at src/shared/io-glib.c:170
+6 0x00007fe351c980e5 in g_main_context_dispatch ()
+ from /usr/lib64/libglib-2.0.so.0
+7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
+8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
+9 0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
+ at src/main.c:770
+
+This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
+---
+ src/adapter.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 6b9222b..daccfdc 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
+ g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ ADAPTER_INTERFACE, "Discoverable");
+ store_adapter_info(adapter);
+- btd_adv_manager_refresh(adapter->adv_manager);
++ if (adapter->supported_settings & MGMT_SETTING_LE)
++ btd_adv_manager_refresh(adapter->adv_manager);
+ }
+
+ if (changed_mask & MGMT_SETTING_BONDABLE) {
+--
+cgit v1.1
+
+
More information about the arch-commits
mailing list