From 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 May 2018 15:22:17 +0100 Subject: gentoo resync : 25.05.2018 --- net-wireless/bluez/Manifest | 2 + net-wireless/bluez/bluez-5.49-r1.ebuild | 263 +++++++++++++++++++++ .../bluez/files/bluez-5.49-crash-non-LE.patch | 51 ++++ 3 files changed, 316 insertions(+) create mode 100644 net-wireless/bluez/bluez-5.49-r1.ebuild create mode 100644 net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch (limited to 'net-wireless/bluez') diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 3b619cee7f8d..01484e6504ec 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -4,11 +4,13 @@ AUX 0002-autopair-Don-t-handle-the-iCade.patch 1412 BLAKE2B e90239917c0772155e36 AUX 0004-agent-Assert-possible-infinite-loop.patch 583 BLAKE2B 22cd0d0b4c6c1859631e31bba434f368a1cec07128aa69ecb9003734292aa1349b5dfad87b0ac35e79d089459dd24ecc8cb8f7bd0147c52b2284c2340884ee93 SHA512 f3af46b27180f500c3f978799633b7a01a9d7720eafdb7a9fb108684161616b976b42d135a2358785830c26642ef7c2175d0f1fa3d6df898fe3bd5e77f6a191d AUX bluetooth-init.d-r4 283 BLAKE2B 639679bb0156538e63e5e401a3063f8e72c2096b9ff9558e2e3289bd337dfb11c228010a50e40dd0a84ab2bb6f9cba69eb59b51b018d4983638dba4e3635e20c SHA512 155ec9c0deb82b1fc2218a0d23297ea1390b1ce0bcfffaf4b5ffbf5ee13fe4179b763edfcc6dec48c7a731a852d5307966090f35cc5caf28bbb8bee7dd01714a AUX bluez-5.39-systemd-quote.patch 1298 BLAKE2B c06a96ffee4f40d574765f7f5b58ba3544fe9862bf4d64d45be0dcbfe1446cb8cdca150402e44117f44b973d7041fd66f01088d843d35d0d6538ccf169551923 SHA512 a31a93934b3ad5d55633ab8ac0878f3cd8bda0ca7836a8912b444f88fe8c71183d25a6e3f36d962cc68da6d2776837b4bf660efb17d379c4003a092c313e69ba +AUX bluez-5.49-crash-non-LE.patch 2281 BLAKE2B c9615f8f326980cc9cbcbefa3441a4aaa6a0390915a15de7af5a4b1b1bd533af0dde130d429dfed275df7fad2c24931ded91afb27f8631b77cbcb701423516a7 SHA512 0db340640a85c85d54afd257e4e9067e06073e071ff0215848fa8982ac1707fd0c9d21cbf634c5bfc38869a00598cf781fd91b073a6a933980e777fd1b0c5578 AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad8303ed0dc10831ab9023665436cfa9c47f8ccab7f83ab2b46ca8369ce53c5084ba7bf649c3ea89779882af SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1 AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd00a43d5ee7aca045fb566ab39638664bc37ec54c516aa327c6ba54b046ed18696cabf3228ad0e28588 SHA512 bcbb6a78c4c25ad797dc1d45180382909a052e9be32439eec85772082a01799f45181e8a90be89b952a68b7276f6ac1cef98fc3f4d0a5e5c8075089a29f3ddd1 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf +EBUILD bluez-5.49-r1.ebuild 8106 BLAKE2B 8d0549940b38c9cd147ebe1059d1516db6af41fa5136387432fed269a6f4d9d757587f208711227a408f3a08b04dbe8c7d8ff4e2bfeb610f3c6764ca59a38d61 SHA512 278be668c58e608bba6a6cd222d7c185b7f5aa9385a5fbee026c831ea995fce696f5a07c9c09bc1ce860854e064f7fdc9a1716a5f72a55b23d06bd6a67776d25 EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93 diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild new file mode 100644 index 000000000000..7708108720fd --- /dev/null +++ b/net-wireless/bluez/bluez-5.49-r1.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit autotools multilib python-single-r1 readme.gentoo-r1 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 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +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} ) + user-session? ( systemd ) +" + +CDEPEND=" + >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] + >=sys-apps/dbus-1.6:=[user-session=] + >=sys-apps/hwids-20121202.2 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups:= ) + mesh? ( + dev-libs/json-c:= + sys-libs/readline:0= ) + obex? ( dev-libs/libical:= ) + readline? ( sys-libs/readline:0= ) + systemd? ( sys-apps/systemd ) + udev? ( >=virtual/udev-172 ) +" +TEST_DEPS="${PYTHON_DEPS} + >=dev-python/dbus-python-1[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] +" + +DEPEND="${CDEPEND} + virtual/pkgconfig + test? ( ${TEST_DEPS} ) +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-bluetooth ) + test-programs? ( ${TEST_DEPS} ) +" +DOC_CONTENTS=" + If you want to control your bluetooth devices as a non-root user, + please remember to add you to plugdev group. +" + +PATCHES=( + # Use static group "plugdev" to not force people to become root for + # controlling the devices. + "${FILESDIR}"/${PN}-plugdev.patch + + # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) + # http://www.spinics.net/lists/linux-bluetooth/msg58739.html + "${FILESDIR}"/${PN}-udevadm-path.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 + + # ??? + "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch + + # https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=2c3bba7b38be03834162e34069156f1fd49f0528 + # Fixed in next version + "${FILESDIR}"/${P}-crash-non-LE.patch +) + +pkg_setup() { + enewgroup plugdev + + 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 + ! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch + + 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 + 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 + + # btpclient disabled because we don't have ell library in the tree + econf \ + --localstatedir=/var \ + --disable-android \ + --disable-btpclient \ + --enable-datafiles \ + --enable-experimental \ + --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 alsa midi) \ + $(multilib_native_use_enable cups) \ + $(multilib_native_use_enable deprecated) \ + $(multilib_native_use_enable experimental) \ + $(multilib_native_use_enable mesh) \ + $(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 + # gatttool is only built with readline, bug #530776 + dobin attrib/gatttool + dobin tools/btmgmt + fi + + # Unittests are not that useful once installed, so make them optional + if use test-programs; then + # example-gatt-client is the only one 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 + 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-includeHEADERS \ + 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 + use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service + + find "${D}" -name '*.la' -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 + doins src/main.conf + + newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth + + einstalldocs + use doc && dodoc doc/*.txt + ! use systemd && readme.gentoo_create_doc +} + +pkg_postinst() { + ! use systemd && readme.gentoo_print_elog + + 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." +} diff --git a/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch b/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch new file mode 100644 index 000000000000..b66868e7140d --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch @@ -0,0 +1,51 @@ +From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001 +From: "antoine.belvire@laposte.net" +Date: Tue, 27 Mar 2018 20:30:26 +0200 +Subject: adapter: Don't refresh adv_manager for non-LE devices + +btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change +but as only LE adapters have an adv_manager, this leads to segmentation fault +for non-LE devices: + +0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176 +1 0x0000556fe45fcb02 in settings_changed (settings=, + adapter=0x556fe53f7c70) at src/adapter.c:543 +2 new_settings_callback (index=, length=, + param=, user_data=0x556fe53f7c70) at src/adapter.c:573 +3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0, + status=, opcode=opcode@entry=7, index=index@entry=0, + length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261 +4 0x0000556fe462cd9d in can_read_data (io=, + user_data=0x556fe53f20c0) at src/shared/mgmt.c:353 +5 0x0000556fe46396e3 in watch_callback (channel=, + cond=, user_data=) + at src/shared/io-glib.c:170 +6 0x00007fe351c980e5 in g_main_context_dispatch () + from /usr/lib64/libglib-2.0.so.0 +7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0 +8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0 +9 0x0000556fe45abc75 in main (argc=, argv=) + at src/main.c:770 + +This commit prevents the call to btd_adv_manager_refresh for non-LE devices. +--- + src/adapter.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/adapter.c b/src/adapter.c +index 6b9222b..daccfdc 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) + g_dbus_emit_property_changed(dbus_conn, adapter->path, + ADAPTER_INTERFACE, "Discoverable"); + store_adapter_info(adapter); +- btd_adv_manager_refresh(adapter->adv_manager); ++ if (adapter->supported_settings & MGMT_SETTING_LE) ++ btd_adv_manager_refresh(adapter->adv_manager); + } + + if (changed_mask & MGMT_SETTING_BONDABLE) { +-- +cgit v1.1 + -- cgit v1.2.3