mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-wireless/bluez: Bump to 5.63
Also try a less invasive fix for bug #827706. Skip for now test-hog as it fails (#829091) with all the fixes for previous bug. More kernel config options are needed to run the tests. Also fix building with musl Closes: https://bugs.gentoo.org/829091 Thanks-to: Paolo Pedroni Bug: https://bugs.gentoo.org/827706 Thanks-to: Florian Schmaus Closes: https://bugs.gentoo.org/812797 Thanks-to: Jory A. Pratt Closes: https://bugs.gentoo.org/827825 Thanks-to: Agostino Sarubbo Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
@@ -1 +1,2 @@
|
||||
DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
|
||||
DIST bluez-5.63.tar.xz 2169168 BLAKE2B 5393bb045a3cf05de164417ce7c98e271742ba752a58aa1ac43a758f2ad8608508e24ff59783d97aa6d5aebdc77e66d9aca94a6c8378cd3fd48fd22ce9d3b89d SHA512 1b8ce7b1bd9611873c27a762a60df580edeefe5424e8733a2067b9afb1a47915f9319849bc1eeee148f5b1f33977b7975e05867e8dbdf73d33cd68e6b99ca75b
|
||||
|
||||
302
net-wireless/bluez/bluez-5.63.ebuild
Normal file
302
net-wireless/bluez/bluez-5.63.ebuild
Normal file
@@ -0,0 +1,302 @@
|
||||
# Copyright 1999-2022 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 ~hppa ~mips ~ppc ~ppc64 ~riscv ~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.
|
||||
# btpclient needs mesh, bug #790587
|
||||
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
|
||||
# https://github.com/bluez/bluez/issues/268
|
||||
"${FILESDIR}"/${PN}-udevadm-path-r1.patch
|
||||
|
||||
# https://github.com/bluez/bluez/issues/267
|
||||
"${FILESDIR}"/${PN}-5.63-musl-limits.patch
|
||||
|
||||
# Fedora patches
|
||||
# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
|
||||
"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.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
|
||||
# Instead of reverting, try another fix that seems to work as
|
||||
# reported in upstream bug
|
||||
"${FILESDIR}"/${PN}-5.63-use-queue_push_tail.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
|
||||
~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS"
|
||||
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
|
||||
|
||||
# Skip test failing due to fixes for https://github.com/bluez/bluez/issues/220
|
||||
sed -i -e 's:unit_tests += unit/test-hog::' Makefile.am || die
|
||||
|
||||
# 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
|
||||
}
|
||||
24
net-wireless/bluez/files/bluez-5.63-musl-limits.patch
Normal file
24
net-wireless/bluez/files/bluez-5.63-musl-limits.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Schmaus <flo@geekplace.eu>
|
||||
Date: Fri, 17 Dec 2021 14:05:50 +0100
|
||||
Subject: [PATCH] DRAFT shared/att: Use queue_push_tail for
|
||||
BT_ATT_OP_READ_BLOB_REQ
|
||||
|
||||
As repoorted by Christopher Schramm [1], this is supposed to fix #220.
|
||||
|
||||
1: https://github.com/bluez/bluez/issues/220#issuecomment-996669412
|
||||
|
||||
Suggested-by: Christopher Schramm <git@cschramm.eu>
|
||||
---
|
||||
src/shared/att.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/shared/att.c b/src/shared/att.c
|
||||
index 169f726e4..5ce735a07 100644
|
||||
--- a/src/shared/att.c
|
||||
+++ b/src/shared/att.c
|
||||
@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, uint8_t opcode,
|
||||
|
||||
switch (opcode) {
|
||||
/* Only prepend requests that could be a continuation */
|
||||
- case BT_ATT_OP_READ_BLOB_REQ:
|
||||
case BT_ATT_OP_PREP_WRITE_REQ:
|
||||
case BT_ATT_OP_EXEC_WRITE_REQ:
|
||||
result = queue_push_head(att->req_queue, op);
|
||||
Reference in New Issue
Block a user