[arch-commits] Commit in bluez/repos (4 files)
Andreas Radke
andyrtr at archlinux.org
Wed Apr 4 12:07:09 UTC 2018
Date: Wednesday, April 4, 2018 @ 12:07:08
Author: andyrtr
Revision: 320929
archrelease: copy trunk to testing-x86_64
Added:
bluez/repos/testing-x86_64/
bluez/repos/testing-x86_64/PKGBUILD
(from rev 320928, bluez/trunk/PKGBUILD)
bluez/repos/testing-x86_64/bluetooth.modprobe
(from rev 320928, bluez/trunk/bluetooth.modprobe)
bluez/repos/testing-x86_64/gatt_fix_crash.diff
(from rev 320928, bluez/trunk/gatt_fix_crash.diff)
---------------------+
PKGBUILD | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++
bluetooth.modprobe | 3
gatt_fix_crash.diff | 43 ++++++++++++++
3 files changed, 199 insertions(+)
Copied: bluez/repos/testing-x86_64/PKGBUILD (from rev 320928, bluez/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-04-04 12:07:08 UTC (rev 320929)
@@ -0,0 +1,153 @@
+# $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=2
+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
+ gatt_fix_crash.diff)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95'
+ 'SKIP'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+ 'f40030e01136271e8009cc322c584369ed1101a5710a48509d89079606b6d666')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ 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/testing-x86_64/bluetooth.modprobe (from rev 320928, bluez/trunk/bluetooth.modprobe)
===================================================================
--- testing-x86_64/bluetooth.modprobe (rev 0)
+++ testing-x86_64/bluetooth.modprobe 2018-04-04 12:07:08 UTC (rev 320929)
@@ -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/testing-x86_64/gatt_fix_crash.diff (from rev 320928, bluez/trunk/gatt_fix_crash.diff)
===================================================================
--- testing-x86_64/gatt_fix_crash.diff (rev 0)
+++ testing-x86_64/gatt_fix_crash.diff 2018-04-04 12:07:08 UTC (rev 320929)
@@ -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
+
+
More information about the arch-commits
mailing list