From 3ddd164524d33b31d02e2f41c86d6e4652182e70 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 29 Sep 2018 14:38:14 +0000 Subject: bluez: update to 5.50 --- abs/extra/bluez/PKGBUILD | 40 +++++++++++------ .../refresh_adv_manager_for_non-LE_devices.diff | 52 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD index db1044c..5b50f6b 100644 --- a/abs/extra/bluez/PKGBUILD +++ b/abs/extra/bluez/PKGBUILD @@ -1,24 +1,30 @@ -# $Id$ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.39 -pkgrel=1 +pkgver=5.50 +pkgrel=3 url="http://www.bluez.org/" -arch=('i686' 'x86_64') +arch=('x86_64') license=('GPL2') -makedepends=('dbus' 'libical' 'systemd') -source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign} - bluetooth.modprobe) +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 -sha256sums=('21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b' +sha512sums=('64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45' 'SKIP' - '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') + '5370ea87fc3f76ab46f2d549c5396b6204a21b629d4765de658fe8e90331b936a36aa8624de8bb2304cc1b78ac2fa6e84f2411f247dff1aab2daf7aa21b2c650' + 'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d') validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff +} + build() { cd ${pkgname}-${pkgver} ./configure \ @@ -27,7 +33,10 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ + --enable-btpclient \ + --enable-midi \ --enable-sixaxis \ + --enable-mesh \ --enable-experimental \ --enable-library # this is deprecated make @@ -35,13 +44,13 @@ build() { check() { cd $pkgname-$pkgver - make check + 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') + depends=('libical' 'dbus' 'glib2' 'alsa-lib') backup=('etc/dbus-1/system.d/bluetooth.conf' 'etc/bluetooth/main.conf') conflicts=('obexd-client' 'obexd-server') @@ -65,7 +74,11 @@ package_bluez() { 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 + 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 @@ -74,6 +87,7 @@ package_bluez() { 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') @@ -88,8 +102,6 @@ package_bluez-utils() { filename=$(basename $files) install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename done - # add gatttool usefulbdaddr with Bluetooth 4.0LE - install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES diff --git a/abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff b/abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff new file mode 100644 index 0000000..922d9d3 --- /dev/null +++ b/abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff @@ -0,0 +1,52 @@ +From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001 +From: "antoine.belvire@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=, + adapter=0x556fe53f7c70) at src/adapter.c:543 +2 new_settings_callback (index=, length=, + param=, user_data=0x556fe53f7c70) at src/adapter.c:573 +3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0, + status=, opcode=opcode@entry=7, index=index@entry=0, + length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261 +4 0x0000556fe462cd9d in can_read_data (io=, + user_data=0x556fe53f20c0) at src/shared/mgmt.c:353 +5 0x0000556fe46396e3 in watch_callback (channel=, + cond=, user_data=) + 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=, argv=) + 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 + + -- cgit v0.12