From c3da80732c03a827b3e5701b3d663c1226532447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:43 -0300
Subject: [PATCH] bluez: update to 5.58.

Requested by paper42:
- add logging to services
- add experimental build option
---
 srcpkgs/bluez/files/bluetooth-meshd/log/run |  1 +
 srcpkgs/bluez/files/bluetooth-meshd/run     |  3 ++-
 srcpkgs/bluez/files/bluetoothd/log/run      |  1 +
 srcpkgs/bluez/files/bluetoothd/run          |  3 ++-
 srcpkgs/bluez/template                      | 12 +++++++-----
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run
 create mode 120000 srcpkgs/bluez/files/bluetoothd/log/run

diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetooth-meshd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run
index 752dbcc37bf..2594d5fe56e 100755
--- a/srcpkgs/bluez/files/bluetooth-meshd/run
+++ b/srcpkgs/bluez/files/bluetooth-meshd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach
diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetoothd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run
index 2b96adcdcdc..860fa4bf80b 100755
--- a/srcpkgs/bluez/files/bluetoothd/run
+++ b/srcpkgs/bluez/files/bluetoothd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetoothd -n
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 80fcf51c85a..2130b734058 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,11 +1,12 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.55
+version=5.58
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
- --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)"
+ --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)
+ $(vopt_enable experimental)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
  readline-devel ell-devel $(vopt_if mesh json-c-devel)"
@@ -14,19 +15,20 @@ maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88
+checksum=c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
-build_options="mesh nfc"
 patch_args="-Np1"
 
+build_options="mesh nfc experimental"
+
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 post_patch() {
 	# Use system ell
-	rm -rf ell/*
+	rm -r ell/*
 }
 
 pre_configure() {