[arch-commits] Commit in bluez/repos (8 files)
Andreas Radke
andyrtr at archlinux.org
Fri Mar 25 10:18:01 UTC 2016
Date: Friday, March 25, 2016 @ 11:18:00
Author: andyrtr
Revision: 262521
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
bluez/repos/testing-i686/
bluez/repos/testing-i686/PKGBUILD
(from rev 262520, bluez/trunk/PKGBUILD)
bluez/repos/testing-i686/bluetooth.modprobe
(from rev 262520, bluez/trunk/bluetooth.modprobe)
bluez/repos/testing-i686/fix_crash_when_connecting_to_controllers.diff
(from rev 262520, bluez/trunk/fix_crash_when_connecting_to_controllers.diff)
bluez/repos/testing-x86_64/
bluez/repos/testing-x86_64/PKGBUILD
(from rev 262520, bluez/trunk/PKGBUILD)
bluez/repos/testing-x86_64/bluetooth.modprobe
(from rev 262520, bluez/trunk/bluetooth.modprobe)
bluez/repos/testing-x86_64/fix_crash_when_connecting_to_controllers.diff
(from rev 262520, bluez/trunk/fix_crash_when_connecting_to_controllers.diff)
--------------------------------------------------------------+
testing-i686/PKGBUILD | 151 ++++++++++
testing-i686/bluetooth.modprobe | 3
testing-i686/fix_crash_when_connecting_to_controllers.diff | 37 ++
testing-x86_64/PKGBUILD | 151 ++++++++++
testing-x86_64/bluetooth.modprobe | 3
testing-x86_64/fix_crash_when_connecting_to_controllers.diff | 37 ++
6 files changed, 382 insertions(+)
Copied: bluez/repos/testing-i686/PKGBUILD (from rev 262520, bluez/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-03-25 10:18:00 UTC (rev 262521)
@@ -0,0 +1,151 @@
+# $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.38
+pkgrel=2
+url="http://www.bluez.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd')
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+ bluetooth.modprobe
+ fix_crash_when_connecting_to_controllers.diff)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('0618c5440be6715805060ab5eea930526f34089c437bf61819447b160254f4df'
+ 'SKIP'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+ '27296fb6cce5e62a04fbeb0779d852995779ecef553cc2e692d91d89eff8c673')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # FS#48644, http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=177d27c8c3db4588ec13dae0368f240902c42825
+ patch -Np1 -i ${srcdir}/fix_crash_when_connecting_to_controllers.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-sixaxis \
+ --enable-experimental \
+ --enable-library # this is deprecated
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2')
+ 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
+
+ # 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
+ # 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
+ #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-i686/bluetooth.modprobe (from rev 262520, bluez/trunk/bluetooth.modprobe)
===================================================================
--- testing-i686/bluetooth.modprobe (rev 0)
+++ testing-i686/bluetooth.modprobe 2016-03-25 10:18:00 UTC (rev 262521)
@@ -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-i686/fix_crash_when_connecting_to_controllers.diff (from rev 262520, bluez/trunk/fix_crash_when_connecting_to_controllers.diff)
===================================================================
--- testing-i686/fix_crash_when_connecting_to_controllers.diff (rev 0)
+++ testing-i686/fix_crash_when_connecting_to_controllers.diff 2016-03-25 10:18:00 UTC (rev 262521)
@@ -0,0 +1,37 @@
+From 177d27c8c3db4588ec13dae0368f240902c42825 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
+Date: Tue, 22 Mar 2016 17:37:18 +0200
+Subject: audio/avrcp: Fix crash when connecting to controllers
+
+Patch 70fdb77d0af137aa859f267da976f610cd9bbbd2 has actually caused the
+following regression since no player is set:
+
+Invalid read of size 8
+ at 0x435B8E: avrcp_player_value_rsp (avrcp.c:2150)
+ by 0x42FB83: control_response (avctp.c:831)
+ by 0x42FB83: session_cb (avctp.c:996)
+ by 0x50C8E39: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.4600.2)
+ by 0x50C91CF: ??? (in /usr/lib64/libglib-2.0.so.0.4600.2)
+ by 0x50C94F1: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.4600.2)
+ by 0x40C258: main (main.c:687)
+Address 0x58 is not stack'd, malloc'd or (recently) free'd
+---
+ profiles/audio/avrcp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
+index 787643c..0c6279a 100644
+--- a/profiles/audio/avrcp.c
++++ b/profiles/audio/avrcp.c
+@@ -3656,7 +3656,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
+ }
+ }
+
+- if (!session->controller)
++ if (!session->controller || !session->controller->player)
+ return FALSE;
+
+ if (!(events & (1 << AVRCP_EVENT_SETTINGS_CHANGED)))
+--
+cgit v0.12
+
Copied: bluez/repos/testing-x86_64/PKGBUILD (from rev 262520, bluez/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-03-25 10:18:00 UTC (rev 262521)
@@ -0,0 +1,151 @@
+# $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.38
+pkgrel=2
+url="http://www.bluez.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd')
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+ bluetooth.modprobe
+ fix_crash_when_connecting_to_controllers.diff)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('0618c5440be6715805060ab5eea930526f34089c437bf61819447b160254f4df'
+ 'SKIP'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+ '27296fb6cce5e62a04fbeb0779d852995779ecef553cc2e692d91d89eff8c673')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # FS#48644, http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=177d27c8c3db4588ec13dae0368f240902c42825
+ patch -Np1 -i ${srcdir}/fix_crash_when_connecting_to_controllers.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-sixaxis \
+ --enable-experimental \
+ --enable-library # this is deprecated
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2')
+ 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
+
+ # 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
+ # 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
+ #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 262520, bluez/trunk/bluetooth.modprobe)
===================================================================
--- testing-x86_64/bluetooth.modprobe (rev 0)
+++ testing-x86_64/bluetooth.modprobe 2016-03-25 10:18:00 UTC (rev 262521)
@@ -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/fix_crash_when_connecting_to_controllers.diff (from rev 262520, bluez/trunk/fix_crash_when_connecting_to_controllers.diff)
===================================================================
--- testing-x86_64/fix_crash_when_connecting_to_controllers.diff (rev 0)
+++ testing-x86_64/fix_crash_when_connecting_to_controllers.diff 2016-03-25 10:18:00 UTC (rev 262521)
@@ -0,0 +1,37 @@
+From 177d27c8c3db4588ec13dae0368f240902c42825 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
+Date: Tue, 22 Mar 2016 17:37:18 +0200
+Subject: audio/avrcp: Fix crash when connecting to controllers
+
+Patch 70fdb77d0af137aa859f267da976f610cd9bbbd2 has actually caused the
+following regression since no player is set:
+
+Invalid read of size 8
+ at 0x435B8E: avrcp_player_value_rsp (avrcp.c:2150)
+ by 0x42FB83: control_response (avctp.c:831)
+ by 0x42FB83: session_cb (avctp.c:996)
+ by 0x50C8E39: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.4600.2)
+ by 0x50C91CF: ??? (in /usr/lib64/libglib-2.0.so.0.4600.2)
+ by 0x50C94F1: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.4600.2)
+ by 0x40C258: main (main.c:687)
+Address 0x58 is not stack'd, malloc'd or (recently) free'd
+---
+ profiles/audio/avrcp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
+index 787643c..0c6279a 100644
+--- a/profiles/audio/avrcp.c
++++ b/profiles/audio/avrcp.c
+@@ -3656,7 +3656,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
+ }
+ }
+
+- if (!session->controller)
++ if (!session->controller || !session->controller->player)
+ return FALSE;
+
+ if (!(events & (1 << AVRCP_EVENT_SETTINGS_CHANGED)))
+--
+cgit v0.12
+
More information about the arch-commits
mailing list