net-wireless/bluez: Drop old

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
2020-03-11 16:01:29 +01:00
parent 4230d68e33
commit f9fda6486b
4 changed files with 0 additions and 461 deletions
-1
View File
@@ -1,2 +1 @@
DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
DIST bluez-5.52.tar.xz 1957504 BLAKE2B 670cdfb44eca1b184c0bd678bab34116f9172394b86fb69fa454f7bdcc1ae82c466a806879ddef96dddd6ae6cd31466b48f9e87113d43144659ae0c057b9def8 SHA512 9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84
-292
View File
@@ -1,292 +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="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 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
# Include limits.h for PATH_MAX
# https://marc.info/?l=linux-bluetooth&m=157156119320950&w=2
# https://bugs.gentoo.org/695940
"${FILESDIR}"/${PN}-5.51-include-limits-h.patch
# audio: Fix cancelling disconnect timeout (from 'master')
# https://marc.info/?l=linux-bluetooth&m=157047663920714&w=2
"${FILESDIR}"/${P}-disconnect-timeout.patch
# Fedora patches
# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.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-r2.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
}
@@ -1,104 +0,0 @@
From 52faac4648500dd45c06b6aa41f1be426c43a125 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Fri, 11 Oct 2019 15:40:04 +0300
Subject: audio: Fix cancelling disconnect timeout
If AVDTP session has been connected but no stream has been setup calls
to service->connect would return -EBUSY to avoid stream setup collision
but it also takes a reference to the session cancelling the disconnect
timeout and disabling the stream_setup logic that would attempt to
estabilish a stream.
---
profiles/audio/sink.c | 25 ++++++++++++-------------
profiles/audio/source.c | 25 ++++++++++++-------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
index 7cac21034..966440534 100644
--- a/profiles/audio/sink.c
+++ b/profiles/audio/sink.c
@@ -256,11 +256,18 @@ gboolean sink_setup_stream(struct btd_service *service, struct avdtp *session)
if (sink->connect_id > 0 || sink->disconnect_id > 0)
return FALSE;
- if (session && !sink->session)
- sink->session = avdtp_ref(session);
-
- if (!sink->session)
- return FALSE;
+ if (!sink->session) {
+ if (session)
+ sink->session = avdtp_ref(session);
+ else
+ sink->session = a2dp_avdtp_get(
+ btd_service_get_device(service));
+
+ if (!sink->session) {
+ DBG("Unable to get a session");
+ return FALSE;
+ }
+ }
sink->connect_id = a2dp_discover(sink->session, discovery_complete,
sink);
@@ -274,14 +281,6 @@ int sink_connect(struct btd_service *service)
{
struct sink *sink = btd_service_get_user_data(service);
- if (!sink->session)
- sink->session = a2dp_avdtp_get(btd_service_get_device(service));
-
- if (!sink->session) {
- DBG("Unable to get a session");
- return -EIO;
- }
-
if (sink->connect_id > 0 || sink->disconnect_id > 0)
return -EBUSY;
diff --git a/profiles/audio/source.c b/profiles/audio/source.c
index 4081e1970..0ac20fe40 100644
--- a/profiles/audio/source.c
+++ b/profiles/audio/source.c
@@ -257,11 +257,18 @@ gboolean source_setup_stream(struct btd_service *service,
if (source->connect_id > 0 || source->disconnect_id > 0)
return FALSE;
- if (session && !source->session)
- source->session = avdtp_ref(session);
-
- if (!source->session)
- return FALSE;
+ if (!source->session) {
+ if (session)
+ source->session = avdtp_ref(session);
+ else
+ source->session = a2dp_avdtp_get(
+ btd_service_get_device(service));
+
+ if (!source->session) {
+ DBG("Unable to get a session");
+ return FALSE;
+ }
+ }
source->connect_id = a2dp_discover(source->session, discovery_complete,
source);
@@ -275,14 +282,6 @@ int source_connect(struct btd_service *service)
{
struct source *source = btd_service_get_user_data(service);
- if (!source->session)
- source->session = a2dp_avdtp_get(btd_service_get_device(service));
-
- if (!source->session) {
- DBG("Unable to get a session");
- return -EIO;
- }
-
if (source->connect_id > 0 || source->disconnect_id > 0)
return -EBUSY;
--
cgit 1.2-0.3.lf.el7
@@ -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