[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 417b23a120e91255efb3c5342bef6bdf1f370fba Author: Pacho Ramos gentoo org> AuthorDate: Sun Apr 7 16:06:12 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Apr 7 16:06:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417b23a1 net-wireless/bluez: Fix obex dbus file installation on non-systemd systems Thanks-to: Andreas Fink Closes: https://bugs.gentoo.org/928417 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.73-r1.ebuild| 278 + ...xd-without-systemd-in-the-user-session-r3.patch | 20 ++ 2 files changed, 298 insertions(+) diff --git a/net-wireless/bluez/bluez-5.73-r1.ebuild b/net-wireless/bluez/bluez-5.73-r1.ebuild new file mode 100644 index ..d67e578fb3ef --- /dev/null +++ b/net-wireless/bluez/bluez-5.73-r1.ebuild @@ -0,0 +1,278 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez; +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 ~loong ~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=" + btpclient? ( mesh ) + 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-196 ) +" +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 +) + +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 + ~UHID ~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 + + # https://github.com/bluez/bluez/issues/773 + eapply "${FILESDIR}"/${P}-configure-cups.patch + + # https://github.com/bluez/bluez/issues/806 + eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch + + eautoreconf + + multilib_copy_sources +} + +multilib_src_configure() { + # unit/test-vcp test fails with LTO (bug #925745) + filter-lto + + local
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: b9883b6871c36f7b6b2f717aec8d00d8ea71549c Author: Pacho Ramos gentoo org> AuthorDate: Mon Mar 25 18:44:48 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Mon Mar 25 18:45:00 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9883b68 net-wireless/bluez: add 5.73 Thanks-to: Sam James Thanks-to: Lars Wendler Closes: https://bugs.gentoo.org/927791 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest| 1 + net-wireless/bluez/bluez-5.73.ebuild | 271 + .../bluez/files/bluez-5.73-configure-cups.patch| 35 +++ 3 files changed, 307 insertions(+) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 016cfdbb5deb..4f894bc5d6dd 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1 +1,2 @@ DIST bluez-5.72.tar.xz 2390792 BLAKE2B b5d1bc290c9bad5aa32de16433c34d0ac5aed7164077ef941a0bf90eddc5e22a6cf19f972bcae33061b41e3c344f7abeb65a11b6013c13fd53059ac93d83240a SHA512 1c6560f60ac0654d7c25ed8ab2f0f3a3a9ca8688ee28e1c476ffc7ae38737e739d27bbb88789c86b03fc600a8a68496d90a7b395ec393dd2bbf69be62357991a +DIST bluez-5.73.tar.xz 2408088 BLAKE2B 69c5b8c23039108403631da86c29d62869f2311bb34eeb471779fae094bbf8738193389fb8792b779b10eaeca5b02723c86f2b98c435bbd2c23a3d317df76070 SHA512 20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8 diff --git a/net-wireless/bluez/bluez-5.73.ebuild b/net-wireless/bluez/bluez-5.73.ebuild new file mode 100644 index ..f71af719302f --- /dev/null +++ b/net-wireless/bluez/bluez-5.73.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez; +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 ~loong ~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=" + btpclient? ( mesh ) + 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-196 ) +" +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 +) + +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 + ~UHID ~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 +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: b9ff9d632b84c905da6334a0dcf26a5c5180c043 Author: Pacho Ramos gentoo org> AuthorDate: Thu Mar 7 14:28:26 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Thu Mar 7 14:28:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ff9d63 net-wireless/bluez: drop 5.70-r1, 5.71-r1 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest| 2 - net-wireless/bluez/bluez-5.70-r1.ebuild| 288 - net-wireless/bluez/bluez-5.71-r1.ebuild| 288 - .../bluez/files/bluez-5.70-CVE-2023-45866.patch| 43 --- .../bluez/files/bluez-5.71-link-old-kernels.patch | 163 5 files changed, 784 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index ad631202f4f3..016cfdbb5deb 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,3 +1 @@ -DIST bluez-5.70.tar.xz 2339844 BLAKE2B 1ba2ddd3bfc6562a07f4e8376e0d537b555f0d36a221f051c4c10dd912c23e73aa2b0d8aa125e0fd911908e4cfa0036429e17250a26b3298bb21f65e4cc5255c SHA512 3a5f8caf7730dcdbbe0bb92154b41651a9d6619038447bf4c25e5e3e5316effcd7242a7a0456d731ce21d55b8daea5212a359acc5e5fc460499b9356b7d364cf -DIST bluez-5.71.tar.xz 2381208 BLAKE2B 73e5f08771f821c90a70c553c600c48c4f1adb85aa9cb1a1eaae61a33b2dda73b7825fe769b3ea1ddedc39ad3fb71d84b336408f5ce6963f0373e9f7dcce SHA512 648394bbe470405aa0e2d3914474e95c122f567deaaac20a5dd74bac29fa430dfb64cdb7bdb4fb7510e62fa73e96112a97197fc212b421bf480b8d1bb24cfb5d DIST bluez-5.72.tar.xz 2390792 BLAKE2B b5d1bc290c9bad5aa32de16433c34d0ac5aed7164077ef941a0bf90eddc5e22a6cf19f972bcae33061b41e3c344f7abeb65a11b6013c13fd53059ac93d83240a SHA512 1c6560f60ac0654d7c25ed8ab2f0f3a3a9ca8688ee28e1c476ffc7ae38737e739d27bbb88789c86b03fc600a8a68496d90a7b395ec393dd2bbf69be62357991a diff --git a/net-wireless/bluez/bluez-5.70-r1.ebuild b/net-wireless/bluez/bluez-5.70-r1.ebuild deleted file mode 100644 index 2595b6e1428f.. --- a/net-wireless/bluez/bluez-5.70-r1.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez; -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 ~loong ~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=" - btpclient? ( mesh ) - 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 - - # Fedora patches - # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-had...@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f - "${FILESDIR}"/${PN}-5.66-power-state-adapter-property.patch - - # Backport CVE-2023-45866 fix (bug #919383) - "${FILESDIR}"/${PN}-5.70-CVE-2023-45866.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
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 7eea4a6e371f176706880da4b1e0ef04fb5c3f7c Author: Pacho Ramos gentoo org> AuthorDate: Sat Dec 16 09:14:54 2023 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Dec 16 09:15:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eea4a6e net-wireless/bluez: drop 5.68, 5.69, 5.70 Bug: https://bugs.gentoo.org/919383 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest| 2 - net-wireless/bluez/bluez-5.68.ebuild | 294 - net-wireless/bluez/bluez-5.69.ebuild | 285 net-wireless/bluez/bluez-5.70.ebuild | 285 .../bluez/files/bluez-5.68-bap-dettach-io.patch| 101 --- .../bluez/files/bluez-5.68-bap-ebusy-fix.patch | 206 --- .../bluez/files/bluez-5.68-bap-nonzero.patch | 27 -- .../bluez/files/bluez-5.68-bap-resume.patch| 187 - .../bluez/files/bluez-5.68-clang-midi.patch| 83 -- .../files/bluez-5.68-heap-use-after-free.patch | 41 --- .../bluez/files/bluez-5.68-monitor-decoding.patch | 45 11 files changed, 1556 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 081b8f9cd9b4..b316ef9b7427 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,4 +1,2 @@ -DIST bluez-5.68.tar.xz 2319788 BLAKE2B 3beca78fadef4d66df6f237b7460f6ac4bf001d80c856b599faa2cc1232c4342c7945eace5a6667009b9d19f2368f9841e608f07bc826b30ce9112c43dd7e316 SHA512 1805fb68923a5e098777b69835d7593396f8f2bbf52e1cfe58e7447621497a700b23389c79e96b2d663c611335f6ea9df11efe8aa75a8842f6b73105f66e799c -DIST bluez-5.69.tar.xz 2335728 BLAKE2B 3b85c6418bf5f8fea989d9435d90f704da707248034006d12863465b9acee2b549f6d2950fdde64e74a1cbded4c711c54db747a82abdaa67ec965aab1c817d85 SHA512 4d5618cd083fe375c41faff868b5d9f072aeaccdffed758f6b69fd0cb46b058431cbf63182bd4a3f4f4e7a24b092729a4125687af730cd4250b273d66107bf42 DIST bluez-5.70.tar.xz 2339844 BLAKE2B 1ba2ddd3bfc6562a07f4e8376e0d537b555f0d36a221f051c4c10dd912c23e73aa2b0d8aa125e0fd911908e4cfa0036429e17250a26b3298bb21f65e4cc5255c SHA512 3a5f8caf7730dcdbbe0bb92154b41651a9d6619038447bf4c25e5e3e5316effcd7242a7a0456d731ce21d55b8daea5212a359acc5e5fc460499b9356b7d364cf DIST bluez-5.71.tar.xz 2381208 BLAKE2B 73e5f08771f821c90a70c553c600c48c4f1adb85aa9cb1a1eaae61a33b2dda73b7825fe769b3ea1ddedc39ad3fb71d84b336408f5ce6963f0373e9f7dcce SHA512 648394bbe470405aa0e2d3914474e95c122f567deaaac20a5dd74bac29fa430dfb64cdb7bdb4fb7510e62fa73e96112a97197fc212b421bf480b8d1bb24cfb5d diff --git a/net-wireless/bluez/bluez-5.68.ebuild b/net-wireless/bluez/bluez-5.68.ebuild deleted file mode 100644 index 37f02d578577.. --- a/net-wireless/bluez/bluez-5.68.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 - -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 ~loong ~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=" - btpclient? ( mesh ) - 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) - #
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 26f32e2abe9e0c412c98898f61b144a3f6e5fb76 Author: Sam James gentoo org> AuthorDate: Sat Dec 9 18:05:05 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 9 18:06:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f32e2a net-wireless/bluez: backport CVE-2023-45866 fix Signed-off-by: Sam James gentoo.org> net-wireless/bluez/bluez-5.70-r1.ebuild| 288 + .../bluez/files/bluez-5.70-CVE-2023-45866.patch| 43 +++ 2 files changed, 331 insertions(+) diff --git a/net-wireless/bluez/bluez-5.70-r1.ebuild b/net-wireless/bluez/bluez-5.70-r1.ebuild new file mode 100644 index ..756654822561 --- /dev/null +++ b/net-wireless/bluez/bluez-5.70-r1.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez; +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 ~loong ~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=" + btpclient? ( mesh ) + 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 + + # Fedora patches + # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-had...@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f + "${FILESDIR}"/${PN}-5.66-power-state-adapter-property.patch + + # Backport CVE-2023-45866 fix (bug #919383) + "${FILESDIR}"/${PN}-5.70-CVE-2023-45866.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 + ~UHID ~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 + + # 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 +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: e9e9b48a11ca7c39ca0ec24f4383a6685949ad66 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Aug 24 19:26:28 2023 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Aug 25 13:47:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e9b48a net-wireless/bluez: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/32437 Signed-off-by: Pacho Ramos gentoo.org> ...-GLib-helper-function-to-manipulate-paths.patch | 38 - .../bluez/files/bluez-5.66-musl-max-input.patch| 19 --- .../files/bluez-5.66-transient-hostname-fix.patch | 185 - 3 files changed, 242 deletions(-) diff --git a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch deleted file mode 100644 index 004a3895aa09.. --- 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 -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, , - DBUS_TYPE_INVALID)) { - /* Splits folder and name */ -- const char *slash = strrchr(name, '/'); -+ gboolean is_relative = !g_path_is_absolute(name); - DBG("Agent replied with %s", name); -- if (!slash) { -- agent->new_name = g_strdup(name); -+ if (is_relative) { -+ agent->new_name = g_path_get_basename(name); - agent->new_folder = NULL; - } else { -- agent->new_name = g_strdup(slash + 1); -- agent->new_folder = g_strndup(name, slash - name); -+ agent->new_name = g_path_get_basename(name); -+ agent->new_folder = g_path_get_dirname(name); - } - } - --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/bluez-5.66-musl-max-input.patch b/net-wireless/bluez/files/bluez-5.66-musl-max-input.patch deleted file mode 100644 index d8bdb3316e49.. --- a/net-wireless/bluez/files/bluez-5.66-musl-max-input.patch +++ /dev/null @@ -1,19 +0,0 @@ -# https://lore.kernel.org/linux-bluetooth/20230131055258.3311810-1-...@gentoo.org/T/#u -# musl does provide _POSIX_MAX_INPUT, but no MAX_INPUT out of the box. -# This patch assigns _POSIX_MAX_INPUT to MAX_INPUT. -# Please refer: https://github.com/nilfs-dev/nilfs-utils/commit/115fe4b976858c487cf83065f513d8626089579a -# https://bugs.gentoo.org/888467 a/src/shared/util.c -+++ b/src/shared/util.c -@@ -28,6 +28,11 @@ - #include - #endif - -+/* define MAX_INPUT for musl */ -+#ifndef MAX_INPUT -+#define MAX_INPUT _POSIX_MAX_INPUT -+#endif -+ - #include "src/shared/util.h" - - void *util_malloc(size_t size) diff --git a/net-wireless/bluez/files/bluez-5.66-transient-hostname-fix.patch b/net-wireless/bluez/files/bluez-5.66-transient-hostname-fix.patch deleted file mode 100644 index fef2776f7a0e.. --- a/net-wireless/bluez/files/bluez-5.66-transient-hostname-fix.patch +++ /dev/null @@ -1,185 +0,0 @@ -From e515f4b6e25c971c47ab79e9cbdfa17119bbde23 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 9 Nov 2022 16:17:55 +0100 -Subject: [PATCH 1/2] hostname: Add '' around printed strings - -Otherwise we can't see whether the string is nul, or empty. - plugins/hostname.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/hostname.c b/plugins/hostname.c -index 1a9513adb..14b6450b5 100644 a/plugins/hostname.c -+++ b/plugins/hostname.c -@@ -128,7 +128,7 @@ static void property_changed(GDBusProxy *proxy, const char *name, - - dbus_message_iter_get_basic(iter, ); - -- DBG("pretty hostname: %s", str); -+ DBG("pretty hostname: '%s'", str); - - g_free(pretty_hostname); - pretty_hostname = g_strdup(str); -@@ -146,7 +146,7 @@ static void property_changed(GDBusProxy *proxy, const char *name, - - dbus_message_iter_get_basic(iter, ); - -- DBG("static hostname: %s", str); -+ DBG("static hostname:
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: e995ac6f8404a060338f5cc1b05ddf48dcc5642d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Apr 19 17:47:15 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Apr 19 19:00:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e995ac6f net-wireless/bluez: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30653 Signed-off-by: Conrad Kostecki gentoo.org> ...et-pending-settings-when-receiving-MGMT-e.patch | 170 - 1 file changed, 170 deletions(-) diff --git a/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch b/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch deleted file mode 100644 index b9b432fadff0.. --- a/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch +++ /dev/null @@ -1,170 +0,0 @@ -From ede7b915980fbc80eff80aa189c35ca016956c61 Mon Sep 17 00:00:00 2001 -From: Archie Pusaka -Date: Tue, 23 Aug 2022 12:15:56 +0800 -Subject: [PATCH] adapter: Reset pending settings when receiving MGMT error - -We set the pending settings flag when sending MGMT_SETTING_* -commands to the MGMT layer and clear them when receiving a -successful reply, but we don't clear them when receiving an error -reply. This might cause a setting to be stuck in pending state. - -Therefore, also clear the pending flag when receiving error. -Furthermore, this patch also postpones setting the pending flag -until we queue the MGMT command in order to avoid setting it too -soon but we return early. - -This was caught during power off test, where MGMT_OP_SET_POWERED -returns Authentication Failed because disconnection takes too long. -Future attempts to switch power will then be ignored. - -< HCI Command: Disconnect (0x01|0x0006) plen 3 #17916 [hci0] 12.502908 -Handle: 512 -Reason: Remote Device Terminated due to Power Off (0x15) -> HCI Event: Command Status (0x0f) plen 4#17917 [hci0] 12.503185 - Disconnect (0x01|0x0006) ncmd 1 -Status: Success (0x00) -@ MGMT Event: Command Status (0x0002) plen 3 {0x0001} [hci0] 14.519491 - Set Powered (0x0005) -Status: Authentication Failed (0x05) -= bluetoothd: Failed to set mode: Authentication Failed (0x05) 14.520042 -= bluetoothd: adapter /org/bluez/hci0 set power to 0 14.813533 -> HCI Event: Disconnect Complete (0x05) plen 4 #17918 [hci0] 16.509043 -Status: Success (0x00) -Handle: 512 -Reason: Connection Timeout (0x08) - -Reviewed-by: Sonny Sasaka - src/adapter.c | 39 +++ - 1 file changed, 31 insertions(+), 8 deletions(-) - -diff --git a/src/adapter.c b/src/adapter.c -index ec26aab1a..b453e86a0 100644 a/src/adapter.c -+++ b/src/adapter.c -@@ -640,14 +640,21 @@ static void new_settings_callback(uint16_t index, uint16_t length, - settings_changed(adapter, settings); - } - -+struct set_mode_data { -+ struct btd_adapter *adapter; -+ uint32_t setting; -+}; -+ - static void set_mode_complete(uint8_t status, uint16_t length, - const void *param, void *user_data) - { -- struct btd_adapter *adapter = user_data; -+ struct set_mode_data *data = user_data; -+ struct btd_adapter *adapter = data->adapter; - - if (status != MGMT_STATUS_SUCCESS) { - btd_error(adapter->dev_id, "Failed to set mode: %s (0x%02x)", - mgmt_errstr(status), status); -+ adapter->pending_settings &= ~data->setting; - return; - } - -@@ -677,6 +684,7 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode, - { - struct mgmt_mode cp; - uint32_t setting = 0; -+ struct set_mode_data *data; - - memset(, 0, sizeof(cp)); - cp.val = mode; -@@ -699,15 +707,20 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode, - break; - } - -- adapter->pending_settings |= setting; -- - DBG("sending set mode command for index %u", adapter->dev_id); - -+ data = g_new0(struct set_mode_data, 1); -+ data->adapter = adapter; -+ data->setting = setting; -+ - if (mgmt_send(adapter->mgmt, opcode, - adapter->dev_id, sizeof(cp), , -- set_mode_complete, adapter, NULL) > 0) -+ set_mode_complete, data, g_free) > 0) { -+ adapter->pending_settings |= setting; - return true; -+ } - -+ g_free(data); - btd_error(adapter->dev_id, "Failed to set mode for index %u", - adapter->dev_id); - -@@ -718,6 +731,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode, -
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: dd556a89291ce48b6aec783b365a856ad4d92637 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Dec 27 17:13:05 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Jan 1 18:16:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd556a89 net-wireless/bluez: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28854 Signed-off-by: Conrad Kostecki gentoo.org> .../bluez/files/bluez-5.63-musl-limits.patch | 24 -- 1 file changed, 24 deletions(-) diff --git a/net-wireless/bluez/files/bluez-5.63-musl-limits.patch b/net-wireless/bluez/files/bluez-5.63-musl-limits.patch deleted file mode 100644 index ebdffc3270b4.. --- a/net-wireless/bluez/files/bluez-5.63-musl-limits.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e5dcac6abd6129829c4983d6635916cee8f1a627 Mon Sep 17 00:00:00 2001 -From: Jory Pratt -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 - #include - #include -+#include - - #include - --- -2.32.0 -
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 590842a7dae0db6d1d945376c84003c7a2235d03 Author: Pacho Ramos gentoo org> AuthorDate: Sun Dec 4 13:15:35 2022 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Dec 4 14:49:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590842a7 net-wireless/bluez: add 5.66 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest| 1 + net-wireless/bluez/bluez-5.66.ebuild | 300 + .../bluez-5.66-power-state-adapter-property.patch | 28 ++ .../files/bluez-5.66-transient-hostname-fix.patch | 185 + 4 files changed, 514 insertions(+) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 710de1c38b68..ff11cd002cac 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,3 +1,4 @@ DIST bluez-5.64.tar.xz 2175148 BLAKE2B 828c620330d1993d5c5c2a865f2d27a29425e3583aac01a1a782290a805ee0fd6456b6832c804ad323dd8714fa9329487b2616ed08f1f491ea29403ee05dba2d SHA512 f11f9974b29c5c6fce3890d7e42425c1cb02e42c1b8f49c5cc4b249234e67b64317d0e5e82721e2fbf1b53269c8569a9c869d59ce42b5e927f6622f0753e53cd DIST bluez-5.65.tar.xz 2208100 BLAKE2B 9d2937e2e14d8d8945183c6436921d9d16a6d3bcb5dbe3e2493554fbc4972bb4c006aabc793c9fb8eae47a7e9f29ae9fdf47551dfc0a238e86f5a76ce7436ae2 SHA512 c20c09a1a75053c77d73b3ce15ac7fd321eb6df5ca1646d57c6848b87c0c9957908bc17dd928da4ef2aacfc8667877cbc7511c1ba43db839bfa9bf1fb8269907 +DIST bluez-5.66.tar.xz 2257288 BLAKE2B af1911cf590461a874daa16bedb8a021a3b2c2af3254360c035d2180e0f355372651bd41da342c26e6d9631d726dd08e0d6a83a22069333b94b6fce6d546718c SHA512 ed0994932687eacf27207867366671b323671f5d5199daf36ea5eff8f254f2bc99ef989ef7df9883b35c06f2af60452be8bad0a06109428a4717cf2b247b4865 DIST power-state-adapter-property.patch 22488 BLAKE2B a46173c0ebe4f4822c67c2f8f2f3e67dab261753f64204f1a61665c3bba1d7a10e0f8511b38ce273d986490ffd262a737bee82694909683df7386b2015301607 SHA512 b039a578454681f291dc3b04079c8d0151b13a84b4b013e290aa3c28aba1538cef2d9e9aadfe88a0dbfb8e4cea1c251cb5043f4175fb32d53526f7b82de0451a diff --git a/net-wireless/bluez/bluez-5.66.ebuild b/net-wireless/bluez/bluez-5.66.ebuild new file mode 100644 index ..8a2a8ed1bcee --- /dev/null +++ b/net-wireless/bluez/bluez-5.66.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) + +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 ~loong ~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=" + btpclient? ( mesh ) + 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 + + # Fedora patches + # http://www.spinics.net/lists/linux-bluetooth/msg40136.html + "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch + + # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-had...@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: 6aecaf3e657fbc7bc7746786060cb0b7e0866db0 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Mar 27 11:45:24 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Mar 27 22:07:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aecaf3e net-wireless/bluez: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/24775 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../files/bluez-5.63-use-queue_push_tail.patch | 27 -- 1 file changed, 27 deletions(-) diff --git a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch deleted file mode 100644 index 6644e250cc48.. --- a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -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 - src/shared/att.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/shared/att.c b/src/shared/att.c -index 169f726e4..5ce735a07 100644 a/src/shared/att.c -+++ b/src/shared/att.c -@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, uint8_t opcode, - - switch (opcode) { - /* Only prepend requests that could be a continuation */ -- case BT_ATT_OP_READ_BLOB_REQ: - case BT_ATT_OP_PREP_WRITE_REQ: - case BT_ATT_OP_EXEC_WRITE_REQ: - result = queue_push_head(att->req_queue, op);
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 277ef13c7bb383657ee4628b45a37b62f66eb20e Author: Pacho Ramos gentoo org> AuthorDate: Sun Jan 16 09:37:57 2022 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jan 16 09:38:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277ef13c net-wireless/bluez: Sync with upstream fixes For bug #827706 Bug: https://bugs.gentoo.org/827706 Bug: https://bugs.gentoo.org/829091 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.63-r1.ebuild| 295 +++ ...hog-Fix-read-order-of-attributes-rediffed.patch | 542 + ...while-uhid-device-has-not-been-c-rediffed.patch | 90 3 files changed, 927 insertions(+) diff --git a/net-wireless/bluez/bluez-5.63-r1.ebuild b/net-wireless/bluez/bluez-5.63-r1.ebuild new file mode 100644 index ..baad2b48deaf --- /dev/null +++ b/net-wireless/bluez/bluez-5.63-r1.ebuild @@ -0,0 +1,295 @@ +# 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 + + # https://github.com/bluez/bluez/issues/220 + "${FILESDIR}"/0001-hog-Fix-read-order-of-attributes-rediffed.patch + "${FILESDIR}"/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.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
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: de026837aaef968dc2bcb14fcc06beb73325a2bc Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Dec 8 08:27:17 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Sat Dec 11 19:47:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de026837 net-wireless/bluez: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/23222 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../bluez/files/bluez-5.60-glibc-2.34.patch| 42 -- 1 file changed, 42 deletions(-) diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch deleted file mode 100644 index 1e846100285d.. --- a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 3 Mar 2021 08:57:36 +0100 -Subject: [PATCH] media: rename local function conflicting with pause(2) - -profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)' - 1284 | static bool pause(void *user_data) - | ^ -In file included from /usr/include/bits/sigstksz.h:24, - from /usr/include/signal.h:315, - from /usr/include/glib-2.0/glib/gbacktrace.h:36, - from /usr/include/glib-2.0/glib.h:34, - from profiles/audio/media.c:21: -/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)' - 478 | extern int pause (void); - |^ - profiles/audio/media.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/profiles/audio/media.c b/profiles/audio/media.c -index c84bbe22dc..3d8c4b69c3 100644 a/profiles/audio/media.c -+++ b/profiles/audio/media.c -@@ -1281,7 +1281,7 @@ static bool stop(void *user_data) - return media_player_send(mp, "Stop"); - } - --static bool pause(void *user_data) -+static bool pause_play(void *user_data) - { - struct media_player *mp = user_data; - -@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = { - .set_volume = set_volume, - .play = play, - .stop = stop, -- .pause = pause, -+ .pause = pause_play, - .next = next, - .previous = previous, - };
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 7514a3c027e281871fc86a27f7660016016b4023 Author: Pacho Ramos gentoo org> AuthorDate: Tue Oct 19 21:19:44 2021 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Oct 19 21:19:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7514a3c0 net-wireless/bluez: Drop old Package-Manager: Portage-3.0.24, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest | 2 - net-wireless/bluez/bluez-5.58-r1.ebuild | 292 --- net-wireless/bluez/bluez-5.60.ebuild | 292 --- net-wireless/bluez/files/bluez-5.58-rfkill.patch | 84 --- 4 files changed, 670 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 56ab750524f..471eb8b4602 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,4 +1,2 @@ -DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f883f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 -DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b DIST bluez-5.61.tar.xz 2137412 BLAKE2B 2fc1b44f726d48b4a0e8bbecc664077db1db69bbc87c66e9d7ac85d7b2e066de8b349c18597a5ba140c5fcb1ef867ee3980ebdd839ded69ae30491fb7b836940 SHA512 a2318637258f9db0bf05fecbfbea2c3ca5e21867378e28ab4c77f658fe42f10c8c607939f2b437ec40d1ceb00b99f7916c0275faaedd9edd247f7dc91329937a DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8 diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild deleted file mode 100644 index 18c11b1754e..000 --- a/net-wireless/bluez/bluez-5.58-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) - -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 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_USEDEP}] - dev-python/pygobject:3[${PYTHON_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.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/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=( - # rfkill: Fix reading from rfkill socket - "${FILESDIR}"/${P}-rfkill.patch - - # 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 -) - -pkg_setup() { - # From
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 1e4db05081ee5d3e479838361b7337fbac39623e Author: Pacho Ramos gentoo org> AuthorDate: Sun Jul 25 09:01:35 2021 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jul 25 09:01:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4db050 net-wireless/bluez: Fix building with glibc-2.34 Closes: https://bugs.gentoo.org/803830 Thanks-to: Sam James Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.60.ebuild | 3 ++ .../bluez/files/bluez-5.60-glibc-2.34.patch| 42 ++ 2 files changed, 45 insertions(+) diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.60.ebuild index 415cff1e5f2..394c547a517 100644 --- a/net-wireless/bluez/bluez-5.60.ebuild +++ b/net-wireless/bluez/bluez-5.60.ebuild @@ -71,6 +71,9 @@ PATCHES=( # Fedora patches # http://www.spinics.net/lists/linux-bluetooth/msg40136.html "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch + + # https://marc.info/?l=linux-bluetooth=161498090629584=2 + "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch ) pkg_setup() { diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch new file mode 100644 index 000..1e846100285 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch @@ -0,0 +1,42 @@ +From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 3 Mar 2021 08:57:36 +0100 +Subject: [PATCH] media: rename local function conflicting with pause(2) + +profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)' + 1284 | static bool pause(void *user_data) + | ^ +In file included from /usr/include/bits/sigstksz.h:24, + from /usr/include/signal.h:315, + from /usr/include/glib-2.0/glib/gbacktrace.h:36, + from /usr/include/glib-2.0/glib.h:34, + from profiles/audio/media.c:21: +/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)' + 478 | extern int pause (void); + |^ +--- + profiles/audio/media.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/profiles/audio/media.c b/profiles/audio/media.c +index c84bbe22dc..3d8c4b69c3 100644 +--- a/profiles/audio/media.c b/profiles/audio/media.c +@@ -1281,7 +1281,7 @@ static bool stop(void *user_data) + return media_player_send(mp, "Stop"); + } + +-static bool pause(void *user_data) ++static bool pause_play(void *user_data) + { + struct media_player *mp = user_data; + +@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = { + .set_volume = set_volume, + .play = play, + .stop = stop, +- .pause = pause, ++ .pause = pause_play, + .next = next, + .previous = previous, + };
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: 8441848c703d5ff62936d43748021563a2e95d6f Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jul 14 19:27:19 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Jul 14 20:04:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8441848c net-wireless/bluez: remove unused files Closes: https://github.com/gentoo/gentoo/pull/21642 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> net-wireless/bluez/files/69-btattach-bcm.rules | 33 net-wireless/bluez/files/bluetooth-init.d-r4 | 12 - net-wireless/bluez/files/btattach-bcm-service.sh | 30 - net-wireless/bluez/files/btattach-bcm_at.service | 6 - 4 files changed, 81 deletions(-) diff --git a/net-wireless/bluez/files/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules deleted file mode 100644 index dfe8d1e785c..000 --- a/net-wireless/bluez/files/69-btattach-bcm.rules +++ /dev/null @@ -1,33 +0,0 @@ -# Some devices have a bluetooth HCI connected to an uart, these needs to be -# setup by calling btattach. The systemd btattach-bcm.service takes care of -# this. These udev rules hardware-activate that service when necessary. -# -# For now this only suports ACPI enumerated Broadcom BT HCIs. -# This has been tested on Bay and Cherry Trail devices with both ACPI and -# PCI enumerated UARTs. - -# Note we check for the platform device not for the acpi device, because -# some DSDTs list multiple bluetooth adapters, but only some (or none) -# are enabled. Only enabled adapters get a platform device created. -ACTION!="add", GOTO="btattach_bcm_rules_end" -SUBSYSTEM!="platform", GOTO="btattach_bcm_rules_end" - -KERNEL=="BCM2E1A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E39:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E3A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E3D:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E3F:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E40:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E54:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E55:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E64:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E65:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E67:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E71:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E7B:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E7C:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E7E:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E95:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E96:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" - -LABEL="btattach_bcm_rules_end" diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4 deleted file mode 100644 index e69c66867fa..000 --- a/net-wireless/bluez/files/bluetooth-init.d-r4 +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/bluetoothd.pid" -command="/usr/libexec/bluetooth/bluetoothd" -command_background=1 - -depend() { - after coldplug - need dbus localmount hostname -} diff --git a/net-wireless/bluez/files/btattach-bcm-service.sh b/net-wireless/bluez/files/btattach-bcm-service.sh deleted file mode 100644 index c7f8b178467..000 --- 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 :, but still claims to have -# an uart attached bt -if [ "$1" = "BCM2E7E:00" ] && lsusb | grep -q "ID :"; then - exit 0 -fi - -while [ ! -d "$UART_DEV/tty" ]; do -
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: dc88877a2411735d828da371cd8b72b2173625f5 Author: Pacho Ramos gentoo org> AuthorDate: Wed Jun 23 07:52:09 2021 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Jun 23 07:53:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc88877a net-wireless/bluez: Drop old Bug: https://bugs.gentoo.org/797712 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest| 2 - net-wireless/bluez/bluez-5.55.ebuild | 299 - net-wireless/bluez/bluez-5.56-r1.ebuild| 296 .../bluez/files/bluez-5.56-avdtp-disconnects.patch | 41 --- 4 files changed, 638 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 30a5ca30ec7..4bc25fa2af7 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,4 +1,2 @@ -DIST bluez-5.55.tar.xz 2041428 BLAKE2B 7eee44063ea53188d35324bcc5b5f0539cf92a5934632743677bbf41822b8b79a899a82a93fd79887fe058e6f0c0e66ed8d5da46e5585682613bc1847cb009a8 SHA512 9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033 -DIST bluez-5.56.tar.xz 2053080 BLAKE2B b901deae4047ebe96c034c20c9d7e6c275d3c1fd311dc57ed2f1f927d6e778b213af3e09caaeebbb0f1733fc9bf341cf8f7c63a37aaa6b896607c0026d92 SHA512 b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f883f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 DIST bluez-5.59.tar.xz 2123104 BLAKE2B 59e063ffc0cd810a151f49c2d8b3e1dca46eef038dfe112bfc0524e111e00cfea78557f3d1ccf657882b76158ee9249291f9fc6e6a4cce851e0e6dc43f707398 SHA512 506ce28459a82614e5f6c55235b84e5780a9bfa821904fd40ee2928a503978248368069c57a283db9dd81f48d78f45e00d95a7c52d1538d3f5c858a29424304f diff --git a/net-wireless/bluez/bluez-5.55.ebuild b/net-wireless/bluez/bluez-5.55.ebuild deleted file mode 100644 index e374716a186..000 --- a/net-wireless/bluez/bluez-5.55.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -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 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.28 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.28 - >=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/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 - - # Fedora patches - # http://www.spinics.net/lists/linux-bluetooth/msg40136.html - "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch -) - -pkg_setup() { - # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 5f675fe2e6957446b593397841e2a162dc13cfbd Author: Pacho Ramos gentoo org> AuthorDate: Tue Jun 22 16:17:21 2021 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Jun 22 16:17:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f675fe2 net-wireless/bluez: Fix A2DP parsing Bug: https://bugs.gentoo.org/785424 Thanks-to: Joakim Tjernlund Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.59-r1.ebuild| 292 + .../bluez/files/bluez-5.59-a2dp-parsing.patch | 38 +++ 2 files changed, 330 insertions(+) diff --git a/net-wireless/bluez/bluez-5.59-r1.ebuild b/net-wireless/bluez/bluez-5.59-r1.ebuild new file mode 100644 index 000..898115e910a --- /dev/null +++ b/net-wireless/bluez/bluez-5.59-r1.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..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 ~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=" + dev-python/docutils + virtual/pkgconfig + test? ( ${TEST_DEPS} ) +" +DEPEND=" + >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] + >=sys-apps/hwids-20121202.2 + 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/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=( + # avdtp: Fix parsing capabilities (from 'master') + "${FILESDIR}"/${P}-a2dp-parsing.patch + + # 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 +) + +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 user-session || ! use systemd; then + eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch + fi + +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: e7d2a2805d8c54cfdeab02e3e60935629f471ac7 Author: Pacho Ramos gentoo org> AuthorDate: Mon Mar 22 21:16:26 2021 + Commit: Pacho Ramos gentoo org> CommitDate: Mon Mar 22 21:16:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d2a280 net-wireless/bluez: Fix reconnect issues and allow to pass options... Upstream fix for reconnect issues and allow to pass options to init.d script. Also drop obsolete btattach hacks as Fedora did. Closes: https://bugs.gentoo.org/777000 Thanks-to: Joakim Tjernlund Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.56-r1.ebuild| 295 + net-wireless/bluez/files/bluetooth-conf.d | 1 + net-wireless/bluez/files/bluetooth-init.d-r5 | 13 + .../bluez/files/bluez-5.56-avdtp-disconnects.patch | 41 +++ 4 files changed, 350 insertions(+) diff --git a/net-wireless/bluez/bluez-5.56-r1.ebuild b/net-wireless/bluez/bluez-5.56-r1.ebuild new file mode 100644 index 000..ee7911d7c17 --- /dev/null +++ b/net-wireless/bluez/bluez-5.56-r1.ebuild @@ -0,0 +1,295 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +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 ~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.28 ) + cups? ( net-print/cups:= ) + mesh? ( + >=dev-libs/ell-0.37 + >=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/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 + + # Fedora patches + # http://www.spinics.net/lists/linux-bluetooth/msg40136.html + "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch + + # avdtp: Fix removing all remote SEPs when loading from cache (from 'master') + "${FILESDIR}"/${P}-avdtp-disconnects.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 ~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_USER_API_HASH + ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" + fi + if use test; then + # http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER" + 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
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: 0972ff85938dcde7f47822814f6d899480a1262f Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Dec 23 06:50:01 2019 + Commit: David Seifert gentoo org> CommitDate: Mon Dec 23 10:15:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0972ff85 net-wireless/bluez: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/14101 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: David Seifert gentoo.org> ...xd-without-systemd-in-the-user-session-r1.patch | 58 -- .../bluez/files/bluez-5.39-systemd-quote.patch | 38 -- net-wireless/bluez/files/bluez-plugdev.patch | 14 -- 3 files changed, 110 deletions(-) diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch deleted file mode 100644 index dec93073e18..000 --- 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 -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..000 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 000..9c815f2 /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch deleted file mode 100644 index d23c877eef8..000 --- 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 -Date: Sun, 3 Apr 2016 14:30:02 -0400 -Subject: [PATCH] build: Quote systemd variable names - -If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is -defined as a macro. Quote this name to prevent macro expansion. - -Bug: https://bugs.gentoo.org/527432 - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1679a47..4664003 100644 a/configure.ac -+++ b/configure.ac -@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then - fi - AC_MSG_RESULT([${path_systemunitdir}]) - fi --AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}]) -+AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}]) - - AC_ARG_WITH([systemduserunitdir], - AC_HELP_STRING([--with-systemduserunitdir=DIR], -@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then - fi - AC_MSG_RESULT([${path_userunitdir}]) - fi --AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}]) -+AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}]) - - AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], - [do not install configuration and data files]), --- -2.8.0 - diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch deleted file mode 100644 index 726838a5132..000 --- a/net-wireless/bluez/files/bluez-plugdev.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurp bluez-4.39.orig/src/bluetooth.conf
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 87eadbdbf4dff78be3702e418b1898833d26a7a7 Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 20 11:15:18 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 20 11:39:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87eadbdb net-wireless/bluez: Fix cancelling disconnect timeout Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.51-r1.ebuild| 294 + .../files/bluez-5.51-disconnect-timeout.patch | 104 2 files changed, 398 insertions(+) diff --git a/net-wireless/bluez/bluez-5.51-r1.ebuild b/net-wireless/bluez/bluez-5.51-r1.ebuild new file mode 100644 index 000..1bf47c399e0 --- /dev/null +++ b/net-wireless/bluez/bluez-5.51-r1.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2019 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} + >=dev-python/dbus-python-1[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_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 + + # Include limits.h for PATH_MAX + # https://marc.info/?l=linux-bluetooth=157156119320950=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=157047663920714=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-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 + +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 01275fe1564faa3c830bca4b0ea900fb44bafb0f Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 29 10:58:47 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 29 10:58:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01275fe1 net-wireless/bluez: Version bump to 5.51 - Follow Fedora for installing few more needed extra-tools, AutoEnable bluetooth as soon as possible for keyboard/mouse devices. - Install example files for meshctl (#662110) - Fix QA issues (#694852) Closes: https://bugs.gentoo.org/662110 Bug: https://bugs.gentoo.org/683230 Closes: https://bugs.gentoo.org/694852 Closes: https://bugs.gentoo.org/695316 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest | 1 + net-wireless/bluez/bluez-5.51.ebuild | 285 +++ net-wireless/bluez/files/69-btattach-bcm.rules | 33 +++ net-wireless/bluez/files/bluetooth-init.d-r4 | 2 +- net-wireless/bluez/files/btattach-bcm-service.sh | 30 +++ net-wireless/bluez/files/btattach-bcm_at.service | 6 + 6 files changed, 356 insertions(+), 1 deletion(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 2de1b406112..042c13a4249 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,2 +1,3 @@ DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd4a223d2ce28cee85a3a736bfbf5ee9d74372fa6366dc1102bf86babada608966a8c30b1c2537859a3741c289cabbc76026 SHA512 6d33e8bc67e50dc0d4cee3fa080402a51ddc8b6549f19b6c272de7dc51604eab23f909322f01aaca8a834abdc3cfd0bf24bb8623071af0cf0611d7427c9d8e9a DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45 +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 new file mode 100644 index 000..b777edab5bc --- /dev/null +++ b/net-wireless/bluez/bluez-5.51.ebuild @@ -0,0 +1,285 @@ +# Copyright 1999-2019 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 ~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} + >=dev-python/dbus-python-1[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_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 + #
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: d0fe48785cce688dd6838794c810a3786c1bc1ef Author: Pacho Ramos gentoo org> AuthorDate: Mon Jun 10 11:22:54 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Mon Jun 10 11:22:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0fe4878 net-wireless/bluez: Backport lots of fixes (from Fedora)... - Include multiple fixes backported by Fedora people - Stop relying on plugdev group and follow upstream policy (#679034) - Update udevadm PATH for current systemd (#539844) - Rename USE alsa to midi (#658862) Closes: https://bugs.gentoo.org/679034 Closes: https://bugs.gentoo.org/658862 Bug: https://bugs.gentoo.org/539844 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/Manifest| 1 + net-wireless/bluez/bluez-5.50-r3.ebuild| 267 + .../bluez/files/bluez-5.50-sink-connect.patch | 72 ++ .../bluez/files/bluez-udevadm-path-r1.patch| 10 + net-wireless/bluez/metadata.xml| 9 +- 5 files changed, 354 insertions(+), 5 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 0574b3c3473..2de1b406112 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1 +1,2 @@ +DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd4a223d2ce28cee85a3a736bfbf5ee9d74372fa6366dc1102bf86babada608966a8c30b1c2537859a3741c289cabbc76026 SHA512 6d33e8bc67e50dc0d4cee3fa080402a51ddc8b6549f19b6c272de7dc51604eab23f909322f01aaca8a834abdc3cfd0bf24bb8623071af0cf0611d7427c9d8e9a DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45 diff --git a/net-wireless/bluez/bluez-5.50-r3.ebuild b/net-wireless/bluez/bluez-5.50-r3.ebuild new file mode 100644 index 000..c613f12d2fd --- /dev/null +++ b/net-wireless/bluez/bluez-5.50-r3.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +inherit autotools python-single-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 + https://dev.gentoo.org/~pacho/${PN}/${P}-fedora-backports.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} + >=dev-python/dbus-python-1[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_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.3 ) + cups? ( net-print/cups:= ) + mesh? ( + >=dev-libs/ell-0.3 + 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} ) +" + +PATCHES=( + # Fix missing header (fixed in 'master') + "${FILESDIR}"/${P}-btpclient-header.patch + + # Fix switch to A2DP sink profile + "${FILESDIR}"/${P}-sink-connect.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-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 + + # ??? +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: d24e675eb6f2d5c6db5de9bab734a4340e4dbc01 Author: Pacho Ramos gentoo org> AuthorDate: Sat Jan 19 08:17:18 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Jan 19 08:56:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24e675e net-wireless/bluez: Fix missing header build failure Thanks-to: Dennis Schridde Thanks-to: W. Duijvenvoorde Closes: https://bugs.gentoo.org/675362 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Pacho Ramos gentoo.org> net-wireless/bluez/bluez-5.50-r1.ebuild| 3 +++ net-wireless/bluez/files/bluez-5.50-btpclient-header.patch | 10 ++ 2 files changed, 13 insertions(+) diff --git a/net-wireless/bluez/bluez-5.50-r1.ebuild b/net-wireless/bluez/bluez-5.50-r1.ebuild index 176d40c87d0..677e62aad26 100644 --- a/net-wireless/bluez/bluez-5.50-r1.ebuild +++ b/net-wireless/bluez/bluez-5.50-r1.ebuild @@ -60,6 +60,9 @@ DOC_CONTENTS=" " PATCHES=( + # Fix missing header (fixed in 'master') + "${FILESDIR}"/${P}-btpclient-header.patch + # Use static group "plugdev" to not force people to become root for # controlling the devices. "${FILESDIR}"/${PN}-plugdev.patch diff --git a/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch b/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch new file mode 100644 index 000..61a8e6a3742 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch @@ -0,0 +1,10 @@ +diff -Nuar bluez-5.50/tools/btpclient.c bluez-5.50-fixed/tools/btpclient.c +--- bluez-5.50/tools/btpclient.c 2018-03-10 17:37:07.0 +0200 bluez-5.50-fixed/tools/btpclient.c 2018-11-18 09:54:38.916794492 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: 7bb29d39a859f037992da6f485f3171adf17315e Author: Pacho Ramos gentoo org> AuthorDate: Fri Sep 14 21:43:39 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Sep 14 21:43:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb29d39 net-wireless/bluez: Drop obsolete files (#664044 by iamnr3) Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../0002-autopair-Don-t-handle-the-iCade.patch | 47 -- net-wireless/bluez/files/rfcomm-init.d-r2 | 34 2 files changed, 81 deletions(-) diff --git a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch b/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch deleted file mode 100644 index 68751ae7b60..000 --- 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 -Date: Tue, 19 Nov 2013 14:11:39 +0100 -Subject: [PATCH 2/5] autopair: Don't handle the iCade - -We can't easily enter digits other than 1 through 4 (inclusive) -so leave it up to the agent to figure out a good passcode -for the iCade. - -Note that we can not use the VID/PID of the device, as it is not -yet known at that point. - plugins/autopair.c | 12 +++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/plugins/autopair.c b/plugins/autopair.c -index 8c98c12..5d2f6f7 100644 a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - { - char addr[18]; - char pinstr[7]; -+ char name[25]; - uint32_t class; - - ba2str(device_get_address(device), addr); - - class = btd_device_get_class(device); - -- DBG("device %s 0x%x", addr, class); -+ device_get_name(device, name, sizeof(name)); -+ name[sizeof(name) - 1] = 0; -+ -+ DBG("device %s (%s) 0x%x", addr, name, class); -+ -+ g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device)); -+ -+ /* The iCade shouldn't use random PINs like normal keyboards */ -+ if (name != NULL && strstr(name, "iCade") != NULL) -+ return 0; - - /* This is a class-based pincode guesser. Ignore devices with an -* unknown class. --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2 b/net-wireless/bluez/files/rfcomm-init.d-r2 deleted file mode 100644 index 3bfb010d60b..000 --- a/net-wireless/bluez/files/rfcomm-init.d-r2 +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need bluetooth -} - -checkconfig() { - if [ -z "${ADDRESS}" ]; then - eerror "ADDRESS must be set" - return 1 - fi - - return 0 -} - -start() { - local DEVICE=${RC_SVCNAME#*.} - - checkconfig || return 1 - - ebegin "Starting ${RC_SVCNAME}" - rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL} - eend $? -} - -stop() { - local DEVICE=${RC_SVCNAME#*.} - - ebegin "Shutting down ${RC_SVCNAME}" - rfcomm release "${DEVICE}" - eend $? -}
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 5f6f22e0b7c30080a493a439178ee2b7a92b4afe Author: Pacho Ramos gentoo org> AuthorDate: Wed May 23 18:36:23 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Wed May 23 18:52:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6f22e0 net-wireless/bluez: Fix crash with non-LE devices (#655114) Package-Manager: Portage-2.3.31, Repoman-2.3.9 net-wireless/bluez/bluez-5.49-r1.ebuild| 263 + .../bluez/files/bluez-5.49-crash-non-LE.patch | 51 2 files changed, 314 insertions(+) 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 000..d5c27acdb57 --- /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
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 19474b4a6cf48f0df05a9d3ad03a6ea470ef44ec Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 24 21:26:35 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 24 21:26:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19474b4a net-wireless/bluez: Drop old Package-Manager: Portage-2.3.10, Repoman-2.3.3 net-wireless/bluez/Manifest | 1 - net-wireless/bluez/bluez-5.43-r1.ebuild | 255 --- net-wireless/bluez/files/bluetooth-init.d-r3 | 20 --- 3 files changed, 276 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 98dccd62079..cdd113dc8ac 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,2 +1 @@ -DIST bluez-5.43.tar.xz 1658348 SHA256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 SHA512 a48ac3d196a16fdfe7ef9bdc9a4ed8c9d40054e4f801a27a45150ce46e655ceff6264d230721065081d865c8b1f754ea0c407acc84fd299529aba048ce31889c WHIRLPOOL b63fcb8f9784122168f89902a74d811cc6236999de5dfe62b425032ac4d51923742f77d6d9957b3811c9584d194065bba184daf47882b1f09f760184a18838e9 DIST bluez-5.47.tar.xz 1718920 SHA256 cf75bf7cd5d564f21cc4a2bd01d5c39ce425397335fd47d9bbe43af0a58342c8 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6 WHIRLPOOL c3b2999ea73804f905b81222db9e5f3df0e9b3b7b4ed888a9b7ce760f831c335080ef35368b62d837f2d2d1695cf18d845a1259bb6d76ee8d6ff17b5197abf01 diff --git a/net-wireless/bluez/bluez-5.43-r1.ebuild b/net-wireless/bluez/bluez-5.43-r1.ebuild deleted file mode 100644 index e041949288f..000 --- a/net-wireless/bluez/bluez-5.43-r1.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils 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="cups doc debug deprecated extra-tools experimental +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? ( 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 - cups? ( net-print/cups:= ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:= ) - 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 use rfcomm as a normal user, you need to add the user - to the uucp group. -" - -PATCHES=( - # Use static group "plugdev" if there is no ConsoleKit (or systemd logind) - "${FILESDIR}"/bluez-plugdev.patch - - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - "${FILESDIR}"/bluez-udevadm-path.patch - - # build: Quote systemd variable names, bug #527432 - # http://article.gmane.org/gmane.linux.bluez.kernel/67230 - "${FILESDIR}"/bluez-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 - - # http://www.spinics.net/lists/linux-bluetooth/msg41264.html - "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch - - # ??? - "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.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() { -
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: ffd3f508463eb80c860adcae5f966ca2ab92b92b Author: Patrick McLean gentoo org> AuthorDate: Thu Sep 14 17:22:55 2017 + Commit: Patrick McLean gentoo org> CommitDate: Thu Sep 14 17:23:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd3f508 net-wireless/bluez: Revision bump to 5.47-r1, update OpenRC init script Gentoo-Bug: 630988 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../bluez/{bluez-5.47.ebuild => bluez-5.47-r1.ebuild}| 2 +- net-wireless/bluez/files/bluetooth-init.d-r4 | 12 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/net-wireless/bluez/bluez-5.47.ebuild b/net-wireless/bluez/bluez-5.47-r1.ebuild similarity index 99% rename from net-wireless/bluez/bluez-5.47.ebuild rename to net-wireless/bluez/bluez-5.47-r1.ebuild index 1549f18010f..e60d2611e3f 100644 --- a/net-wireless/bluez/bluez-5.47.ebuild +++ b/net-wireless/bluez/bluez-5.47-r1.ebuild @@ -245,7 +245,7 @@ multilib_src_install_all() { done doins src/main.conf - newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth + newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm einstalldocs diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4 new file mode 100755 index 000..97cf58e --- /dev/null +++ b/net-wireless/bluez/files/bluetooth-init.d-r4 @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: b4723357d9721f055a054bb0bfd1596cbfea96b1 Author: Pacho Ramos gentoo org> AuthorDate: Sat Feb 4 15:19:44 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Feb 4 15:20:18 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4723357 net-wireless/bluez: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-wireless/bluez/Manifest | 3 - net-wireless/bluez/bluez-4.101-r9.ebuild | 204 -- net-wireless/bluez/bluez-5.39.ebuild | 235 -- net-wireless/bluez/bluez-5.43.ebuild | 244 --- net-wireless/bluez/files/bluetooth-init.d-r2 | 21 --- net-wireless/bluez/files/rfcomm-conf.d | 5 - net-wireless/bluez/files/rfcomm-init.d | 27 --- 7 files changed, 739 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index e479f0d..ae52d98 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,4 +1 @@ -DIST bluez-4.101-patches.tar.xz 12380 SHA256 ea4b837245080ebe904fe4f338cd3c8c1370e197cdfbcd42bd55430c940b5e13 SHA512 0ef3219ed923a0880b2fe7008c36c185ff631a8fe1b357cc361217d9a7eaa6624bd31ed00a86739528cb777a0b9900a7db4930482d1cbc38417b89aa WHIRLPOOL b89729b2cb1ecd6c816210682605b275af396af056e85d9a8671192ede0470002c1f61931781f27ad988ce8bc137f69a6725008a5ea9fe743ae41bc2f5edc7e8 -DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA512 c8a88fa6948e43c81687047856806c9dc576d3223371947b496f228dec2b2614d1c5a8ff587e9f26eec44843a50503c55861f9fa736fdba43b2364f663f0cb0d WHIRLPOOL 0c4f163e4f4d0ba8f7928f5330ac3fd5f204c299346c59e73b64ebb331b0887a2b01e8ed6f4e6ae91f826a0431df4f97fe3a0900fa6013ae66fd755aaa136196 -DIST bluez-5.39.tar.xz 1659576 SHA256 21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b SHA512 a0c43d0de4dcbfa20bbfe34e805a60703f4b94d0aa6c1d128a0917dfaa490593b26eb555b0a343ff44d1f94349b61776189438039e489ddcf8fe107354740230 WHIRLPOOL da299f8556418cf38d5a05b91079fdb6ff85761127d4708783bcd97fa4502e208187c013b1d8622688b438308506fbb06732426c35f6fedc2fe25cfd68a93486 DIST bluez-5.43.tar.xz 1658348 SHA256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 SHA512 a48ac3d196a16fdfe7ef9bdc9a4ed8c9d40054e4f801a27a45150ce46e655ceff6264d230721065081d865c8b1f754ea0c407acc84fd299529aba048ce31889c WHIRLPOOL b63fcb8f9784122168f89902a74d811cc6236999de5dfe62b425032ac4d51923742f77d6d9957b3811c9584d194065bba184daf47882b1f09f760184a18838e9 diff --git a/net-wireless/bluez/bluez-4.101-r9.ebuild b/net-wireless/bluez/bluez-4.101-r9.ebuild deleted file mode 100644 index 7e638fc.. --- a/net-wireless/bluez/bluez-4.101-r9.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils multilib python-single-r1 readme.gentoo \ - systemd 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 - https://dev.gentoo.org/~pacho/bluez/${P}-patches.tar.xz; - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 x86" -IUSE="alsa cups debug gstreamer hid2hci pcmcia readline selinux test-programs usb" - -REQUIRED_USE="test-programs? ( ${PYTHON_REQUIRED_USE} )" - -# TODO: revisit USE=gstreamer once gstreamer is ported to multilib - -CDEPEND=" - >=dev-libs/glib-2.28:2 - >=sys-apps/dbus-1.6:= - >=sys-apps/hwids-20121202.2 - >=virtual/udev-171 - alsa? ( - >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP},alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] - media-libs/libsndfile:= - ) - cups? ( net-print/cups:= ) - gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 - ) - readline? ( sys-libs/readline:= ) - selinux? ( sec-policy/selinux-bluetooth ) - usb? ( virtual/libusb:0 ) -" -DEPEND="${CDEPEND} - sys-devel/flex - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test-programs? ( >=dev-libs/check-0.9.6 ) -" -RDEPEND="${CDEPEND} - test-programs? ( - >=dev-python/dbus-python-1 - dev-python/pygobject:2 - dev-python/pygobject:3 - ${PYTHON_DEPS} - ) - abi_x86_32? ( - !/dev/null - dobin simple-agent simple-service monitor-bluetooth - newbin list-devices list-bluetooth-devices - rm test-textfile.{c,o} || die #356529 - local b - for b in hsmicro hsplay test-*; do - newbin "${b}" bluez-"${b}" - done - insinto /usr/share/doc/${PF}/test-services
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: c82f2c107f426f69cd82ba2b4ad569ca78d0d1bf Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Jan 27 15:41:06 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jan 29 17:40:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82f2c10 net-wireless/bluez: remove unused patches ...-Logitech-diNovo-Edge-keyboard-firmware-i.patch | 29 net-wireless/bluez/files/bluez-5.37-endian.patch | 51 -- 2 files changed, 80 deletions(-) diff --git a/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch b/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch deleted file mode 100644 index 55d5af6.. --- 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-Date: Thu, 10 Jan 2013 09:18:43 +0100 -Subject: [PATCH] work around Logitech diNovo Edge keyboard firmware issue - -https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/269851 - tools/hid2hci.rules |5 - - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/tools/hid2hci.rules b/tools/hid2hci.rules -index db6bb03..7db4572 100644 a/tools/hid2hci.rules -+++ b/tools/hid2hci.rules -@@ -11,7 +11,10 @@ ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProt - RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1" - - # Logitech devices --KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \ -+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[5e]", \ -+ RUN+="hid2hci --method=logitech-hid --devpath=%p" -+# Logitech, Inc. RAW communicating devices -+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[34abc]|c71[34bc]", \ - RUN+="hid2hci --method=logitech-hid --devpath=%p" - - ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end" --- -1.8.0.1 - diff --git a/net-wireless/bluez/files/bluez-5.37-endian.patch b/net-wireless/bluez/files/bluez-5.37-endian.patch deleted file mode 100644 index 1ffa350.. --- a/net-wireless/bluez/files/bluez-5.37-endian.patch +++ /dev/null @@ -1,51 +0,0 @@ a/profiles/audio/a2dp-codecs.h -+++ b/profiles/audio/a2dp-codecs.h -@@ -149,6 +149,17 @@ - uint16_t codec_id; - } __attribute__ ((packed)) a2dp_vendor_codec_t; - -+typedef struct { -+ a2dp_vendor_codec_t info; -+ uint8_t channel_mode:4; -+ uint8_t frequency:4; -+} __attribute__ ((packed)) a2dp_aptx_t; -+ -+typedef struct { -+ a2dp_vendor_codec_t info; -+ uint8_t unknown[2]; -+} __attribute__ ((packed)) a2dp_ldac_t; -+ - #if __BYTE_ORDER == __LITTLE_ENDIAN - - typedef struct { -@@ -183,17 +194,6 @@ - uint8_t bitrate3; - } __attribute__ ((packed)) a2dp_aac_t; - --typedef struct { -- a2dp_vendor_codec_t info; -- uint8_t channel_mode:4; -- uint8_t frequency:4; --} __attribute__ ((packed)) a2dp_aptx_t; -- --typedef struct { -- a2dp_vendor_codec_t info; -- uint8_t unknown[2]; --} __attribute__ ((packed)) a2dp_ldac_t; -- - #elif __BYTE_ORDER == __BIG_ENDIAN - - typedef struct { -@@ -228,12 +228,6 @@ - uint8_t bitrate3; - } __attribute__ ((packed)) a2dp_aac_t; - --typedef struct { -- a2dp_vendor_codec_t info; -- uint8_t frequency:4; -- uint8_t channel_mode:4; --} __attribute__ ((packed)) a2dp_aptx_t; -- - #else - #error "Unknown byte order" - #endif
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/
commit: ccda19a7dbc177cc713f1f94a558bf40a73d77c6 Author: Pacho Ramos gentoo org> AuthorDate: Sat Apr 9 13:57:26 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Apr 9 13:58:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccda19a7 net-wireless/bluez: Commit forgotten patch (#579438) Package-Manager: portage-2.2.28 .../bluez/files/bluez-5.39-systemd-quote.patch | 38 ++ 1 file changed, 38 insertions(+) diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch new file mode 100644 index 000..d23c877 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch @@ -0,0 +1,38 @@ +From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert+Date: Sun, 3 Apr 2016 14:30:02 -0400 +Subject: [PATCH] build: Quote systemd variable names + +If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is +defined as a macro. Quote this name to prevent macro expansion. + +Bug: https://bugs.gentoo.org/527432 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1679a47..4664003 100644 +--- a/configure.ac b/configure.ac +@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then + fi + AC_MSG_RESULT([${path_systemunitdir}]) + fi +-AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}]) ++AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}]) + + AC_ARG_WITH([systemduserunitdir], + AC_HELP_STRING([--with-systemduserunitdir=DIR], +@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then + fi + AC_MSG_RESULT([${path_userunitdir}]) + fi +-AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}]) ++AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}]) + + AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], + [do not install configuration and data files]), +-- +2.8.0 +
[gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez/files/, net-wireless/bluez/
commit: 30bdbd6c5ddc734020e35260ac1fb0848d769488 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Feb 12 08:49:55 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Feb 12 08:50:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30bdbd6c net-wireless/bluez: Fix endian compile error (bug #574092). Package-Manager: portage-2.2.27 net-wireless/bluez/bluez-5.37.ebuild | 3 ++ net-wireless/bluez/files/bluez-5.37-endian.patch | 51 2 files changed, 54 insertions(+) diff --git a/net-wireless/bluez/bluez-5.37.ebuild b/net-wireless/bluez/bluez-5.37.ebuild index fd9b88a..e3704f8 100644 --- a/net-wireless/bluez/bluez-5.37.ebuild +++ b/net-wireless/bluez/bluez-5.37.ebuild @@ -92,6 +92,9 @@ src_prepare() { # ??? epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch + # bug 574092 + epatch "${FILESDIR}"/${PN}-5.37-endian.patch + if use cups; then sed -i \ -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ diff --git a/net-wireless/bluez/files/bluez-5.37-endian.patch b/net-wireless/bluez/files/bluez-5.37-endian.patch new file mode 100644 index 000..1ffa350 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.37-endian.patch @@ -0,0 +1,51 @@ +--- a/profiles/audio/a2dp-codecs.h b/profiles/audio/a2dp-codecs.h +@@ -149,6 +149,17 @@ + uint16_t codec_id; + } __attribute__ ((packed)) a2dp_vendor_codec_t; + ++typedef struct { ++ a2dp_vendor_codec_t info; ++ uint8_t channel_mode:4; ++ uint8_t frequency:4; ++} __attribute__ ((packed)) a2dp_aptx_t; ++ ++typedef struct { ++ a2dp_vendor_codec_t info; ++ uint8_t unknown[2]; ++} __attribute__ ((packed)) a2dp_ldac_t; ++ + #if __BYTE_ORDER == __LITTLE_ENDIAN + + typedef struct { +@@ -183,17 +194,6 @@ + uint8_t bitrate3; + } __attribute__ ((packed)) a2dp_aac_t; + +-typedef struct { +- a2dp_vendor_codec_t info; +- uint8_t channel_mode:4; +- uint8_t frequency:4; +-} __attribute__ ((packed)) a2dp_aptx_t; +- +-typedef struct { +- a2dp_vendor_codec_t info; +- uint8_t unknown[2]; +-} __attribute__ ((packed)) a2dp_ldac_t; +- + #elif __BYTE_ORDER == __BIG_ENDIAN + + typedef struct { +@@ -228,12 +228,6 @@ + uint8_t bitrate3; + } __attribute__ ((packed)) a2dp_aac_t; + +-typedef struct { +- a2dp_vendor_codec_t info; +- uint8_t frequency:4; +- uint8_t channel_mode:4; +-} __attribute__ ((packed)) a2dp_aptx_t; +- + #else + #error "Unknown byte order" + #endif