[PR PATCH] bluez: support configs in service, adopt.

[PR PATCH] bluez: support configs in service, adopt.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1865 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages bluez
https://github.com/void-linux/void-packages/pull/31060

bluez: support configs in service, adopt.
Passing options to bluetoothd can be necessary in some cases.

Also move INSTALL.msg to README.voidlinux, and note that elogind can be
enough, instead of requiring group membership.

@sgn you had asked me to adopt it, if that's still the case I can do it.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31060.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bluez-31060.patch --]
[-- Type: text/x-diff, Size: 2828 bytes --]

From b32f30a0a4b7c9d3da97e88bc9f44c3409083b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 21 May 2021 23:24:30 -0300
Subject: [PATCH] bluez: support configs in service, adopt.

Passing options to bluetoothd can be necessary in some cases.

Also move INSTALL.msg to README.voidlinux, and note that elogind can be
enough, instead of requiring group membership.
---
 srcpkgs/bluez/INSTALL.msg            | 1 -
 srcpkgs/bluez/files/README.voidlinux | 2 ++
 srcpkgs/bluez/files/bluetoothd/run   | 3 ++-
 srcpkgs/bluez/template               | 6 ++++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/bluez/INSTALL.msg
 create mode 100644 srcpkgs/bluez/files/README.voidlinux

diff --git a/srcpkgs/bluez/INSTALL.msg b/srcpkgs/bluez/INSTALL.msg
deleted file mode 100644
index d253e9cf502b..000000000000
--- a/srcpkgs/bluez/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-You need to be in the bluetooth group to be able to modify the bluetooth state!
diff --git a/srcpkgs/bluez/files/README.voidlinux b/srcpkgs/bluez/files/README.voidlinux
new file mode 100644
index 000000000000..39943287ed27
--- /dev/null
+++ b/srcpkgs/bluez/files/README.voidlinux
@@ -0,0 +1,2 @@
+You need to be in the bluetooth group or have elogind enabled
+to be able to modify the bluetooth state.
diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run
index 860fa4bf80b3..7457f9e560be 100755
--- a/srcpkgs/bluez/files/bluetoothd/run
+++ b/srcpkgs/bluez/files/bluetoothd/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+[ -r ./conf ] && . ./conf
 sv check dbus >/dev/null || exit 1
 exec 2>&1
-exec /usr/libexec/bluetooth/bluetoothd -n
+exec /usr/libexec/bluetooth/bluetoothd -n ${OPTS}
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 2130b7340580..723a14183336 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=5.58
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
@@ -11,7 +11,7 @@ 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)"
 short_desc="Bluetooth tools and daemons"
-maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
@@ -41,6 +41,8 @@ post_install() {
 	if [ "$build_option_mesh" ]; then
 		vsv bluetooth-meshd
 	fi
+
+	vdoc ${FILESDIR}/README.voidlinux
 }
 
 libbluetooth_package() {

Re: bluez: support configs in service, adopt.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 140 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31060#issuecomment-846336705

Comment:
Ack

Re: [PR PATCH] [Merged]: bluez: support configs in service, adopt.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]

There's a merged pull request on the void-packages repository

bluez: support configs in service, adopt.
https://github.com/void-linux/void-packages/pull/31060

Description:
Passing options to bluetoothd can be necessary in some cases.

Also move INSTALL.msg to README.voidlinux, and note that elogind can be
enough, instead of requiring group membership.

@sgn you had asked me to adopt it, if that's still the case I can do it.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->