* [gentoo-commits] proj/musl:master commit in: net-wireless/bluez/, net-wireless/bluez/files/
@ 2016-03-14 1:29 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2016-03-14 1:29 UTC (permalink / raw
To: gentoo-commits
commit: fe8bf6f8195c124bc74b3bdee301b594dbf4ff82
Author: layman <layman <AT> localhost>
AuthorDate: Mon Mar 14 01:06:01 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fe8bf6f8
net-wireless/bluez: in tree version 5.37 works
Package-Manager: portage-2.2.26
net-wireless/bluez/Manifest | 14 --
net-wireless/bluez/bluez-5.23-r99.ebuild | 205 ---------------------
...-obexd-without-systemd-in-the-user-sessio.patch | 58 ------
...erial.c-use-posix_openpt-instead-of-getpt.patch | 37 ----
...-GLib-helper-function-to-manipulate-paths.patch | 38 ----
...01-tools-Fix-compilation-errors-with-musl.patch | 189 -------------------
...-Logitech-diNovo-Edge-keyboard-firmware-i.patch | 29 ---
.../0002-autopair-Don-t-handle-the-iCade.patch | 47 -----
.../0004-agent-Assert-possible-infinite-loop.patch | 25 ---
net-wireless/bluez/files/bluetooth-init.d-r3 | 21 ---
.../bluez/files/bluez-5.23-use-posix_openpt.patch | 20 --
net-wireless/bluez/files/bluez-plugdev.patch | 14 --
net-wireless/bluez/files/rfcomm-init.d-r2 | 35 ----
net-wireless/bluez/metadata.xml | 25 ---
14 files changed, 757 deletions(-)
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
deleted file mode 100644
index 7febf2d..0000000
--- a/net-wireless/bluez/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch 1907 SHA256 4c07ccb23953e83d805b8b0c726a08121dc17deb26f7571bca32dfafe7bd2881 SHA512 17a0967ac291be3822e2be73912ab4c1720564bdce0765582e54bc0347d0477d38f82dbf0db9d660f982c35b3c2ea13dd37b22e18223d36745306c4c9d859423 WHIRLPOOL 67a3ab27c5f6bb15894f1fb55c9947fd97c9e64c380fe0f52540887c12f7052d54b34c2cbda3f62bcf27888c2400ddac9b239a138383f74ad28616aebefdae84
-AUX 0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch 1074 SHA256 5384d81e2feaa11268f69036385ae91f2ed5e357df6300c337e88fe5bdf06fef SHA512 620b304749e6f1e725eb9fd19a7e69cc704c5da5f4676a310bb2101eac676dcf47c64a7998403fc3f7929330da5fb5e84ef93c58f7d41aee86deb136c45c1784 WHIRLPOOL cc09186ac50689a3f12580e6c787f91d21dabd9723e0fa7a2ea85ff8a155dd17f58a7f0706d5451d3d269b94884c7baf46f0fa112c5cc15f50c4ade0cd2af6c3
-AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 SHA256 86e3d24527f44c5a225e6d92457be52026481a7ac0d7944700ef4445d8afc8b4 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32 WHIRLPOOL a88e1a061ed3989251a7e350e5a2f44b3d83ca388456652e28408a37e474e6afbd3b48e25b0ebc27b90e515d62987bac05a99087d5fe337ab2ec245c2d4edd3c
-AUX 0001-tools-Fix-compilation-errors-with-musl.patch 4795 SHA256 33adc09786a5f0c07b6e8cc89d869bd27363a53c07b9d13841773540f708e207 SHA512 ce6175a6a52ad8fae11a59a80a82f6a3ebdf3e9b65e8c7a9251c4e41c55a3ea20266912ef7f259d2960acc6702c0f0a761819c24b80c605d1129b2838a3ff725 WHIRLPOOL 81b174ad64e49b2c7947021ba696f61346e1621acb509f94a2e49baee85d696efdc73546f1c2bd9390adfe6567aca673f8d774034f70f2855d2a2727854d9c8e
-AUX 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch 1165 SHA256 1c3cab160520c0f60a8b5b1e479d70a92c3564d951aca34caa8b837cdba3a5cd SHA512 928c0bbd0e2d231385a979c9c2247e6840c66520a0c5e0075f2c075ee73f424cf3b7b2469d834d839e356bf28629b05b2f179446594e090f6b0f7a3ea7822f97 WHIRLPOOL b7ab7f22cc77f0da2030f19dddd1a42a457676e7f3c55bef09cdc42eab5faf497d1ef7568deece347086e8ca6a6d196694dda8ddf5cc9f66c0bfce3c0cc45a6b
-AUX 0002-autopair-Don-t-handle-the-iCade.patch 1412 SHA256 219c595ea7d022abc70221f99861815b248c46f45eef66006e7a77a0c9bd8911 SHA512 7911d0461a2720a083369c03038d6a6c69218756733c72f79eccd2e13821ecdba30649cd38a5e2427e1b79473809610020bd16a6aab55b35ac4136319c5832b3 WHIRLPOOL b9e7f4dbb48bde12259d75a3a4e65d1284415a70047776f52588c795ed7216c634b31b559545425dcd44b41454327ce50bd95289be5bb94132e6ed245c2bfa97
-AUX 0004-agent-Assert-possible-infinite-loop.patch 583 SHA256 7164b3c2e759336f926210b923b917ee5b3098024fd7a46d39cfe0c0e463ddb3 SHA512 f3af46b27180f500c3f978799633b7a01a9d7720eafdb7a9fb108684161616b976b42d135a2358785830c26642ef7c2175d0f1fa3d6df898fe3bd5e77f6a191d WHIRLPOOL 4c6ecb787db4e3922652433940e734de9c1755be9cd73a27cd0e1b62ca470c76962fef666aff1b2932e306772b5879f34bae366619bb173ae1f92a0cfeff5e3f
-AUX bluetooth-init.d-r3 571 SHA256 de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7 SHA512 e5f550a8c0b5c9e8902c920b1bd1ef120698b568fe38220eae2d49099e364ea7b05e3026356e857666a515bb9137c92a774ca1fc70a2b6814b4d03fe29c2ccc2 WHIRLPOOL 84a3655b8b13985759365ac220a27fcc18cdf97373032e2040cf4a5b27a8b1a5df92aa6b45e92442010b338419d82c4f9548af03602c101e9f34d623e4b1b174
-AUX bluez-5.23-use-posix_openpt.patch 594 SHA256 6d8f641577b769629d501aae34bcd9dba82307a93309f94a304a90b2e0b2a64c SHA512 e61fb667d2f67f90df495feba25211a2caf2a09336165859d90b9224caa6b61c256dc4b124375a2d40547f0030e03185abc358e2224638acdecf12d02c6af0e9 WHIRLPOOL a21870b9077d2c041168945fd3d8cfdb2921e20ac42535a46d6cd4a98ea8761272f2fecb7e40029bb330f1e7ec9297256f2b2db442a570bac134350ed0d4602d
-AUX bluez-plugdev.patch 469 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2 SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2 WHIRLPOOL 6364590d80d811e55e2f696ba0b57c0173bac859e69de284bbcc3b511c7ea639d48dd7451e5a4abe8746b8c0986867cb680b291880e6a6ada03004e0c72c2583
-AUX rfcomm-init.d-r2 661 SHA256 e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09 SHA512 ec3968c79bd4b0ac57f4a0fd2f286b3380951af183c68ae9c9b57339d74931d98984b3594c9e10db9f61eb2160e214572a4bae8885cd4ff9192dbbfc357d20a5 WHIRLPOOL c37f516e2485c21d4613b821d53c2f2782ffa50a1cc4263ea8bd44c064088651c05c4880edd397fdc20b0c5f0805bef6a06ec0606748f16cd67dd7e35757fe34
-DIST bluez-5.23.tar.xz 1426660 SHA256 cdabd38d7ac8dd392a77ce7d76d5c120b277e4115040ba5d3ab91c05ab37f2c1 SHA512 5cbb5c34963c5b70badab618018eda5017b44d240c3a47b4bbaf88e41b67617c5a299a21509a917ef3bb91be79032aa10837138283b6510e2829a6be1554ef92 WHIRLPOOL c3049637a97c80301307fa8ce7618763df706223d103e6a79c41eecc68203bcd0f999f8f523048acac6f07884ce4ecbc0ef9e2f80bbdafacbbef289fb9531fc8
-EBUILD bluez-5.23-r99.ebuild 5520 SHA256 b257a7aaad8f43b8997570b42131d9c9086ec8dc9b574eb51829b75118edfb95 SHA512 1fa9bab18bf825dec4dd3cc4df68f5b7d9713f0709e307d11215b14e864a5eb822d8a09f5b30d9aa6298d3fda743ff55ffa2b4cecccfd3e4979a667277a392f8 WHIRLPOOL 1d0cc853a7355a47b06dab2a56aed1ad41f50e2396a6f3f63c9a3c91167fb14e3c782e8eecf5166b712b3625dbdcd2502825d4832d6958914cbd07d277ced323
-MISC metadata.xml 1009 SHA256 2c1e87879382a493a11c72412ae6a4e03cbbc630fad8e409e9c7091ba6c5f982 SHA512 68cad4ca9dcda52180cb5dadd69fa34e6ab38c2474f8e66ca62ef5f02799c4ac4ba25f972fc94c92ff93daa7371a6f1d06705018fe87cdcbe5fe2e8e7be29134 WHIRLPOOL 2b44c74d582c5c8bd0c2c8ca0c82e1af2ce5b0fa43c2e0ef28307d5df95fb1603cf2f95a6d0e31fd04f5fc3c79ba11fc3f557f4fd1c128f2e751e227cb071526
diff --git a/net-wireless/bluez/bluez-5.23-r99.ebuild b/net-wireless/bluez/bluez-5.23-r99.ebuild
deleted file mode 100644
index 467772e..0000000
--- a/net-wireless/bluez/bluez-5.23-r99.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.23.ebuild,v 1.2 2014/09/25 09:11:55 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/glib-2.28:2
- >=sys-apps/dbus-1.6:=
- >=sys-apps/hwids-20121202.2
- cups? ( net-print/cups:= )
- obex? ( dev-libs/libical )
- readline? ( sys-libs/readline:= )
- selinux? ( sec-policy/selinux-bluetooth )
- systemd? ( sys-apps/systemd )
- udev? ( >=virtual/udev-172 )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- >=dev-python/dbus-python-1
- dev-python/pygobject:2
- dev-python/pygobject:3
- )
-"
-
-DOC_CONTENTS="
- If you want to use rfcomm as a normal user, you need to add the user
- to the uucp group.
-"
-
-pkg_setup() {
- enewgroup plugdev
- use test && python-any-r1_pkg_setup
-
- if ! use udev; then
- ewarn
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
- ewarn "and hid2hci will not be available."
- ewarn
- fi
-}
-
-src_prepare() {
- # Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
- epatch "${FILESDIR}"/bluez-plugdev.patch
-
- # Fedora patches
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
- epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg41264.html
- epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
- # ???
- epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
- # Ubuntu workaround for bug #501120
- epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
- # Patches for musl
- epatch "${FILESDIR}"/0001-tools-Fix-compilation-errors-with-musl.patch
- epatch "${FILESDIR}"/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
-
- if use cups; then
- sed -i \
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
- Makefile.{in,tools} || die
- fi
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- # readline is automagic when client is enabled
- # --enable-client always needs readline, bug #504038
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # deps not used for the library
- {DBUS,GLIB}_{CFLAGS,LIBS}=' '
- )
- fi
-
- # Missing flags: experimental (sap, nfc, ...)
- econf \
- --localstatedir=/var \
- --disable-android \
- --enable-datafiles \
- --enable-experimental \
- --enable-optimization \
- $(use_enable debug) \
- --enable-pie \
- --enable-threads \
- --enable-library \
- $(multilib_native_use_enable test) \
- --enable-tools \
- --enable-manpages \
- --enable-monitor \
- $(multilib_native_use_enable cups) \
- $(multilib_native_use_enable obex) \
- $(multilib_native_use_enable readline client) \
- $(multilib_native_use_enable systemd) \
- $(systemd_with_unitdir) \
- $(multilib_native_use_enable udev) \
- $(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -f Makefile -f - libs \
- <<<'libs: $(lib_LTLIBRARIES)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
-
- # Unittests are not that useful once installed
- if use test ; then
- rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
- fi
- else
- emake DESTDIR="${D}" \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-
- keepdir /var/lib/bluetooth
-
- # Upstream don't want people to play with them
- # But we keep installing them due 'historical' reasons
- insinto /etc/bluetooth
- local d
- for d in input network proximity; do
- doins profiles/${d}/${d}.conf
- done
- doins src/main.conf
- doins src/bluetooth.conf
-
-# FIXME:
-# Looks like upstream installs it only for systemd, probably not needed
-# insinto /usr/share/dbus-1/system-services
-# doins src/org.bluez.service
-
- newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
- newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
-
- einstalldocs
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- use udev && udev_reload
-
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
- if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
- elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
- elog "be able to run bluetooth clients as root. If you want to be able to run bluetooth clients as"
- elog "a regular user, you need to add the user to the plugdev group."
- fi
-}
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
deleted file mode 100644
index 1ea3e6f..0000000
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.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/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch b/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
deleted file mode 100644
index 766734a..0000000
--- a/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 57c33317f5c3f6d21a9b3c56f8d1e97179e4c457 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sat, 4 Oct 2014 09:34:05 -0400
-Subject: [PATCH] emulator/serial.c: use posix_openpt() instead of getpt()
-
-getpt(3) is glibc-specific and is not provided on musl. Instead, we
-use use posix_openpt(3) which is equivalent and portable.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- emulator/serial.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/emulator/serial.c b/emulator/serial.c
-index 9583be4..8b49dc6 100644
---- a/emulator/serial.c
-+++ b/emulator/serial.c
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/epoll.h>
- #include <sys/uio.h>
-@@ -160,7 +161,7 @@ static void open_pty(struct serial *serial)
- {
- enum btdev_type uninitialized_var(type);
-
-- serial->fd = getpt();
-+ serial->fd = posix_openpt(O_RDWR | O_NOCTTY);
- if (serial->fd < 0) {
- perror("Failed to get master pseudo terminal");
- return;
---
-2.0.4
-
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 004a389..0000000
--- 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/0001-tools-Fix-compilation-errors-with-musl.patch b/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch
deleted file mode 100644
index 501e75a..0000000
--- a/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 51ec4fd847369bc77e72850fe93d727ae9c656b9 Mon Sep 17 00:00:00 2001
-From: Szymon Janc <szymon.janc@tieto.com>
-Date: Fri, 19 Sep 2014 16:10:07 +0200
-Subject: [PATCH] tools: Fix compilation errors with musl
-
-This fix number of includes for <sys/poll.h> instead of <poll.h>
-
- CC tools/hciattach.o
-In file included from tools/hciattach.c:41:0:
-/usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect
- #include <sys/poll.h> to <poll.h> [-Werror=cpp]
- #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
- ^
----
- tools/amptest.c | 2 +-
- tools/btattach.c | 2 +-
- tools/btsnoop.c | 1 +
- tools/ciptool.c | 2 +-
- tools/cltest.c | 2 +-
- tools/hciattach.c | 2 +-
- tools/hciattach_qualcomm.c | 2 +-
- tools/hciattach_tialt.c | 2 +-
- tools/hcidump.c | 2 +-
- tools/l2ping.c | 2 +-
- tools/l2test.c | 2 +-
- tools/rfcomm.c | 2 +-
- 12 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/tools/amptest.c b/tools/amptest.c
-index 6192f7e..bba0a9a 100644
---- a/tools/amptest.c
-+++ b/tools/amptest.c
-@@ -32,7 +32,7 @@
- #include <alloca.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/btattach.c b/tools/btattach.c
-index 9458fd7..bdbbe16 100644
---- a/tools/btattach.c
-+++ b/tools/btattach.c
-@@ -35,7 +35,7 @@
- #include <getopt.h>
- #include <termios.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
-+#include <poll.h>
-
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/hci.h>
-diff --git a/tools/btsnoop.c b/tools/btsnoop.c
-index 14581f2..71191eb 100644
---- a/tools/btsnoop.c
-+++ b/tools/btsnoop.c
-@@ -35,6 +35,7 @@
- #include <stdbool.h>
- #include <string.h>
- #include <getopt.h>
-+#include <endian.h>
- #include <arpa/inet.h>
- #include <sys/stat.h>
-
-diff --git a/tools/ciptool.c b/tools/ciptool.c
-index 72338dc..3ff9fb1 100644
---- a/tools/ciptool.c
-+++ b/tools/ciptool.c
-@@ -32,7 +32,7 @@
- #include <string.h>
- #include <getopt.h>
- #include <signal.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/cltest.c b/tools/cltest.c
-index 4ddb98a..0231805 100644
---- a/tools/cltest.c
-+++ b/tools/cltest.c
-@@ -32,7 +32,7 @@
- #include <alloca.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/hciattach.c b/tools/hciattach.c
-index 1904ac5..d8ef7e7 100644
---- a/tools/hciattach.c
-+++ b/tools/hciattach.c
-@@ -37,8 +37,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
-
-diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
-index eb72a0f..0e25905 100644
---- a/tools/hciattach_qualcomm.c
-+++ b/tools/hciattach_qualcomm.c
-@@ -36,8 +36,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/uio.h>
-diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
-index 5c7f3a5..a7c1706 100644
---- a/tools/hciattach_tialt.c
-+++ b/tools/hciattach_tialt.c
-@@ -35,8 +35,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/uio.h>
-diff --git a/tools/hcidump.c b/tools/hcidump.c
-index 37a9f00..8839eb0 100644
---- a/tools/hcidump.c
-+++ b/tools/hcidump.c
-@@ -33,7 +33,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <getopt.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-diff --git a/tools/l2ping.c b/tools/l2ping.c
-index 29fb3d0..3dd437e 100644
---- a/tools/l2ping.c
-+++ b/tools/l2ping.c
-@@ -35,7 +35,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/socket.h>
-
- #include <bluetooth/bluetooth.h>
-diff --git a/tools/l2test.c b/tools/l2test.c
-index 67ca70a..71ad109 100644
---- a/tools/l2test.c
-+++ b/tools/l2test.c
-@@ -38,7 +38,7 @@
- #include <syslog.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/rfcomm.c b/tools/rfcomm.c
-index b5bea38..659bbec 100644
---- a/tools/rfcomm.c
-+++ b/tools/rfcomm.c
-@@ -34,7 +34,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <termios.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
---
-2.0.4
-
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..0000000
--- 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/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 68751ae..0000000
--- 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/0004-agent-Assert-possible-infinite-loop.patch b/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
deleted file mode 100644
index 2746e0c..0000000
--- a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 9 Dec 2013 18:04:56 +0100
-Subject: [PATCH 4/5] agent: Assert possible infinite loop
-
----
- src/agent.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/agent.c b/src/agent.c
-index bcba969..b292881 100644
---- a/src/agent.c
-+++ b/src/agent.c
-@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent)
- if (agent->ref > 0)
- return;
-
-+ g_assert (agent->ref == 0);
-+
- if (agent->request) {
- DBusError err;
- agent_pincode_cb pincode_cb;
---
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r3 b/net-wireless/bluez/files/bluetooth-init.d-r3
deleted file mode 100644
index f97fdb2..0000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r3,v 1.2 2014/01/09 13:24:42 joker Exp $
-
-depend() {
- after coldplug
- need dbus localmount hostname
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --background --exec /usr/libexec/bluetooth/bluetoothd
- eend $?
-}
-
-stop() {
- ebegin "Shutting down ${SVCNAME}"
- start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd
- eend $?
-}
diff --git a/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch b/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
deleted file mode 100644
index 3630df6..0000000
--- a/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur bluez-5.23.orig/emulator/serial.c bluez-5.23/emulator/serial.c
---- bluez-5.23.orig/emulator/serial.c 2014-08-06 17:25:36.000000000 +0000
-+++ bluez-5.23/emulator/serial.c 2014-10-04 13:02:38.081336391 +0000
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/epoll.h>
-
-@@ -159,7 +160,7 @@
- {
- enum btdev_type uninitialized_var(type);
-
-- serial->fd = getpt();
-+ serial->fd = posix_openpt(O_RDWR | O_NOCTTY);
- if (serial->fd < 0) {
- perror("Failed to get master pseudo terminal");
- return;
diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch
deleted file mode 100755
index 726838a..0000000
--- 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>
diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2 b/net-wireless/bluez/files/rfcomm-init.d-r2
deleted file mode 100755
index c564055..0000000
--- a/net-wireless/bluez/files/rfcomm-init.d-r2
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d-r2,v 1.1 2014/06/26 17:18:43 alonbl Exp $
-
-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 $?
-}
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
deleted file mode 100644
index b765ca4..0000000
--- a/net-wireless/bluez/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
- <use>
- <flag name="extra-tools">Install tools that upstream doesn't install on
- purpose by default. All this tools shouldn't be used. Then, please
- notify upstream about you still need them to let them know the
- situation.</flag>
- <flag name="test-programs">Install tools for testing of
- various Bluetooth functions</flag>
- <flag name="hid2hci">The HID proxying makes the keyboard / mouse show up
- as regular USB HID devices, but needs them to be
- paired before enabling this, otherwise they won't be
- detected</flag>
- <flag name="obex">Enable OBEX transfer support.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
- <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-wireless/bluez/, net-wireless/bluez/files/
@ 2020-04-23 14:56 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2020-04-23 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 3d3534f975274b16e088ca43d162586bf5a4b41e
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Wed Apr 22 21:18:48 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 14:56:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3d3534f9
net-wireless/bluez: limits.h patch merged upstream in 2d249af, release 5.52
In-tree version builds fine:
>>> Completed installing net-wireless/bluez-5.54 into /var/tmp/portage/net-wireless/bluez-5.54/image
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-wireless/bluez/Manifest | 1 -
net-wireless/bluez/bluez-5.51.ebuild | 290 ---------------------
...xd-without-systemd-in-the-user-session-r1.patch | 58 -----
.../files/0001-Include-limits.h-for-PATH_MAX.patch | 64 -----
...-GLib-helper-function-to-manipulate-paths.patch | 38 ---
net-wireless/bluez/files/69-btattach-bcm.rules | 33 ---
net-wireless/bluez/files/bluetooth-init.d-r4 | 12 -
.../bluez/files/bluez-5.39-systemd-quote.patch | 38 ---
.../bluez/files/bluez-udevadm-path-r1.patch | 10 -
net-wireless/bluez/files/btattach-bcm-service.sh | 30 ---
net-wireless/bluez/files/btattach-bcm_at.service | 6 -
net-wireless/bluez/metadata.xml | 26 --
12 files changed, 606 deletions(-)
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
deleted file mode 100644
index 4f49136..0000000
--- a/net-wireless/bluez/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
diff --git a/net-wireless/bluez/bluez-5.51.ebuild b/net-wireless/bluez/bluez-5.51.ebuild
deleted file mode 100644
index 8550b75..0000000
--- a/net-wireless/bluez/bluez-5.51.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
- extra-tools? ( deprecated readline )
- test? ( ${PYTHON_REQUIRED_USE} )
- test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
- ')
-"
-BDEPEND="
- virtual/pkgconfig
- test? ( ${TEST_DEPS} )
-"
-DEPEND="
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
- >=sys-apps/hwids-20121202.2
- btpclient? ( >=dev-libs/ell-0.14 )
- cups? ( net-print/cups:= )
- mesh? (
- >=dev-libs/ell-0.14
- dev-libs/json-c:=
- sys-libs/readline:0=
- )
- midi? ( media-libs/alsa-lib )
- obex? ( dev-libs/libical:= )
- readline? ( sys-libs/readline:0= )
- systemd? (
- >=sys-apps/dbus-1.6:=[user-session=]
- sys-apps/systemd
- )
- !systemd? ( >=sys-apps/dbus-1.6:= )
- udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-bluetooth )
- test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html
- # https://bugs.gentoo.org/539844
- "${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
- # build: Quote systemd variable names, bug #527432
- # http://article.gmane.org/gmane.linux.bluez.kernel/67230
- "${FILESDIR}"/${PN}-5.39-systemd-quote.patch
-
- # Fedora patches
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
- # Fix missing includes for non glibc systems
- "${FILESDIR}"/0001-Include-limits.h-for-PATH_MAX.patch
-)
-
-pkg_setup() {
- if use test || use test-programs; then
- python-single-r1_pkg_setup
- fi
-
- if ! use udev; then
- ewarn
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
- ewarn "and hid2hci will not be available."
- ewarn
- fi
-}
-
-src_prepare() {
- default
-
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- if ! use user-session || ! use systemd; then
- eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
- fi
-
- if use cups; then
- sed -i \
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
- Makefile.{in,tools} || die
- fi
-
- # Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
- # https://bugs.gentoo.org/618548
- sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- # readline is automagic when client is enabled
- # --enable-client always needs readline, bug #504038
- # --enable-mesh is handled in the same way
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # deps not used for the library
- {DBUS,GLIB}_{CFLAGS,LIBS}=' '
- )
- fi
-
- econf \
- --localstatedir=/var \
- --disable-android \
- --enable-datafiles \
- --enable-optimization \
- $(use_enable debug) \
- --enable-pie \
- --enable-threads \
- --enable-library \
- --enable-tools \
- --enable-manpages \
- --enable-monitor \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- $(multilib_native_use_enable btpclient) \
- $(multilib_native_use_enable btpclient external-ell) \
- $(multilib_native_use_enable cups) \
- $(multilib_native_use_enable deprecated) \
- $(multilib_native_use_enable experimental) \
- $(multilib_native_use_enable mesh) \
- $(multilib_native_use_enable mesh external-ell) \
- $(multilib_native_use_enable midi) \
- $(multilib_native_use_enable obex) \
- $(multilib_native_use_enable readline client) \
- $(multilib_native_use_enable systemd) \
- $(multilib_native_use_enable test-programs test) \
- $(multilib_native_use_enable udev) \
- $(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -f Makefile -f - libs \
- <<<'libs: $(lib_LTLIBRARIES)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
-
- # Only install extra-tools when relevant USE flag is enabled
- if use extra-tools; then
- ewarn "Upstream doesn't support using this tools and their bugs are"
- ewarn "likely to be ignored forever, also that tools can break"
- ewarn "without previous announcement."
- ewarn "Upstream also states all this tools are not really needed,"
- ewarn "then, if you still need to rely on them, you must ask them"
- ewarn "to either install that tool by default or add the needed"
- ewarn "functionality to the existing 'official' tools."
- ewarn "Please report this issues to:"
- ewarn "http://www.bluez.org/development/lists/"
-
- # Upstream doesn't install this, bug #524640
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564
- dobin tools/btmgmt
- # gatttool is only built with readline, bug #530776
- # https://bugzilla.redhat.com/show_bug.cgi?id=1141909
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
- # https://bugs.archlinux.org/task/37686
- dobin attrib/gatttool
- # https://bugzilla.redhat.com/show_bug.cgi?id=1699680
- dobin tools/avinfo
- fi
-
- # Not installed by default after being built, bug #666756
- use btpclient && dobin tools/btpclient
-
- # Unittests are not that useful once installed, so make them optional
- if use test-programs; then
- # Few are needing python3, the others are python2 only. Remove
- # until we see how to pull in python2 and python3 for runtime
- rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
- rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
- rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die
-
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
- dosym "${i}" /usr/bin/bluez-"${i##*/}"
- done
- fi
- else
- emake DESTDIR="${D}" \
- install-pkgincludeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-}
-
-multilib_src_install_all() {
- # We need to ensure obexd can be spawned automatically by systemd
- # when user-session is enabled:
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
- # https://bugs.gentoo.org/show_bug.cgi?id=577842
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
- # https://bugs.archlinux.org/task/45816
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347
- if use user-session && use systemd; then
- ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
- fi
-
- find "${D}" -name '*.la' -type f -delete || die
-
- keepdir /var/lib/bluetooth
-
- # Upstream don't want people to play with them
- # But we keep installing them due to 'historical' reasons
- insinto /etc/bluetooth
- local d
- for d in input network; do
- doins profiles/${d}/${d}.conf
- done
- # Setup auto enable as Fedora does for allowing to use
- # keyboards/mouse as soon as possible
- sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
- doins src/main.conf
-
- newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
-
- einstalldocs
- use doc && dodoc doc/*.txt
- # Install .json files as examples to be used by meshctl
- if use mesh; then
- dodoc tools/mesh/*.json
- local DOC_CONTENTS="Some example .json files were installed into
- /usr/share/doc/${PF} to be used with meshctl. Feel free to
- uncompress and copy them to ~/.config/meshctl to use them."
- readme.gentoo_create_doc
- fi
-
- # From Fedora:
- # Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
- # as found on some Atom based x86 hardware
- udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
- systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
- exeinto /usr/libexec/bluetooth
- doexe "${FILESDIR}/btattach-bcm-service.sh"
-}
-
-pkg_postinst() {
- use udev && udev_reload
- systemd_reenable bluetooth.service
-
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
- use mesh && readme.gentoo_print_elog
-}
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 dec9307..0000000
--- 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/0001-Include-limits.h-for-PATH_MAX.patch b/net-wireless/bluez/files/0001-Include-limits.h-for-PATH_MAX.patch
deleted file mode 100644
index ccbc152..0000000
--- a/net-wireless/bluez/files/0001-Include-limits.h-for-PATH_MAX.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 20128c5c95fbae93c9fd996d5ad2584cf6ad8032 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Mon, 30 Sep 2019 18:35:56 -0500
-Subject: [PATCH] Include limits.h for PATH_MAX
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- mesh/keyring.c | 1 +
- mesh/mesh-config-json.c | 1 +
- mesh/node.c | 1 +
- mesh/util.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/mesh/keyring.c b/mesh/keyring.c
-index 3a7f92f..9fa7d6b 100644
---- a/mesh/keyring.c
-+++ b/mesh/keyring.c
-@@ -24,6 +24,7 @@
- #define _GNU_SOURCE
- #include <fcntl.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <dirent.h>
-diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
-index cafa2fd..74ca495 100644
---- a/mesh/mesh-config-json.c
-+++ b/mesh/mesh-config-json.c
-@@ -27,6 +27,7 @@
- #include <fcntl.h>
- #include <ftw.h>
- #include <libgen.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-diff --git a/mesh/node.c b/mesh/node.c
-index b6824f5..15dcb97 100644
---- a/mesh/node.c
-+++ b/mesh/node.c
-@@ -23,6 +23,7 @@
-
- #define _GNU_SOURCE
- #include <dirent.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <sys/time.h>
-
-diff --git a/mesh/util.c b/mesh/util.c
-index 1455bde..986ba4b 100644
---- a/mesh/util.c
-+++ b/mesh/util.c
-@@ -25,6 +25,7 @@
- #include <dirent.h>
- #include <ftw.h>
- #include <stdio.h>
-+#include <limits.h>
- #include <time.h>
- #include <sys/time.h>
-
---
-2.23.0
-
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 004a389..0000000
--- 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/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules
deleted file mode 100644
index dfe8d1e..0000000
--- 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 e69c668..0000000
--- 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/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
deleted file mode 100644
index d23c877..0000000
--- 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-udevadm-path-r1.patch b/net-wireless/bluez/files/bluez-udevadm-path-r1.patch
deleted file mode 100644
index ac1c94c..0000000
--- a/net-wireless/bluez/files/bluez-udevadm-path-r1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/hid2hci.rules
-+++ b/tools/hid2hci.rules
-@@ -20,6 +20,7 @@
- # Unfortunately the only event seen is the BT device disappearing, so the mouse
- # device needs to be chased down on the USB bus.
- ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
-+ ENV{REMOVE_CMD}="/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" \
- ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
-
- # CSR devices
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 c7f8b17..0000000
--- 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 1e7c7db..0000000
--- 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
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
deleted file mode 100644
index 31e8695..0000000
--- a/net-wireless/bluez/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
-<use>
- <flag name="btpclient">Enable BTP client</flag>
- <flag name="deprecated">Build deprecated plugins</flag>
- <flag name="experimental">Build experimental plugins</flag>
- <flag name="extra-tools">Install tools that upstream doesn't install on
- purpose by default. All this tools shouldn't be used. Then, please
- notify upstream about you still need them to let them know the
- situation.</flag>
- <flag name="mesh">Add support for Bluetooth Mesh control application and advertising bearer.</flag>
- <flag name="midi">Enable MIDI support</flag>
- <flag name="obex">Enable OBEX transfer support</flag>
- <flag name="test-programs">Install tools for testing of various Bluetooth functions</flag>
- <flag name="user-session">Allow compatibility with user-session semantics for session bus under systemd</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
- <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
-</upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-wireless/bluez/, net-wireless/bluez/files/
@ 2021-12-11 2:31 Jory Pratt
0 siblings, 0 replies; 4+ messages in thread
From: Jory Pratt @ 2021-12-11 2:31 UTC (permalink / raw
To: gentoo-commits
commit: d10f7e2d9925e124c854491a7d944607403a4b36
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 11 02:31:08 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 02:31:08 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d10f7e2d
net-wireless/bluez: sync with ::gentoo
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
.../{bluez-5.62-r2.ebuild => bluez-5.62-r3.ebuild} | 9 +
...1-Revert-attrib-Make-use-of-bt_att_resend.patch | 188 +++++++++++++++++++++
.../bluez/files/bluez-5.62-fix-disconnecting.patch | 54 ++++++
3 files changed, 251 insertions(+)
diff --git a/net-wireless/bluez/bluez-5.62-r2.ebuild b/net-wireless/bluez/bluez-5.62-r3.ebuild
similarity index 96%
rename from net-wireless/bluez/bluez-5.62-r2.ebuild
rename to net-wireless/bluez/bluez-5.62-r3.ebuild
index 4b736fbc..aafa275e 100644
--- a/net-wireless/bluez/bluez-5.62-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.62-r3.ebuild
@@ -70,6 +70,15 @@ PATCHES=(
# Required for musl support
"${FILESDIR}"/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
+
+ # This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
+ # causes problems with Logitech MX wireless input devices (see
+ # https://github.com/bluez/bluez/issues/220 )
+ "${FILESDIR}"/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
+
+ # gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
+ # (from 'master')
+ "${FILESDIR}"/${P}-fix-disconnecting.patch
)
pkg_setup() {
diff --git a/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch b/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
new file mode 100644
index 00000000..a8475b0c
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
@@ -0,0 +1,188 @@
+From 697866e210e4e2dce14c95f7a7243e9b9128d01f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Sun, 7 Nov 2021 15:10:53 -0800
+Subject: [PATCH] Revert "attrib: Make use of bt_att_resend"
+
+This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
+causes problems with Logitech MX wireless input devices (see
+https://github.com/bluez/bluez/issues/220 and
+https://bugzilla.redhat.com/show_bug.cgi?id=2019970 ).
+---
+ attrib/gattrib.c | 95 +++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 73 insertions(+), 22 deletions(-)
+
+diff --git a/attrib/gattrib.c b/attrib/gattrib.c
+index 270a37ebe..bc7d4f22c 100644
+--- a/attrib/gattrib.c
++++ b/attrib/gattrib.c
+@@ -41,8 +41,13 @@ struct _GAttrib {
+ struct queue *track_ids;
+ };
+
++struct id_pair {
++ unsigned int org_id;
++ unsigned int pend_id;
++};
++
+ struct attrib_callbacks {
+- unsigned int id;
++ struct id_pair *id;
+ GAttribResultFunc result_func;
+ GAttribNotifyFunc notify_func;
+ GDestroyNotify destroy_func;
+@@ -51,6 +56,32 @@ struct attrib_callbacks {
+ uint16_t notify_handle;
+ };
+
++static bool find_with_org_id(const void *data, const void *user_data)
++{
++ const struct id_pair *p = data;
++ unsigned int orig_id = PTR_TO_UINT(user_data);
++
++ return (p->org_id == orig_id);
++}
++
++static struct id_pair *store_id(GAttrib *attrib, unsigned int org_id,
++ unsigned int pend_id)
++{
++ struct id_pair *t;
++
++ t = new0(struct id_pair, 1);
++ if (!t)
++ return NULL;
++
++ t->org_id = org_id;
++ t->pend_id = pend_id;
++
++ if (queue_push_tail(attrib->track_ids, t))
++ return t;
++
++ return NULL;
++}
++
+ GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu, bool ext_signed)
+ {
+ gint fd;
+@@ -119,6 +150,9 @@ static void attrib_callbacks_destroy(void *data)
+ if (cb->destroy_func)
+ cb->destroy_func(cb->user_data);
+
++ if (queue_remove(cb->parent->track_ids, cb->id))
++ free(cb->id);
++
+ free(data);
+ }
+
+@@ -148,7 +182,7 @@ void g_attrib_unref(GAttrib *attrib)
+ bt_att_unref(attrib->att);
+
+ queue_destroy(attrib->callbacks, attrib_callbacks_destroy);
+- queue_destroy(attrib->track_ids, NULL);
++ queue_destroy(attrib->track_ids, free);
+
+ free(attrib->buf);
+
+@@ -261,6 +295,7 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
+ struct attrib_callbacks *cb = NULL;
+ bt_att_response_func_t response_cb = NULL;
+ bt_att_destroy_func_t destroy_cb = NULL;
++ unsigned int pend_id;
+
+ if (!attrib)
+ return 0;
+@@ -282,47 +317,62 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
+
+ }
+
+- if (id == 0)
+- id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1,
+- len - 1, response_cb, cb, destroy_cb);
+- else {
+- int err;
+-
+- err = bt_att_resend(attrib->att, id, pdu[0], (void *) pdu + 1,
+- len - 1, response_cb, cb, destroy_cb);
+- if (err)
+- return 0;
+- }
++ pend_id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1, len - 1,
++ response_cb, cb, destroy_cb);
+
+- if (!id)
+- return id;
++ /*
++ * We store here pair as it is easier to handle it in response and in
++ * case where user request us to use specific id request - see below.
++ */
++ if (id == 0)
++ id = pend_id;
+
+ /*
+ * If user what us to use given id, lets keep track on that so we give
+ * user a possibility to cancel ongoing request.
+ */
+- if (cb) {
+- cb->id = id;
+- queue_push_tail(attrib->track_ids, UINT_TO_PTR(id));
+- }
++ if (cb)
++ cb->id = store_id(attrib, id, pend_id);
+
+ return id;
+ }
+
+ gboolean g_attrib_cancel(GAttrib *attrib, guint id)
+ {
++ struct id_pair *p;
++
+ if (!attrib)
+ return FALSE;
+
++ /*
++ * If request belongs to gattrib and is not yet done it has to be on
++ * the tracking id queue
++ *
++ * FIXME: It can happen that on the queue there is id_pair with
++ * given id which was provided by the user. In the same time it might
++ * happen that other attrib user got dynamic allocated req_id with same
++ * value as the one provided by the other user.
++ * In such case there are two clients having same request id and in
++ * this point of time we don't know which one calls cancel. For
++ * now we cancel request in which id was specified by the user.
++ */
++ p = queue_remove_if(attrib->track_ids, find_with_org_id,
++ UINT_TO_PTR(id));
++ if (!p)
++ return FALSE;
++
++ id = p->pend_id;
++ free(p);
++
+ return bt_att_cancel(attrib->att, id);
+ }
+
+ static void cancel_request(void *data, void *user_data)
+ {
+- unsigned int id = PTR_TO_UINT(data);
++ struct id_pair *p = data;
+ GAttrib *attrib = user_data;
+
+- bt_att_cancel(attrib->att, id);
++ bt_att_cancel(attrib->att, p->pend_id);
+ }
+
+ gboolean g_attrib_cancel_all(GAttrib *attrib)
+@@ -330,8 +380,9 @@ gboolean g_attrib_cancel_all(GAttrib *attrib)
+ if (!attrib)
+ return FALSE;
+
++ /* Cancel only request which belongs to gattrib */
+ queue_foreach(attrib->track_ids, cancel_request, attrib);
+- queue_remove_all(attrib->track_ids, NULL, NULL, NULL);
++ queue_remove_all(attrib->track_ids, NULL, NULL, free);
+
+ return TRUE;
+ }
+--
+2.33.1
+
diff --git a/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch b/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
new file mode 100644
index 00000000..8eff9dc0
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
@@ -0,0 +1,54 @@
+From ebf2d7935690c00c7fd12768177e2023fc63c9fe Mon Sep 17 00:00:00 2001
+From: Javier de San Pedro <dev.git@javispedro.com>
+Date: Sat, 27 Nov 2021 23:21:36 +0100
+Subject: gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
+
+After the MTU dbus property patches in 5.62 we are seeing bluetoothd
+terminate frequently with "Disconnected from D-Bus. Exiting." msgs.
+Apparently this is because bluetoothd sent an invalid reply to a D-Bus
+Property Get (for GattCharacteristic1's MTU).
+Multiple issues in bluez Github.com project reported similar behavior;
+at least #235 (see Fixes:), #219, and likely #238.
+
+When the Characteristic1 object is still cached/alive, but the
+underlying att connection is not (e.g. someone just called Disconnect),
+the property getter (characteristic_get_mtu) right now returns false.
+However, gdbus seems to ignore the return value and sends the empty reply
+message anyway (rather than a dbus error?), and this seems to cause
+the dbus connection to be terminated (due to the ill-formed reply?).
+bluetoothd then aborts.
+
+This patch makes the property value BT_ATT_DEFAULT_LE_MTU if the
+underlying att object does not exist, rather than returning an invalid
+message. This is consistent with the existing PropertyChanged signal
+behavior (we will emit a PropertyChange only if a larger MTU is
+exchanged), and fixes the issue on my machines.
+An alternative could be to change gdbus behavior, but I'm not sure if we
+are allowed to return an error here anyway without causing problems in
+other dbus libraries/wrappers.
+
+Fixes: aaa0c4996ae9 ("gatt: Add implementation of GattCharacteristic1.MTU")
+Fixes: https://github.com/bluez/bluez/issues/235
+---
+ src/gatt-client.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/gatt-client.c b/src/gatt-client.c
+index de18bea97..6ee984db9 100644
+--- a/src/gatt-client.c
++++ b/src/gatt-client.c
+@@ -883,10 +883,7 @@ static gboolean characteristic_get_mtu(const GDBusPropertyTable *property,
+ uint16_t mtu;
+
+ att = bt_gatt_client_get_att(gatt);
+- if (!att)
+- return FALSE;
+-
+- mtu = bt_att_get_mtu(att);
++ mtu = att ? bt_att_get_mtu(att) : BT_ATT_DEFAULT_LE_MTU;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &mtu);
+
+--
+cgit 1.2.3-1.el7
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-wireless/bluez/, net-wireless/bluez/files/
@ 2022-07-19 13:04 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2022-07-19 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 26ec9898798eeb6b592eb57ea115552bbf7f4c3a
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 13:04:16 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 13:04:16 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=26ec9898
net-wireless/bluez: in tree version 5.64 works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-wireless/bluez/Manifest | 1 -
net-wireless/bluez/bluez-5.62-r3.ebuild | 297 ---------------------
...xd-without-systemd-in-the-user-session-r2.patch | 58 ----
...1-Revert-attrib-Make-use-of-bt_att_resend.patch | 188 -------------
...de-limits.h-for-PATH_MAX-for-musl-support.patch | 24 --
...-GLib-helper-function-to-manipulate-paths.patch | 38 ---
net-wireless/bluez/files/bluetooth-conf.d | 1 -
net-wireless/bluez/files/bluetooth-init.d-r5 | 13 -
.../bluez/files/bluez-5.62-fix-disconnecting.patch | 54 ----
.../bluez/files/bluez-udevadm-path-r1.patch | 10 -
net-wireless/bluez/metadata.xml | 25 --
11 files changed, 709 deletions(-)
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
deleted file mode 100644
index ff487814..00000000
--- a/net-wireless/bluez/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
diff --git a/net-wireless/bluez/bluez-5.62-r3.ebuild b/net-wireless/bluez/bluez-5.62-r3.ebuild
deleted file mode 100644
index aafa275e..00000000
--- a/net-wireless/bluez/bluez-5.62-r3.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
- extra-tools? ( deprecated readline )
- test? ( ${PYTHON_REQUIRED_USE} )
- test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/dbus-python-1[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
-"
-BDEPEND="
- dev-python/docutils
- virtual/pkgconfig
- test? ( ${TEST_DEPS} )
-"
-DEPEND="
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
- btpclient? ( >=dev-libs/ell-0.39 )
- cups? ( net-print/cups:= )
- mesh? (
- >=dev-libs/ell-0.39
- >=dev-libs/json-c-0.13:=
- sys-libs/readline:0=
- )
- midi? ( media-libs/alsa-lib )
- obex? ( dev-libs/libical:= )
- readline? ( sys-libs/readline:0= )
- systemd? ( sys-apps/systemd )
- >=sys-apps/dbus-1.6:=
- udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-bluetooth )
- test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html
- # https://bugs.gentoo.org/539844
- "${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
- # Fedora patches
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
- # Required for musl support
- "${FILESDIR}"/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
-
- # This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
- # causes problems with Logitech MX wireless input devices (see
- # https://github.com/bluez/bluez/issues/220 )
- "${FILESDIR}"/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
-
- # gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
- # (from 'master')
- "${FILESDIR}"/${P}-fix-disconnecting.patch
-)
-
-pkg_setup() {
- # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
- # to prevent bugs like:
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621
- CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
- ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621
- # https://bugzilla.kernel.org/show_bug.cgi?id=206815
- if use mesh || use test; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
- ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
- fi
- linux-info_pkg_setup
-
- if use test || use test-programs; then
- python-single-r1_pkg_setup
- fi
-
- if ! use udev; then
- ewarn
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
- ewarn "and hid2hci will not be available."
- ewarn
- fi
-}
-
-src_prepare() {
- default
-
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- if ! use systemd; then
- eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
- fi
-
- eautoreconf
-
- if use cups; then
- # Only not .am to not need to run eautoreconf only because of this
- sed -i \
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
- Makefile.{in,tools} || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- # readline is automagic when client is enabled
- # --enable-client always needs readline, bug #504038
- # --enable-mesh is handled in the same way
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # deps not used for the library
- {DBUS,GLIB}_{CFLAGS,LIBS}=' '
- )
- fi
-
- econf \
- --localstatedir=/var \
- --disable-android \
- --enable-datafiles \
- --enable-optimization \
- $(use_enable debug) \
- --enable-pie \
- --enable-threads \
- --enable-library \
- --enable-tools \
- --enable-manpages \
- --enable-monitor \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- $(multilib_native_use_enable btpclient) \
- $(multilib_native_use_enable btpclient external-ell) \
- $(multilib_native_use_enable cups) \
- $(multilib_native_use_enable deprecated) \
- $(multilib_native_use_enable experimental) \
- $(multilib_native_use_enable mesh) \
- $(multilib_native_use_enable mesh external-ell) \
- $(multilib_native_use_enable midi) \
- $(multilib_native_use_enable obex) \
- $(multilib_native_use_enable readline client) \
- $(multilib_native_use_enable systemd) \
- $(multilib_native_use_enable test-programs test) \
- $(multilib_native_use_enable udev) \
- $(multilib_native_use_enable udev hid2hci) \
- $(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -f Makefile -f - libs \
- <<<'libs: $(lib_LTLIBRARIES)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
-
- # Only install extra-tools when relevant USE flag is enabled
- if use extra-tools; then
- ewarn "Upstream doesn't support using this tools and their bugs are"
- ewarn "likely to be ignored forever, also they can break without"
- ewarn "previous announcement."
- ewarn "Upstream also states all this tools are not really needed,"
- ewarn "then, if you still need to rely on them, you must ask them"
- ewarn "to either install that tool by default or add the needed"
- ewarn "functionality to the existing 'official' tools."
- ewarn "Please report this issues to:"
- ewarn "http://www.bluez.org/development/lists/"
-
- # Upstream doesn't install this, bug #524640
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564
- dobin tools/btmgmt
- # gatttool is only built with readline, bug #530776
- # https://bugzilla.redhat.com/show_bug.cgi?id=1141909
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
- # https://bugs.archlinux.org/task/37686
- dobin attrib/gatttool
- # https://bugzilla.redhat.com/show_bug.cgi?id=1699680
- dobin tools/avinfo
- fi
-
- # Not installed by default after being built, bug #666756
- use btpclient && dobin tools/btpclient
-
- # Unittests are not that useful once installed, so make them optional
- if use test-programs; then
- # Drop python2 only test tools
- # https://bugzilla.kernel.org/show_bug.cgi?id=206819
- rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
- # https://bugzilla.kernel.org/show_bug.cgi?id=206821
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
- # https://bugzilla.kernel.org/show_bug.cgi?id=206823
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die
-
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
- dosym "${i}" /usr/bin/bluez-"${i##*/}"
- done
- fi
- else
- emake DESTDIR="${D}" \
- install-pkgincludeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-}
-
-multilib_src_install_all() {
- # We need to ensure obexd can be spawned automatically by systemd
- # when user-session is enabled:
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
- # https://bugs.gentoo.org/show_bug.cgi?id=577842
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
- # https://bugs.archlinux.org/task/45816
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347
- if use systemd; then
- dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service
- fi
-
- find "${D}" -name '*.la' -type f -delete || die
-
- keepdir /var/lib/bluetooth
-
- # Upstream don't want people to play with them
- # But we keep installing them due to 'historical' reasons
- insinto /etc/bluetooth
- local d
- for d in input network; do
- doins profiles/${d}/${d}.conf
- done
- # Setup auto enable as Fedora does for allowing to use
- # keyboards/mouse as soon as possible
- sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
- doins src/main.conf
-
- newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
- newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
- einstalldocs
- use doc && dodoc doc/*.txt
- # Install .json files as examples to be used by meshctl
- if use mesh; then
- dodoc tools/mesh-gatt/*.json
- local DOC_CONTENTS="Some example .json files were installed into
- /usr/share/doc/${PF} to be used with meshctl. Feel free to
- uncompress and copy them to ~/.config/meshctl to use them."
- readme.gentoo_create_doc
- fi
-}
-
-pkg_postinst() {
- use udev && udev_reload
- systemd_reenable bluetooth.service
-
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
- use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
deleted file mode 100644
index dcebaa00..00000000
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.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=@pkglibexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
---
-1.8.3.1
-
diff --git a/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch b/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
deleted file mode 100644
index a8475b0c..00000000
--- a/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 697866e210e4e2dce14c95f7a7243e9b9128d01f Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Sun, 7 Nov 2021 15:10:53 -0800
-Subject: [PATCH] Revert "attrib: Make use of bt_att_resend"
-
-This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
-causes problems with Logitech MX wireless input devices (see
-https://github.com/bluez/bluez/issues/220 and
-https://bugzilla.redhat.com/show_bug.cgi?id=2019970 ).
----
- attrib/gattrib.c | 95 +++++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 73 insertions(+), 22 deletions(-)
-
-diff --git a/attrib/gattrib.c b/attrib/gattrib.c
-index 270a37ebe..bc7d4f22c 100644
---- a/attrib/gattrib.c
-+++ b/attrib/gattrib.c
-@@ -41,8 +41,13 @@ struct _GAttrib {
- struct queue *track_ids;
- };
-
-+struct id_pair {
-+ unsigned int org_id;
-+ unsigned int pend_id;
-+};
-+
- struct attrib_callbacks {
-- unsigned int id;
-+ struct id_pair *id;
- GAttribResultFunc result_func;
- GAttribNotifyFunc notify_func;
- GDestroyNotify destroy_func;
-@@ -51,6 +56,32 @@ struct attrib_callbacks {
- uint16_t notify_handle;
- };
-
-+static bool find_with_org_id(const void *data, const void *user_data)
-+{
-+ const struct id_pair *p = data;
-+ unsigned int orig_id = PTR_TO_UINT(user_data);
-+
-+ return (p->org_id == orig_id);
-+}
-+
-+static struct id_pair *store_id(GAttrib *attrib, unsigned int org_id,
-+ unsigned int pend_id)
-+{
-+ struct id_pair *t;
-+
-+ t = new0(struct id_pair, 1);
-+ if (!t)
-+ return NULL;
-+
-+ t->org_id = org_id;
-+ t->pend_id = pend_id;
-+
-+ if (queue_push_tail(attrib->track_ids, t))
-+ return t;
-+
-+ return NULL;
-+}
-+
- GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu, bool ext_signed)
- {
- gint fd;
-@@ -119,6 +150,9 @@ static void attrib_callbacks_destroy(void *data)
- if (cb->destroy_func)
- cb->destroy_func(cb->user_data);
-
-+ if (queue_remove(cb->parent->track_ids, cb->id))
-+ free(cb->id);
-+
- free(data);
- }
-
-@@ -148,7 +182,7 @@ void g_attrib_unref(GAttrib *attrib)
- bt_att_unref(attrib->att);
-
- queue_destroy(attrib->callbacks, attrib_callbacks_destroy);
-- queue_destroy(attrib->track_ids, NULL);
-+ queue_destroy(attrib->track_ids, free);
-
- free(attrib->buf);
-
-@@ -261,6 +295,7 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
- struct attrib_callbacks *cb = NULL;
- bt_att_response_func_t response_cb = NULL;
- bt_att_destroy_func_t destroy_cb = NULL;
-+ unsigned int pend_id;
-
- if (!attrib)
- return 0;
-@@ -282,47 +317,62 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
-
- }
-
-- if (id == 0)
-- id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1,
-- len - 1, response_cb, cb, destroy_cb);
-- else {
-- int err;
--
-- err = bt_att_resend(attrib->att, id, pdu[0], (void *) pdu + 1,
-- len - 1, response_cb, cb, destroy_cb);
-- if (err)
-- return 0;
-- }
-+ pend_id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1, len - 1,
-+ response_cb, cb, destroy_cb);
-
-- if (!id)
-- return id;
-+ /*
-+ * We store here pair as it is easier to handle it in response and in
-+ * case where user request us to use specific id request - see below.
-+ */
-+ if (id == 0)
-+ id = pend_id;
-
- /*
- * If user what us to use given id, lets keep track on that so we give
- * user a possibility to cancel ongoing request.
- */
-- if (cb) {
-- cb->id = id;
-- queue_push_tail(attrib->track_ids, UINT_TO_PTR(id));
-- }
-+ if (cb)
-+ cb->id = store_id(attrib, id, pend_id);
-
- return id;
- }
-
- gboolean g_attrib_cancel(GAttrib *attrib, guint id)
- {
-+ struct id_pair *p;
-+
- if (!attrib)
- return FALSE;
-
-+ /*
-+ * If request belongs to gattrib and is not yet done it has to be on
-+ * the tracking id queue
-+ *
-+ * FIXME: It can happen that on the queue there is id_pair with
-+ * given id which was provided by the user. In the same time it might
-+ * happen that other attrib user got dynamic allocated req_id with same
-+ * value as the one provided by the other user.
-+ * In such case there are two clients having same request id and in
-+ * this point of time we don't know which one calls cancel. For
-+ * now we cancel request in which id was specified by the user.
-+ */
-+ p = queue_remove_if(attrib->track_ids, find_with_org_id,
-+ UINT_TO_PTR(id));
-+ if (!p)
-+ return FALSE;
-+
-+ id = p->pend_id;
-+ free(p);
-+
- return bt_att_cancel(attrib->att, id);
- }
-
- static void cancel_request(void *data, void *user_data)
- {
-- unsigned int id = PTR_TO_UINT(data);
-+ struct id_pair *p = data;
- GAttrib *attrib = user_data;
-
-- bt_att_cancel(attrib->att, id);
-+ bt_att_cancel(attrib->att, p->pend_id);
- }
-
- gboolean g_attrib_cancel_all(GAttrib *attrib)
-@@ -330,8 +380,9 @@ gboolean g_attrib_cancel_all(GAttrib *attrib)
- if (!attrib)
- return FALSE;
-
-+ /* Cancel only request which belongs to gattrib */
- queue_foreach(attrib->track_ids, cancel_request, attrib);
-- queue_remove_all(attrib->track_ids, NULL, NULL, NULL);
-+ queue_remove_all(attrib->track_ids, NULL, NULL, free);
-
- return TRUE;
- }
---
-2.33.1
-
diff --git a/net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch b/net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
deleted file mode 100644
index ebdffc32..00000000
--- a/net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.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
-
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 004a3895..00000000
--- 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/bluetooth-conf.d b/net-wireless/bluez/files/bluetooth-conf.d
deleted file mode 100644
index d5b5005c..00000000
--- a/net-wireless/bluez/files/bluetooth-conf.d
+++ /dev/null
@@ -1 +0,0 @@
-#BLUETOOTH_OPTS="-E"
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r5 b/net-wireless/bluez/files/bluetooth-init.d-r5
deleted file mode 100644
index 4d60234e..00000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/bluetoothd.pid"
-command="/usr/libexec/bluetooth/bluetoothd"
-command_args="${BLUETOOTH_OPTS}"
-command_background=1
-
-depend() {
- after coldplug
- need dbus localmount hostname
-}
diff --git a/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch b/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
deleted file mode 100644
index 8eff9dc0..00000000
--- a/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ebf2d7935690c00c7fd12768177e2023fc63c9fe Mon Sep 17 00:00:00 2001
-From: Javier de San Pedro <dev.git@javispedro.com>
-Date: Sat, 27 Nov 2021 23:21:36 +0100
-Subject: gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
-
-After the MTU dbus property patches in 5.62 we are seeing bluetoothd
-terminate frequently with "Disconnected from D-Bus. Exiting." msgs.
-Apparently this is because bluetoothd sent an invalid reply to a D-Bus
-Property Get (for GattCharacteristic1's MTU).
-Multiple issues in bluez Github.com project reported similar behavior;
-at least #235 (see Fixes:), #219, and likely #238.
-
-When the Characteristic1 object is still cached/alive, but the
-underlying att connection is not (e.g. someone just called Disconnect),
-the property getter (characteristic_get_mtu) right now returns false.
-However, gdbus seems to ignore the return value and sends the empty reply
-message anyway (rather than a dbus error?), and this seems to cause
-the dbus connection to be terminated (due to the ill-formed reply?).
-bluetoothd then aborts.
-
-This patch makes the property value BT_ATT_DEFAULT_LE_MTU if the
-underlying att object does not exist, rather than returning an invalid
-message. This is consistent with the existing PropertyChanged signal
-behavior (we will emit a PropertyChange only if a larger MTU is
-exchanged), and fixes the issue on my machines.
-An alternative could be to change gdbus behavior, but I'm not sure if we
-are allowed to return an error here anyway without causing problems in
-other dbus libraries/wrappers.
-
-Fixes: aaa0c4996ae9 ("gatt: Add implementation of GattCharacteristic1.MTU")
-Fixes: https://github.com/bluez/bluez/issues/235
----
- src/gatt-client.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/gatt-client.c b/src/gatt-client.c
-index de18bea97..6ee984db9 100644
---- a/src/gatt-client.c
-+++ b/src/gatt-client.c
-@@ -883,10 +883,7 @@ static gboolean characteristic_get_mtu(const GDBusPropertyTable *property,
- uint16_t mtu;
-
- att = bt_gatt_client_get_att(gatt);
-- if (!att)
-- return FALSE;
--
-- mtu = bt_att_get_mtu(att);
-+ mtu = att ? bt_att_get_mtu(att) : BT_ATT_DEFAULT_LE_MTU;
-
- dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &mtu);
-
---
-cgit 1.2.3-1.el7
-
diff --git a/net-wireless/bluez/files/bluez-udevadm-path-r1.patch b/net-wireless/bluez/files/bluez-udevadm-path-r1.patch
deleted file mode 100644
index ac1c94cc..00000000
--- a/net-wireless/bluez/files/bluez-udevadm-path-r1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/hid2hci.rules
-+++ b/tools/hid2hci.rules
-@@ -20,6 +20,7 @@
- # Unfortunately the only event seen is the BT device disappearing, so the mouse
- # device needs to be chased down on the USB bus.
- ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
-+ ENV{REMOVE_CMD}="/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" \
- ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
-
- # CSR devices
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
deleted file mode 100644
index 410dfc0f..00000000
--- a/net-wireless/bluez/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
-<use>
- <flag name="btpclient">Enable BTP client</flag>
- <flag name="deprecated">Build deprecated plugins</flag>
- <flag name="experimental">Build experimental plugins</flag>
- <flag name="extra-tools">Install tools that upstream doesn't install on
- purpose by default. All this tools shouldn't be used. Then, please
- notify upstream about you still need them to let them know the
- situation.</flag>
- <flag name="mesh">Add support for Bluetooth Mesh control application and advertising bearer.</flag>
- <flag name="midi">Enable MIDI support</flag>
- <flag name="obex">Enable OBEX transfer support</flag>
- <flag name="test-programs">Install tools for testing of various Bluetooth functions</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
- <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
-</upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-19 13:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-23 14:56 [gentoo-commits] proj/musl:master commit in: net-wireless/bluez/, net-wireless/bluez/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2022-07-19 13:04 Anthony G. Basile
2021-12-11 2:31 Jory Pratt
2016-03-14 1:29 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox