[arch-commits] Commit in bluez/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Thu Feb 18 22:32:31 UTC 2021
Date: Thursday, February 18, 2021 @ 22:32:30
Author: heftig
Revision: 408502
archrelease: copy trunk to extra-x86_64
Added:
bluez/repos/extra-x86_64/PKGBUILD
(from rev 408501, bluez/trunk/PKGBUILD)
bluez/repos/extra-x86_64/bluetooth.modprobe
(from rev 408501, bluez/trunk/bluetooth.modprobe)
bluez/repos/extra-x86_64/fix_crash_when_SEP_codec_has_not_been_initialized.patch
(from rev 408501, bluez/trunk/fix_crash_when_SEP_codec_has_not_been_initialized.patch)
Deleted:
bluez/repos/extra-x86_64/PKGBUILD
bluez/repos/extra-x86_64/bluetooth.modprobe
bluez/repos/extra-x86_64/fix_crash_when_SEP_codec_has_not_been_initialized.patch
---------------------------------------------------------+
PKGBUILD | 319 +++++++-------
bluetooth.modprobe | 6
fix_crash_when_SEP_codec_has_not_been_initialized.patch | 90 +--
3 files changed, 208 insertions(+), 207 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-18 22:32:18 UTC (rev 408501)
+++ PKGBUILD 2021-02-18 22:32:30 UTC (rev 408502)
@@ -1,159 +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.55
-pkgrel=2
-url="http://www.bluez.org/"
-arch=('x86_64')
-license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell')
-source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
- fix_crash_when_SEP_codec_has_not_been_initialized.patch
- bluetooth.modprobe)
-# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88'
- 'SKIP'
- 'bc0a37ebea3f7e14d23a3a49964ee189bf4f79b96f839c754106dc73a7dfb6e9'
- '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
-validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
-
-prepare() {
- cd "${pkgname}"-${pkgver}
- # FS#68671 - fix a segfault
- patch -Np1 -i ../fix_crash_when_SEP_codec_has_not_been_initialized.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-hid2hci \
- --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' 'json-c')
- backup=('etc/bluetooth/main.conf')
- conflicts=('obexd-client' 'obexd-server')
-
- cd "${pkgbase}"-${pkgver}
- make DESTDIR=${pkgdir} \
- install-pkglibexecPROGRAMS \
- 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-dist_zshcompletionDATA \
- 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-pkgincludeHEADERS \
- 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 408501, bluez/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-18 22:32:30 UTC (rev 408502)
@@ -0,0 +1,160 @@
+# Contributor: 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.55
+pkgrel=3
+url="http://www.bluez.org/"
+arch=('x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell')
+source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+ fix_crash_when_SEP_codec_has_not_been_initialized.patch
+ bluetooth.modprobe)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88'
+ 'SKIP'
+ 'bc0a37ebea3f7e14d23a3a49964ee189bf4f79b96f839c754106dc73a7dfb6e9'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+ cd "${pkgname}"-${pkgver}
+ # FS#68671 - fix a segfault
+ patch -Np1 -i ../fix_crash_when_SEP_codec_has_not_been_initialized.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-hid2hci \
+ --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' 'json-c')
+ backup=('etc/bluetooth/main.conf')
+ conflicts=('obexd-client' 'obexd-server')
+
+ cd "${pkgbase}"-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-pkglibexecPROGRAMS \
+ 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-dist_zshcompletionDATA \
+ 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')
+ provides=('libbluetooth.so')
+ license=('LGPL2.1')
+
+ cd "${pkgbase}"-${pkgver}
+ make DESTDIR="${pkgdir}" \
+ install-pkgincludeHEADERS \
+ 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 2021-02-18 22:32:18 UTC (rev 408501)
+++ bluetooth.modprobe 2021-02-18 22:32:30 UTC (rev 408502)
@@ -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 408501, bluez/trunk/bluetooth.modprobe)
===================================================================
--- bluetooth.modprobe (rev 0)
+++ bluetooth.modprobe 2021-02-18 22:32:30 UTC (rev 408502)
@@ -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: fix_crash_when_SEP_codec_has_not_been_initialized.patch
===================================================================
--- fix_crash_when_SEP_codec_has_not_been_initialized.patch 2021-02-18 22:32:18 UTC (rev 408501)
+++ fix_crash_when_SEP_codec_has_not_been_initialized.patch 2021-02-18 22:32:30 UTC (rev 408502)
@@ -1,45 +0,0 @@
-From 326d70edd99c3f21cf299dba55214e2c8957e622 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
-Date: Mon, 23 Nov 2020 10:20:06 -0800
-Subject: [PATCH] a2dp: Fix crash when SEP codec has not been initialized
-
-If SEP has not been properly discovered avdtp_get_codec may return NULL
-thus causing crashes such as:
-
-https://github.com/bluez/bluez/issues/57
----
- profiles/audio/a2dp.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
-index 59d11a0aa..f1e4fa990 100644
---- a/profiles/audio/a2dp.c
-+++ b/profiles/audio/a2dp.c
-@@ -1887,8 +1887,8 @@ static void register_remote_sep(void *data, void *user_data)
- sep, remote_sep_free) == FALSE) {
- error("Could not register remote sep %s", sep->path);
- free(sep->path);
-- sep->path = NULL;
-- goto done;
-+ free(sep);
-+ return;
- }
-
- DBG("Found remote SEP: %s", sep->path);
-@@ -2627,10 +2627,15 @@ static void store_remote_sep(void *data, void *user_data)
- GKeyFile *key_file = user_data;
- char seid[4], value[256];
- struct avdtp_service_capability *service = avdtp_get_codec(sep->sep);
-- struct avdtp_media_codec_capability *codec = (void *) service->data;
-+ struct avdtp_media_codec_capability *codec;
- unsigned int i;
- ssize_t offset;
-
-+ if (!service)
-+ return;
-+
-+ codec = (void *) service->data;
-+
- sprintf(seid, "%02hhx", avdtp_get_seid(sep->sep));
-
- offset = sprintf(value, "%02hhx:%02hhx:%02hhx:",
Copied: bluez/repos/extra-x86_64/fix_crash_when_SEP_codec_has_not_been_initialized.patch (from rev 408501, bluez/trunk/fix_crash_when_SEP_codec_has_not_been_initialized.patch)
===================================================================
--- fix_crash_when_SEP_codec_has_not_been_initialized.patch (rev 0)
+++ fix_crash_when_SEP_codec_has_not_been_initialized.patch 2021-02-18 22:32:30 UTC (rev 408502)
@@ -0,0 +1,45 @@
+From 326d70edd99c3f21cf299dba55214e2c8957e622 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
+Date: Mon, 23 Nov 2020 10:20:06 -0800
+Subject: [PATCH] a2dp: Fix crash when SEP codec has not been initialized
+
+If SEP has not been properly discovered avdtp_get_codec may return NULL
+thus causing crashes such as:
+
+https://github.com/bluez/bluez/issues/57
+---
+ profiles/audio/a2dp.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
+index 59d11a0aa..f1e4fa990 100644
+--- a/profiles/audio/a2dp.c
++++ b/profiles/audio/a2dp.c
+@@ -1887,8 +1887,8 @@ static void register_remote_sep(void *data, void *user_data)
+ sep, remote_sep_free) == FALSE) {
+ error("Could not register remote sep %s", sep->path);
+ free(sep->path);
+- sep->path = NULL;
+- goto done;
++ free(sep);
++ return;
+ }
+
+ DBG("Found remote SEP: %s", sep->path);
+@@ -2627,10 +2627,15 @@ static void store_remote_sep(void *data, void *user_data)
+ GKeyFile *key_file = user_data;
+ char seid[4], value[256];
+ struct avdtp_service_capability *service = avdtp_get_codec(sep->sep);
+- struct avdtp_media_codec_capability *codec = (void *) service->data;
++ struct avdtp_media_codec_capability *codec;
+ unsigned int i;
+ ssize_t offset;
+
++ if (!service)
++ return;
++
++ codec = (void *) service->data;
++
+ sprintf(seid, "%02hhx", avdtp_get_seid(sep->sep));
+
+ offset = sprintf(value, "%02hhx:%02hhx:%02hhx:",
More information about the arch-commits
mailing list