[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Pacho Ramos]

commit:     ccda19a7dbc177cc713f1f94a558bf40a73d77c6
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 13:57:26 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 13:58:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccda19a7

net-wireless/bluez: Commit forgotten patch (#579438)

Package-Manager: portage-2.2.28

 .../bluez/files/bluez-5.39-systemd-quote.patch     | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
new file mode 100644
index 0000000..d23c877
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
@@ -0,0 +1,38 @@
+From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 3 Apr 2016 14:30:02 -0400
+Subject: [PATCH] build: Quote systemd variable names
+
+If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is
+defined as a macro. Quote this name to prevent macro expansion.
+
+Bug: https://bugs.gentoo.org/527432
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1679a47..4664003 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then
+ 	fi
+ 	AC_MSG_RESULT([${path_systemunitdir}])
+ fi
+-AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}])
++AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}])
+ 
+ AC_ARG_WITH([systemduserunitdir],
+ 			AC_HELP_STRING([--with-systemduserunitdir=DIR],
+@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then
+ 	fi
+ 	AC_MSG_RESULT([${path_userunitdir}])
+ fi
+-AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}])
++AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}])
+ 
+ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
+ 			[do not install configuration and data files]),
+-- 
+2.8.0
+

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Michael Palimaka]

commit:     c82f2c107f426f69cd82ba2b4ad569ca78d0d1bf
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 27 15:41:06 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 17:40:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82f2c10

net-wireless/bluez: remove unused patches

 ...-Logitech-diNovo-Edge-keyboard-firmware-i.patch | 29 ------------
 net-wireless/bluez/files/bluez-5.37-endian.patch   | 51 ----------------------
 2 files changed, 80 deletions(-)

diff --git a/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch b/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
deleted file mode 100644
index 55d5af6..00000000
--- a/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aa73bf5039dfd2cf0a52dd6fd22501d955cc1a00 Mon Sep 17 00:00:00 2001
-From: Tommy <mesilliac@gmail.com>
-Date: Thu, 10 Jan 2013 09:18:43 +0100
-Subject: [PATCH] work around Logitech diNovo Edge keyboard firmware issue
-
-https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/269851
----
- tools/hid2hci.rules |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/tools/hid2hci.rules b/tools/hid2hci.rules
-index db6bb03..7db4572 100644
---- a/tools/hid2hci.rules
-+++ b/tools/hid2hci.rules
-@@ -11,7 +11,10 @@ ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProt
-   RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
- 
- # Logitech devices
--KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
-+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[5e]", \
-+  RUN+="hid2hci --method=logitech-hid --devpath=%p"
-+# Logitech, Inc. RAW communicating devices
-+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[34abc]|c71[34bc]", \
-   RUN+="hid2hci --method=logitech-hid --devpath=%p"
- 
- ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"
--- 
-1.8.0.1
-

diff --git a/net-wireless/bluez/files/bluez-5.37-endian.patch b/net-wireless/bluez/files/bluez-5.37-endian.patch
deleted file mode 100644
index 1ffa350..00000000
--- a/net-wireless/bluez/files/bluez-5.37-endian.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/profiles/audio/a2dp-codecs.h
-+++ b/profiles/audio/a2dp-codecs.h
-@@ -149,6 +149,17 @@
- 	uint16_t codec_id;
- } __attribute__ ((packed)) a2dp_vendor_codec_t;
- 
-+typedef struct {
-+	a2dp_vendor_codec_t info;
-+	uint8_t channel_mode:4;
-+	uint8_t frequency:4;
-+} __attribute__ ((packed)) a2dp_aptx_t;
-+
-+typedef struct {
-+	a2dp_vendor_codec_t info;
-+	uint8_t unknown[2];
-+} __attribute__ ((packed)) a2dp_ldac_t;
-+
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- 
- typedef struct {
-@@ -183,17 +194,6 @@
- 	uint8_t bitrate3;
- } __attribute__ ((packed)) a2dp_aac_t;
- 
--typedef struct {
--	a2dp_vendor_codec_t info;
--	uint8_t channel_mode:4;
--	uint8_t frequency:4;
--} __attribute__ ((packed)) a2dp_aptx_t;
--
--typedef struct {
--	a2dp_vendor_codec_t info;
--	uint8_t unknown[2];
--} __attribute__ ((packed)) a2dp_ldac_t;
--
- #elif __BYTE_ORDER == __BIG_ENDIAN
- 
- typedef struct {
-@@ -228,12 +228,6 @@
- 	uint8_t bitrate3;
- } __attribute__ ((packed)) a2dp_aac_t;
- 
--typedef struct {
--	a2dp_vendor_codec_t info;
--	uint8_t frequency:4;
--	uint8_t channel_mode:4;
--} __attribute__ ((packed)) a2dp_aptx_t;
--
- #else
- #error "Unknown byte order"
- #endif

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Pacho Ramos]

commit:     7bb29d39a859f037992da6f485f3171adf17315e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 21:43:39 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 21:43:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb29d39

net-wireless/bluez: Drop obsolete files (#664044 by iamnr3)

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 .../0002-autopair-Don-t-handle-the-iCade.patch     | 47 ----------------------
 net-wireless/bluez/files/rfcomm-init.d-r2          | 34 ----------------
 2 files changed, 81 deletions(-)

diff --git a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch b/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch
deleted file mode 100644
index 68751ae7b60..00000000000
--- a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c16ae7041c7511d8d1ed8441f696716fa6a9117e Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 19 Nov 2013 14:11:39 +0100
-Subject: [PATCH 2/5] autopair: Don't handle the iCade
-
-We can't easily enter digits other than 1 through 4 (inclusive)
-so leave it up to the agent to figure out a good passcode
-for the iCade.
-
-Note that we can not use the VID/PID of the device, as it is not
-yet known at that point.
----
- plugins/autopair.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/autopair.c b/plugins/autopair.c
-index 8c98c12..5d2f6f7 100644
---- a/plugins/autopair.c
-+++ b/plugins/autopair.c
-@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
- {
- 	char addr[18];
- 	char pinstr[7];
-+	char name[25];
- 	uint32_t class;
- 
- 	ba2str(device_get_address(device), addr);
- 
- 	class = btd_device_get_class(device);
- 
--	DBG("device %s 0x%x", addr, class);
-+	device_get_name(device, name, sizeof(name));
-+	name[sizeof(name) - 1] = 0;
-+
-+	DBG("device %s (%s) 0x%x", addr, name, class);
-+
-+	g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device));
-+
-+	/* The iCade shouldn't use random PINs like normal keyboards */
-+	if (name != NULL && strstr(name, "iCade") != NULL)
-+		return 0;
- 
- 	/* This is a class-based pincode guesser. Ignore devices with an
- 	 * unknown class.
--- 
-1.8.4.2
-

diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2 b/net-wireless/bluez/files/rfcomm-init.d-r2
deleted file mode 100644
index 3bfb010d60b..00000000000
--- a/net-wireless/bluez/files/rfcomm-init.d-r2
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need bluetooth
-}
-
-checkconfig() {
-	if [ -z "${ADDRESS}" ]; then
-		eerror "ADDRESS must be set"
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	local DEVICE=${RC_SVCNAME#*.}
-
-	checkconfig || return 1
-
-   	ebegin "Starting ${RC_SVCNAME}"
-	rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL}
-	eend $?
-}
-
-stop() {
-	local DEVICE=${RC_SVCNAME#*.}
-
-	ebegin "Shutting down ${RC_SVCNAME}"
-	rfcomm release "${DEVICE}"
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[David Seifert]

commit:     0972ff85938dcde7f47822814f6d899480a1262f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Dec 23 06:50:01 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 10:15:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0972ff85

net-wireless/bluez: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/14101
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...xd-without-systemd-in-the-user-session-r1.patch | 58 ----------------------
 .../bluez/files/bluez-5.39-systemd-quote.patch     | 38 --------------
 net-wireless/bluez/files/bluez-plugdev.patch       | 14 ------
 3 files changed, 110 deletions(-)

diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
deleted file mode 100644
index dec93073e18..00000000000
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
-Date: Sat, 12 Oct 2013 17:45:25 +0200
-Subject: [PATCH] Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
----
- Makefile.obexd                      | 4 ++--
- obexd/src/org.bluez.obex.service    | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 3760867..142e7c3 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -2,12 +2,12 @@
- if SYSTEMD
- systemduserunitdir = $(SYSTEMD_USERUNITDIR)
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- obex_plugindir = $(libdir)/obex/plugins
- 
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a538088..0000000
---- a/obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 0000000..9c815f2
---- /dev/null
-+++ b/obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
--- 
-1.8.3.1
-

diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
deleted file mode 100644
index d23c877eef8..00000000000
--- a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 3 Apr 2016 14:30:02 -0400
-Subject: [PATCH] build: Quote systemd variable names
-
-If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is
-defined as a macro. Quote this name to prevent macro expansion.
-
-Bug: https://bugs.gentoo.org/527432
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1679a47..4664003 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then
- 	fi
- 	AC_MSG_RESULT([${path_systemunitdir}])
- fi
--AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}])
-+AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}])
- 
- AC_ARG_WITH([systemduserunitdir],
- 			AC_HELP_STRING([--with-systemduserunitdir=DIR],
-@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then
- 	fi
- 	AC_MSG_RESULT([${path_userunitdir}])
- fi
--AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}])
-+AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}])
- 
- AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
- 			[do not install configuration and data files]),
--- 
-2.8.0
-

diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch
deleted file mode 100644
index 726838a5132..00000000000
--- a/net-wireless/bluez/files/bluez-plugdev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf
---- bluez-4.39.orig/src/bluetooth.conf	2008-12-20 20:18:10.000000000 +0100
-+++ bluez-4.39/src/bluetooth.conf	2009-09-05 13:30:34.411581498 +0200
-@@ -17,6 +17,10 @@
-     <allow send_destination="org.bluez"/>
-   </policy>
- 
-+  <policy group="plugdev">
-+    <allow send_destination="org.bluez"/>
-+  </policy>
-+
-   <policy context="default">
-     <deny send_destination="org.bluez"/>
-   </policy>

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Conrad Kostecki]

commit:     8441848c703d5ff62936d43748021563a2e95d6f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jul 14 19:27:19 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 20:04:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8441848c

net-wireless/bluez: remove unused files

Closes: https://github.com/gentoo/gentoo/pull/21642
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-wireless/bluez/files/69-btattach-bcm.rules   | 33 ------------------------
 net-wireless/bluez/files/bluetooth-init.d-r4     | 12 ---------
 net-wireless/bluez/files/btattach-bcm-service.sh | 30 ---------------------
 net-wireless/bluez/files/btattach-bcm_at.service |  6 -----
 4 files changed, 81 deletions(-)

diff --git a/net-wireless/bluez/files/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules
deleted file mode 100644
index dfe8d1e785c..00000000000
--- a/net-wireless/bluez/files/69-btattach-bcm.rules
+++ /dev/null
@@ -1,33 +0,0 @@
-# Some devices have a bluetooth HCI connected to an uart, these needs to be
-# setup by calling btattach. The systemd btattach-bcm.service takes care of
-# this. These udev rules hardware-activate that service when necessary.
-#
-# For now this only suports ACPI enumerated Broadcom BT HCIs.
-# This has been tested on Bay and Cherry Trail devices with both ACPI and
-# PCI enumerated UARTs.
-
-# Note we check for the platform device not for the acpi device, because
-# some DSDTs list multiple bluetooth adapters, but only some (or none)
-# are enabled. Only enabled adapters get a platform device created.
-ACTION!="add", GOTO="btattach_bcm_rules_end"
-SUBSYSTEM!="platform", GOTO="btattach_bcm_rules_end"
-
-KERNEL=="BCM2E1A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E39:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3D:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3F:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E40:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E54:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E55:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E64:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E65:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E67:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E71:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7B:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7C:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7E:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E95:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E96:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-
-LABEL="btattach_bcm_rules_end"

diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4
deleted file mode 100644
index e69c66867fa..00000000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/bluetoothd.pid"
-command="/usr/libexec/bluetooth/bluetoothd"
-command_background=1
-
-depend() {
-	after coldplug
-	need dbus localmount hostname
-}

diff --git a/net-wireless/bluez/files/btattach-bcm-service.sh b/net-wireless/bluez/files/btattach-bcm-service.sh
deleted file mode 100644
index c7f8b178467..00000000000
--- a/net-wireless/bluez/files/btattach-bcm-service.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Simple shell script to wait for the tty for an uart using BT HCI to show up
-# and then invoke btattach with the right parameters, this is intended to be
-# invoked from a hardware-activated systemd service
-#
-# For now this only suports ACPI enumerated Broadcom BT HCIs.
-# This has been tested on Bay and Cherry Trail devices with both ACPI and
-# PCI enumerated UARTs.
-#
-# Note the kernel bt developers are working on solving this entirely in the
-# kernel, so it is not worth the trouble to write something better then this.
-
-BT_DEV="/sys/bus/platform/devices/$1"
-BT_DEV="$(readlink -f $BT_DEV)"
-UART_DEV="$(dirname $BT_DEV)"
-
-# Stupid GPD-pocket has USB BT with id 0000:0000, but still claims to have
-# an uart attached bt
-if [ "$1" = "BCM2E7E:00" ] && lsusb | grep -q "ID 0000:0000"; then
-	exit 0
-fi
-
-while [ ! -d "$UART_DEV/tty" ]; do
-	sleep .2
-done
-
-TTY="$(ls $UART_DEV/tty)"
-
-exec btattach --bredr "/dev/$TTY" -P bcm

diff --git a/net-wireless/bluez/files/btattach-bcm_at.service b/net-wireless/bluez/files/btattach-bcm_at.service
deleted file mode 100644
index 1e7c7dbe582..00000000000
--- a/net-wireless/bluez/files/btattach-bcm_at.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=btattach for Broadcom devices
-
-[Service]
-Type=simple
-ExecStart=/usr/libexec/bluetooth/btattach-bcm-service.sh %I

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Conrad Kostecki]

commit:     de026837aaef968dc2bcb14fcc06beb73325a2bc
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec  8 08:27:17 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 19:47:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de026837

net-wireless/bluez: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/23222
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../bluez/files/bluez-5.60-glibc-2.34.patch        | 42 ----------------------
 1 file changed, 42 deletions(-)

diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
deleted file mode 100644
index 1e846100285d..000000000000
--- a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 3 Mar 2021 08:57:36 +0100
-Subject: [PATCH] media: rename local function conflicting with pause(2)
-
-profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)'
- 1284 | static bool pause(void *user_data)
-      |             ^~~~~
-In file included from /usr/include/bits/sigstksz.h:24,
-                 from /usr/include/signal.h:315,
-                 from /usr/include/glib-2.0/glib/gbacktrace.h:36,
-                 from /usr/include/glib-2.0/glib.h:34,
-                 from profiles/audio/media.c:21:
-/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)'
-  478 | extern int pause (void);
-      |            ^~~~~
----
- profiles/audio/media.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index c84bbe22dc..3d8c4b69c3 100644
---- a/profiles/audio/media.c
-+++ b/profiles/audio/media.c
-@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
- 	return media_player_send(mp, "Stop");
- }
- 
--static bool pause(void *user_data)
-+static bool pause_play(void *user_data)
- {
- 	struct media_player *mp = user_data;
- 
-@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
- 	.set_volume = set_volume,
- 	.play = play,
- 	.stop = stop,
--	.pause = pause,
-+	.pause = pause_play,
- 	.next = next,
- 	.previous = previous,
- };

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Conrad Kostecki]

commit:     6aecaf3e657fbc7bc7746786060cb0b7e0866db0
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 27 11:45:24 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 22:07:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aecaf3e

net-wireless/bluez: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24775
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/bluez-5.63-use-queue_push_tail.patch     | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
deleted file mode 100644
index 6644e250cc48..000000000000
--- a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Fri, 17 Dec 2021 14:05:50 +0100
-Subject: [PATCH] DRAFT shared/att: Use queue_push_tail for
- BT_ATT_OP_READ_BLOB_REQ
-
-As repoorted by Christopher Schramm [1], this is supposed to fix #220.
-
-1: https://github.com/bluez/bluez/issues/220#issuecomment-996669412
-
-Suggested-by: Christopher Schramm <git@cschramm.eu>
----
- src/shared/att.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/shared/att.c b/src/shared/att.c
-index 169f726e4..5ce735a07 100644
---- a/src/shared/att.c
-+++ b/src/shared/att.c
-@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, uint8_t opcode,
- 
- 	switch (opcode) {
- 	/* Only prepend requests that could be a continuation */
--	case BT_ATT_OP_READ_BLOB_REQ:
- 	case BT_ATT_OP_PREP_WRITE_REQ:
- 	case BT_ATT_OP_EXEC_WRITE_REQ:
- 		result = queue_push_head(att->req_queue, op);

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Conrad Kostecki]

commit:     dd556a89291ce48b6aec783b365a856ad4d92637
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 27 17:13:05 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 18:16:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd556a89

net-wireless/bluez: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28854
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../bluez/files/bluez-5.63-musl-limits.patch       | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/net-wireless/bluez/files/bluez-5.63-musl-limits.patch b/net-wireless/bluez/files/bluez-5.63-musl-limits.patch
deleted file mode 100644
index ebdffc3270b4..000000000000
--- a/net-wireless/bluez/files/bluez-5.63-musl-limits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e5dcac6abd6129829c4983d6635916cee8f1a627 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Sun, 12 Sep 2021 09:46:11 -0500
-Subject: [PATCH] include limits.h for PATH_MAX for musl support
-
----
- tools/mesh-cfgtest.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c
-index fa0474f..bfc8e1b 100644
---- a/tools/mesh-cfgtest.c
-+++ b/tools/mesh-cfgtest.c
-@@ -26,6 +26,7 @@
- #include <time.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <limits.h>
- 
- #include <ell/ell.h>
- 
--- 
-2.32.0
-

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Conrad Kostecki]

commit:     e995ac6f8404a060338f5cc1b05ddf48dcc5642d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Apr 19 17:47:15 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 19:00:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e995ac6f

net-wireless/bluez: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30653
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...et-pending-settings-when-receiving-MGMT-e.patch | 170 ---------------------
 1 file changed, 170 deletions(-)

diff --git a/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch b/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch
deleted file mode 100644
index b9b432fadff0..000000000000
--- a/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From ede7b915980fbc80eff80aa189c35ca016956c61 Mon Sep 17 00:00:00 2001
-From: Archie Pusaka <apusaka@chromium.org>
-Date: Tue, 23 Aug 2022 12:15:56 +0800
-Subject: [PATCH] adapter: Reset pending settings when receiving MGMT error
-
-We set the pending settings flag when sending MGMT_SETTING_*
-commands to the MGMT layer and clear them when receiving a
-successful reply, but we don't clear them when receiving an error
-reply. This might cause a setting to be stuck in pending state.
-
-Therefore, also clear the pending flag when receiving error.
-Furthermore, this patch also postpones setting the pending flag
-until we queue the MGMT command in order to avoid setting it too
-soon but we return early.
-
-This was caught during power off test, where MGMT_OP_SET_POWERED
-returns Authentication Failed because disconnection takes too long.
-Future attempts to switch power will then be ignored.
-
-< HCI Command: Disconnect (0x01|0x0006) plen 3   #17916 [hci0] 12.502908
-        Handle: 512
-        Reason: Remote Device Terminated due to Power Off (0x15)
-> HCI Event: Command Status (0x0f) plen 4        #17917 [hci0] 12.503185
-      Disconnect (0x01|0x0006) ncmd 1
-        Status: Success (0x00)
-@ MGMT Event: Command Status (0x0002) plen 3   {0x0001} [hci0] 14.519491
-      Set Powered (0x0005)
-        Status: Authentication Failed (0x05)
-= bluetoothd: Failed to set mode: Authentication Failed (0x05) 14.520042
-= bluetoothd: adapter /org/bluez/hci0 set power to 0           14.813533
-> HCI Event: Disconnect Complete (0x05) plen 4   #17918 [hci0] 16.509043
-        Status: Success (0x00)
-        Handle: 512
-        Reason: Connection Timeout (0x08)
-
-Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org>
----
- src/adapter.c | 39 +++++++++++++++++++++++++++++++--------
- 1 file changed, 31 insertions(+), 8 deletions(-)
-
-diff --git a/src/adapter.c b/src/adapter.c
-index ec26aab1a..b453e86a0 100644
---- a/src/adapter.c
-+++ b/src/adapter.c
-@@ -640,14 +640,21 @@ static void new_settings_callback(uint16_t index, uint16_t length,
- 	settings_changed(adapter, settings);
- }
- 
-+struct set_mode_data {
-+	struct btd_adapter *adapter;
-+	uint32_t setting;
-+};
-+
- static void set_mode_complete(uint8_t status, uint16_t length,
- 					const void *param, void *user_data)
- {
--	struct btd_adapter *adapter = user_data;
-+	struct set_mode_data *data = user_data;
-+	struct btd_adapter *adapter = data->adapter;
- 
- 	if (status != MGMT_STATUS_SUCCESS) {
- 		btd_error(adapter->dev_id, "Failed to set mode: %s (0x%02x)",
- 						mgmt_errstr(status), status);
-+		adapter->pending_settings &= ~data->setting;
- 		return;
- 	}
- 
-@@ -677,6 +684,7 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,
- {
- 	struct mgmt_mode cp;
- 	uint32_t setting = 0;
-+	struct set_mode_data *data;
- 
- 	memset(&cp, 0, sizeof(cp));
- 	cp.val = mode;
-@@ -699,15 +707,20 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,
- 		break;
- 	}
- 
--	adapter->pending_settings |= setting;
--
- 	DBG("sending set mode command for index %u", adapter->dev_id);
- 
-+	data = g_new0(struct set_mode_data, 1);
-+	data->adapter = adapter;
-+	data->setting = setting;
-+
- 	if (mgmt_send(adapter->mgmt, opcode,
- 				adapter->dev_id, sizeof(cp), &cp,
--				set_mode_complete, adapter, NULL) > 0)
-+				set_mode_complete, data, g_free) > 0) {
-+		adapter->pending_settings |= setting;
- 		return true;
-+	}
- 
-+	g_free(data);
- 	btd_error(adapter->dev_id, "Failed to set mode for index %u",
- 							adapter->dev_id);
- 
-@@ -718,6 +731,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
- 							uint16_t timeout)
- {
- 	struct mgmt_cp_set_discoverable cp;
-+	struct set_mode_data *data;
- 
- 	memset(&cp, 0, sizeof(cp));
- 	cp.val = mode;
-@@ -734,11 +748,16 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
- 									mode);
- 	}
- 
-+	data = g_new0(struct set_mode_data, 1);
-+	data->adapter = adapter;
-+	data->setting = 0;
-+
- 	if (mgmt_send(adapter->mgmt, MGMT_OP_SET_DISCOVERABLE,
- 				adapter->dev_id, sizeof(cp), &cp,
--				set_mode_complete, adapter, NULL) > 0)
-+				set_mode_complete, data, g_free) > 0)
- 		return true;
- 
-+	g_free(data);
- 	btd_error(adapter->dev_id, "Failed to set mode for index %u",
- 							adapter->dev_id);
- 
-@@ -2877,6 +2896,7 @@ static gboolean property_get_mode(struct btd_adapter *adapter,
- 
- struct property_set_data {
- 	struct btd_adapter *adapter;
-+	uint32_t setting;
- 	GDBusPendingPropertySet id;
- };
- 
-@@ -2901,6 +2921,8 @@ static void property_set_mode_complete(uint8_t status, uint16_t length,
- 
- 		g_dbus_pending_property_error(data->id, dbus_err,
- 							mgmt_errstr(status));
-+
-+		adapter->pending_settings &= ~data->setting;
- 		return;
- 	}
- 
-@@ -2969,8 +2991,6 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting,
- 
- 	mode = (enable == TRUE) ? 0x01 : 0x00;
- 
--	adapter->pending_settings |= setting;
--
- 	switch (setting) {
- 	case MGMT_SETTING_POWERED:
- 		opcode = MGMT_OP_SET_POWERED;
-@@ -3024,11 +3044,14 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting,
- 		goto failed;
- 
- 	data->adapter = adapter;
-+	data->setting = setting;
- 	data->id = id;
- 
- 	if (mgmt_send(adapter->mgmt, opcode, adapter->dev_id, len, param,
--			property_set_mode_complete, data, g_free) > 0)
-+			property_set_mode_complete, data, g_free) > 0) {
-+		adapter->pending_settings |= setting;
- 		return;
-+	}
- 
- 	g_free(data);
- 
--- 
-2.37.2
-

[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/

[Pacho Ramos]

commit:     e9e9b48a11ca7c39ca0ec24f4383a6685949ad66
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Aug 24 19:26:28 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 13:47:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e9b48a

net-wireless/bluez: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32437
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 ...-GLib-helper-function-to-manipulate-paths.patch |  38 -----
 .../bluez/files/bluez-5.66-musl-max-input.patch    |  19 ---
 .../files/bluez-5.66-transient-hostname-fix.patch  | 185 ---------------------
 3 files changed, 242 deletions(-)

diff --git a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
deleted file mode 100644
index 004a3895aa09..000000000000
--- a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 9 Nov 2013 18:13:43 +0100
-Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths
-
-Instead of trying to do it by hand. This also makes sure that
-relative paths aren't used by the agent.
----
- obexd/src/manager.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/obexd/src/manager.c b/obexd/src/manager.c
-index cec8a39..f18896e 100644
---- a/obexd/src/manager.c
-+++ b/obexd/src/manager.c
-@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
- 				DBUS_TYPE_STRING, &name,
- 				DBUS_TYPE_INVALID)) {
- 		/* Splits folder and name */
--		const char *slash = strrchr(name, '/');
-+		gboolean is_relative = !g_path_is_absolute(name);
- 		DBG("Agent replied with %s", name);
--		if (!slash) {
--			agent->new_name = g_strdup(name);
-+		if (is_relative) {
-+			agent->new_name = g_path_get_basename(name);
- 			agent->new_folder = NULL;
- 		} else {
--			agent->new_name = g_strdup(slash + 1);
--			agent->new_folder = g_strndup(name, slash - name);
-+			agent->new_name = g_path_get_basename(name);
-+			agent->new_folder = g_path_get_dirname(name);
- 		}
- 	}
- 
--- 
-1.8.4.2
-

diff --git a/net-wireless/bluez/files/bluez-5.66-musl-max-input.patch b/net-wireless/bluez/files/bluez-5.66-musl-max-input.patch
deleted file mode 100644
index d8bdb3316e49..000000000000
--- a/net-wireless/bluez/files/bluez-5.66-musl-max-input.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://lore.kernel.org/linux-bluetooth/20230131055258.3311810-1-sam@gentoo.org/T/#u
-# musl does provide _POSIX_MAX_INPUT, but no MAX_INPUT out of the box.
-# This patch assigns _POSIX_MAX_INPUT to MAX_INPUT.
-# Please refer: https://github.com/nilfs-dev/nilfs-utils/commit/115fe4b976858c487cf83065f513d8626089579a
-# https://bugs.gentoo.org/888467
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -28,6 +28,11 @@
- #include <sys/random.h>
- #endif
-
-+/* define MAX_INPUT for musl */
-+#ifndef MAX_INPUT
-+#define MAX_INPUT _POSIX_MAX_INPUT
-+#endif
-+
- #include "src/shared/util.h"
-
- void *util_malloc(size_t size)

diff --git a/net-wireless/bluez/files/bluez-5.66-transient-hostname-fix.patch b/net-wireless/bluez/files/bluez-5.66-transient-hostname-fix.patch
deleted file mode 100644
index fef2776f7a0e..000000000000
--- a/net-wireless/bluez/files/bluez-5.66-transient-hostname-fix.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From e515f4b6e25c971c47ab79e9cbdfa17119bbde23 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 9 Nov 2022 16:17:55 +0100
-Subject: [PATCH 1/2] hostname: Add '' around printed strings
-
-Otherwise we can't see whether the string is nul, or empty.
----
- plugins/hostname.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/hostname.c b/plugins/hostname.c
-index 1a9513adb..14b6450b5 100644
---- a/plugins/hostname.c
-+++ b/plugins/hostname.c
-@@ -128,7 +128,7 @@ static void property_changed(GDBusProxy *proxy, const char *name,
- 
- 			dbus_message_iter_get_basic(iter, &str);
- 
--			DBG("pretty hostname: %s", str);
-+			DBG("pretty hostname: '%s'", str);
- 
- 			g_free(pretty_hostname);
- 			pretty_hostname = g_strdup(str);
-@@ -146,7 +146,7 @@ static void property_changed(GDBusProxy *proxy, const char *name,
- 
- 			dbus_message_iter_get_basic(iter, &str);
- 
--			DBG("static hostname: %s", str);
-+			DBG("static hostname: '%s'", str);
- 
- 			g_free(static_hostname);
- 			static_hostname = g_strdup(str);
-@@ -165,7 +165,7 @@ static void property_changed(GDBusProxy *proxy, const char *name,
- 
- 			dbus_message_iter_get_basic(iter, &str);
- 
--			DBG("chassis: %s", str);
-+			DBG("chassis: '%s'", str);
- 
- 			for (i = 0; chassis_table[i].chassis; i++) {
- 				if (strcmp(chassis_table[i].chassis, str))
--- 
-2.37.3
-
-
-From e2b2b1675f310023862319ea10ffd205a75cc0cb Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 9 Nov 2022 16:17:56 +0100
-Subject: [PATCH 2/2] hostname: Fallback to transient hostname
-
-After pretty hostname, and static hostname, also support transient
-hostname as a last resort before 'BlueZ X.XX'.
-
-This happens on Fedora's Workstation installation as it calls
-"hostnamectl set-hostname" on startup. In Fedora Silverblue, the default
-hostname is set as fedora in /etc/os-release.
-
-In both cases, we should fall back to that transient hostname, as bad as
-it could be.
-
-Note that the transient hostname needs to be monitored through the
-kernel directly, as explained in:
-https://www.freedesktop.org/software/systemd/man/org.freedesktop.hostname1.html
----
- plugins/hostname.c | 57 ++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 55 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/hostname.c b/plugins/hostname.c
-index 14b6450b5..51707f07d 100644
---- a/plugins/hostname.c
-+++ b/plugins/hostname.c
-@@ -16,6 +16,8 @@
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
- 
- #include "lib/bluetooth.h"
- #include "lib/sdp.h"
-@@ -44,8 +46,10 @@
- static uint8_t major_class = MAJOR_CLASS_MISCELLANEOUS;
- static uint8_t minor_class = MINOR_CLASS_UNCATEGORIZED;
- 
--static char *pretty_hostname = NULL;
--static char *static_hostname = NULL;
-+static char *pretty_hostname    = NULL;
-+static char *static_hostname    = NULL;
-+static char *transient_hostname = NULL;
-+static guint hostname_id = 0;
- 
- /*
-  * Fallback to static hostname only if empty pretty hostname was already
-@@ -60,6 +64,10 @@ static const char *get_hostname(void)
- 		if (static_hostname &&
- 				g_str_equal(static_hostname, "") == FALSE)
- 			return static_hostname;
-+
-+		if (transient_hostname &&
-+				g_str_equal(transient_hostname, "") == FALSE)
-+			return transient_hostname;
- 	}
- 
- 	return NULL;
-@@ -181,6 +189,32 @@ static void property_changed(GDBusProxy *proxy, const char *name,
- 	}
- }
- 
-+static void read_transient_hostname(void)
-+{
-+	struct utsname u;
-+
-+	if (uname(&u) != 0) {
-+		g_free(transient_hostname);
-+		transient_hostname = NULL;
-+		DBG("failed to read transient hostname");
-+		return;
-+	}
-+
-+	g_free(transient_hostname);
-+	transient_hostname = g_strdup(u.nodename);
-+
-+	DBG("read transient hostname: '%s'", transient_hostname);
-+}
-+
-+static gboolean hostname_cb(GIOChannel *io, GIOCondition cond,
-+							gpointer user_data)
-+{
-+	DBG("transient hostname changed");
-+	read_transient_hostname();
-+	adapter_foreach(update_class, NULL);
-+	return TRUE;
-+}
-+
- static int hostname_probe(struct btd_adapter *adapter)
- {
- 	DBG("");
-@@ -261,9 +295,11 @@ static GDBusProxy *hostname_proxy = NULL;
- static int hostname_init(void)
- {
- 	DBusConnection *conn = btd_get_dbus_connection();
-+	int fd;
- 	int err;
- 
- 	read_dmi_fallback();
-+	read_transient_hostname();
- 
- 	hostname_client = g_dbus_client_new(conn, "org.freedesktop.hostname1",
- 						"/org/freedesktop/hostname1");
-@@ -289,6 +325,17 @@ static int hostname_init(void)
- 		hostname_client = NULL;
- 	}
- 
-+	fd = open("/proc/sys/kernel/hostname", O_RDONLY);
-+	if (fd < 0) {
-+		error("open(/proc/sys/kernel/hostname): %s (%d)",
-+					strerror(errno), errno);
-+	} else {
-+		GIOChannel *io = g_io_channel_unix_new(fd);
-+
-+		hostname_id = g_io_add_watch(io, G_IO_ERR, hostname_cb, NULL);
-+		g_io_channel_unref(io);
-+	}
-+
- 	return err;
- }
- 
-@@ -306,8 +353,14 @@ static void hostname_exit(void)
- 		hostname_client = NULL;
- 	}
- 
-+	if (hostname_id != 0) {
-+		g_source_remove(hostname_id);
-+		hostname_id = 0;
-+	}
-+
- 	g_free(pretty_hostname);
- 	g_free(static_hostname);
-+	g_free(transient_hostname);
- }
- 
- BLUETOOTH_PLUGIN_DEFINE(hostname, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
--- 
-2.37.3
-