Date: Wednesday, June 6, 2018 @ 09:02:00 Author: jelle Revision: 326015
archrelease: copy trunk to testing-x86_64 Added: bluez/repos/testing-x86_64/PKGBUILD (from rev 326014, bluez/trunk/PKGBUILD) bluez/repos/testing-x86_64/bluetooth.modprobe (from rev 326014, bluez/trunk/bluetooth.modprobe) bluez/repos/testing-x86_64/refresh_adv_manager_for_non-LE_devices.diff (from rev 326014, bluez/trunk/refresh_adv_manager_for_non-LE_devices.diff) Deleted: bluez/repos/testing-x86_64/PKGBUILD bluez/repos/testing-x86_64/bluetooth.modprobe bluez/repos/testing-x86_64/refresh_adv_manager_for_non-LE_devices.diff ---------------------------------------------+ PKGBUILD | 312 +++++++++++++------------- bluetooth.modprobe | 6 refresh_adv_manager_for_non-LE_devices.diff | 104 ++++---- 3 files changed, 211 insertions(+), 211 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-06 09:01:39 UTC (rev 326014) +++ PKGBUILD 2018-06-06 09:02:00 UTC (rev 326015) @@ -1,156 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Geoffroy Carrier <geoff...@archlinux.org> - -pkgbase=bluez -pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.49 -pkgrel=5 -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=('bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d' - 'SKIP' - '5370ea87fc3f76ab46f2d549c5396b6204a21b629d4765de658fe8e90331b936a36aa8624de8bb2304cc1b78ac2fa6e84f2411f247dff1aab2daf7aa21b2c650' - 'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d') -validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <mar...@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 \ - --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/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') - 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/testing-x86_64/PKGBUILD (from rev 326014, bluez/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-06 09:02:00 UTC (rev 326015) @@ -0,0 +1,156 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Geoffroy Carrier <geoff...@archlinux.org> + +pkgbase=bluez +pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') +pkgver=5.50 +pkgrel=2 +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 <mar...@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 \ + --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/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') + 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 2018-06-06 09:01:39 UTC (rev 326014) +++ bluetooth.modprobe 2018-06-06 09:02:00 UTC (rev 326015) @@ -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/testing-x86_64/bluetooth.modprobe (from rev 326014, bluez/trunk/bluetooth.modprobe) =================================================================== --- bluetooth.modprobe (rev 0) +++ bluetooth.modprobe 2018-06-06 09:02:00 UTC (rev 326015) @@ -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: refresh_adv_manager_for_non-LE_devices.diff =================================================================== --- refresh_adv_manager_for_non-LE_devices.diff 2018-06-06 09:01:39 UTC (rev 326014) +++ refresh_adv_manager_for_non-LE_devices.diff 2018-06-06 09:02:00 UTC (rev 326015) @@ -1,52 +0,0 @@ -From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001 -From: "antoine.belv...@laposte.net" <antoine.belv...@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@entry=0x556fe53f20c0, - status=<optimized out>, 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=<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/testing-x86_64/refresh_adv_manager_for_non-LE_devices.diff (from rev 326014, 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-06-06 09:02:00 UTC (rev 326015) @@ -0,0 +1,52 @@ +From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001 +From: "antoine.belv...@laposte.net" <antoine.belv...@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@entry=0x556fe53f20c0, + status=<optimized out>, 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=<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 + +