From 300cfd21603d8fafb4e1bac854d0dd5d4ee474e2 Mon Sep 17 00:00:00 2001
From: Nathan <ndowens@artixlinux.org>
Date: Mon, 26 Oct 2020 19:55:01 +0000
Subject: user/bluez: Upgrade to 5.55

Also fixes CVE-2020-27153
---
 user/bluez/APKBUILD | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'user')

diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD
index 6f90834b1..3d7c3736a 100644
--- a/user/bluez/APKBUILD
+++ b/user/bluez/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bluez
-pkgver=5.54
-pkgrel=1
+pkgver=5.55
+pkgrel=0
 pkgdesc="Linux Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch="all"
@@ -10,8 +10,8 @@ depends="dbus elogind"
 makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev
 	linux-headers ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd
-	$pkgname-btmon $pkgname-cups $pkgname-deprecated $pkgname-hid2hci
-	$pkgname-obexd $pkgname-openrc $pkgname-tools"
+	$pkgname-btmgmt $pkgname-btmon $pkgname-cups $pkgname-deprecated
+	$pkgname-hid2hci $pkgname-obexd $pkgname-openrc $pkgname-tools"
 source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
 	https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz
 	bluetooth.initd
@@ -30,6 +30,8 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
 	"
 
 # secfixes:
+#   5.55-r0:
+#     - CVE-2020-27153
 #   5.54-r0:
 #     - CVE-2020-0556
 
@@ -61,7 +63,8 @@ build() {
 		--enable-library \
 		--enable-deprecated \
 		--enable-experimental \
-		--enable-tools
+		--enable-tools \
+		--enable-hid2hci
 	make
 }
 
@@ -91,6 +94,12 @@ btmon() {
 	mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/
 }
 
+btmgmt() {
+	pkgdesc="Bluez tool for the Bluetooth Management API"
+	install -Dm755 "$builddir"/tools/btmgmt -t \
+		"$subpkgdir"/usr/bin
+}
+
 cups() {
 	pkgdesc="BlueZ backend for CUPS"
 	depends="cups"
@@ -132,7 +141,7 @@ tools() {
 	done
 }
 
-sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe  bluez-5.54.tar.xz
+sha512sums="9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033  bluez-5.55.tar.xz
 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f  readline-8.0.tar.gz
 fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e  bluetooth.initd
 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac  rfcomm.initd
-- 
cgit v1.2.3-60-g2f50