[arch-commits] Commit in bluez/repos/extra-x86_64 (7 files)

Andreas Radke andyrtr at archlinux.org
Fri Sep 6 19:32:28 UTC 2019


    Date: Friday, September 6, 2019 @ 19:32:27
  Author: andyrtr
Revision: 361991

archrelease: copy trunk to extra-x86_64

Added:
  bluez/repos/extra-x86_64/PKGBUILD
    (from rev 361990, bluez/trunk/PKGBUILD)
  bluez/repos/extra-x86_64/bluetooth.modprobe
    (from rev 361990, bluez/trunk/bluetooth.modprobe)
  bluez/repos/extra-x86_64/bluez-5.50-signal-signature-btpclient.patch
    (from rev 361990, bluez/trunk/bluez-5.50-signal-signature-btpclient.patch)
  bluez/repos/extra-x86_64/refresh_adv_manager_for_non-LE_devices.diff
    (from rev 361990, 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/refresh_adv_manager_for_non-LE_devices.diff

---------------------------------------------+
 PKGBUILD                                    |  315 +++++++++++++-------------
 bluetooth.modprobe                          |    6 
 bluez-5.50-signal-signature-btpclient.patch |   56 ++++
 refresh_adv_manager_for_non-LE_devices.diff |  104 ++++----
 4 files changed, 271 insertions(+), 210 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-06 19:32:13 UTC (rev 361990)
+++ PKGBUILD	2019-09-06 19:32:27 UTC (rev 361991)
@@ -1,155 +0,0 @@
-# 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.50
-pkgrel=6
-url="http://www.bluez.org/"
-arch=('x86_64')
-license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'ell')
-source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        bluetooth.modprobe
-        refresh_adv_manager_for_non-LE_devices.diff)
-# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha512sums=('64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45'
-            'SKIP'
-            '5370ea87fc3f76ab46f2d549c5396b6204a21b629d4765de658fe8e90331b936a36aa8624de8bb2304cc1b78ac2fa6e84f2411f247dff1aab2daf7aa21b2c650'
-            'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d')
-validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure \
-          --prefix=/usr \
-          --mandir=/usr/share/man \
-          --sysconfdir=/etc \
-          --localstatedir=/var \
-          --libexecdir=/usr/lib \
-          --with-dbusconfdir=/usr/share \
-          --enable-btpclient \
-          --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/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')
-  optdepends=('ell: for btpclient')
-  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 361990, bluez/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-06 19:32:27 UTC (rev 361991)
@@ -0,0 +1,160 @@
+# 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.50
+pkgrel=7
+url="http://www.bluez.org/"
+arch=('x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'ell')
+source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+        bluetooth.modprobe
+        refresh_adv_manager_for_non-LE_devices.diff
+        bluez-5.50-signal-signature-btpclient.patch)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha512sums=('64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45'
+            'SKIP'
+            '5370ea87fc3f76ab46f2d549c5396b6204a21b629d4765de658fe8e90331b936a36aa8624de8bb2304cc1b78ac2fa6e84f2411f247dff1aab2daf7aa21b2c650'
+            'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d'
+            'db4c9f54acbb5f334ab60494ba22d61fa0c3d18b958eea30e227c5b2aee43f542e90897de5a54c2a97d87842945e2f1abaa8daff7d55ee4508f838b62ed9719f')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
+  # fix build error with recent gcc/glibc
+  patch -Np1 -i ../bluez-5.50-signal-signature-btpclient.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure \
+          --prefix=/usr \
+          --mandir=/usr/share/man \
+          --sysconfdir=/etc \
+          --localstatedir=/var \
+          --libexecdir=/usr/lib \
+          --with-dbusconfdir=/usr/share \
+          --enable-btpclient \
+          --enable-midi \
+          --enable-sixaxis \
+          --enable-mesh \
+          --enable-experimental \
+          --enable-library # this is deprecated
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  # tests segfault and hang
+#  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/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')
+  optdepends=('ell: for btpclient')
+  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	2019-09-06 19:32:13 UTC (rev 361990)
+++ bluetooth.modprobe	2019-09-06 19:32:27 UTC (rev 361991)
@@ -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 361990, bluez/trunk/bluetooth.modprobe)
===================================================================
--- bluetooth.modprobe	                        (rev 0)
+++ bluetooth.modprobe	2019-09-06 19:32:27 UTC (rev 361991)
@@ -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

Copied: bluez/repos/extra-x86_64/bluez-5.50-signal-signature-btpclient.patch (from rev 361990, bluez/trunk/bluez-5.50-signal-signature-btpclient.patch)
===================================================================
--- bluez-5.50-signal-signature-btpclient.patch	                        (rev 0)
+++ bluez-5.50-signal-signature-btpclient.patch	2019-09-06 19:32:27 UTC (rev 361991)
@@ -0,0 +1,56 @@
+diff -rauN bluez-5.50/tools/btpclient.c bluez-5.50-signal-signature-btpclient-patch/tools/btpclient.c
+--- bluez-5.50/tools/btpclient.c	2018-03-10 16:37:07.000000000 +0100
++++ bluez-5.50-signal-signature-btpclient-patch/tools/btpclient.c	2019-07-31 19:36:58.022464813 +0200
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <getopt.h>
++#include <signal.h>
+ 
+ #include <ell/ell.h>
+ 
+@@ -2827,8 +2828,7 @@
+ 					btp_core_unregister, NULL, NULL);
+ }
+ 
+-static void signal_handler(struct l_signal *signal, uint32_t signo,
+-							void *user_data)
++static void signal_handler(uint32_t signo, void *user_data)
+ {
+ 	switch (signo) {
+ 	case SIGINT:
+@@ -3156,8 +3156,6 @@
+ int main(int argc, char *argv[])
+ {
+ 	struct l_dbus_client *client;
+-	struct l_signal *signal;
+-	sigset_t mask;
+ 	int opt;
+ 
+ 	l_log_set_stderr();
+@@ -3194,11 +3192,6 @@
+ 
+ 	adapters = l_queue_new();
+ 
+-	sigemptyset(&mask);
+-	sigaddset(&mask, SIGINT);
+-	sigaddset(&mask, SIGTERM);
+-	signal = l_signal_create(&mask, signal_handler, NULL, NULL);
+-
+ 	dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS);
+ 	l_dbus_set_ready_handler(dbus, ready_callback, NULL, NULL);
+ 	client = l_dbus_client_new(dbus, "org.bluez", "/org/bluez");
+@@ -3212,11 +3205,10 @@
+ 
+ 	l_dbus_client_set_ready_handler(client, client_ready, NULL, NULL);
+ 
+-	l_main_run();
++	l_main_run_with_signal(signal_handler, NULL);
+ 
+ 	l_dbus_client_destroy(client);
+ 	l_dbus_destroy(dbus);
+-	l_signal_remove(signal);
+ 	btp_cleanup(btp);
+ 
+ 	l_queue_destroy(adapters, (l_queue_destroy_func_t)btp_adapter_free);
+

Deleted: refresh_adv_manager_for_non-LE_devices.diff
===================================================================
--- refresh_adv_manager_for_non-LE_devices.diff	2019-09-06 19:32:13 UTC (rev 361990)
+++ refresh_adv_manager_for_non-LE_devices.diff	2019-09-06 19:32:27 UTC (rev 361991)
@@ -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 361990, 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	2019-09-06 19:32:27 UTC (rev 361991)
@@ -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