1 |
commit: db3448b335b66ad791293cc025596669ae15a683 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 8 07:54:57 2021 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 8 07:54:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3448b3 |
7 |
|
8 |
net-wireless/bluez: Drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
net-wireless/bluez/Manifest | 1 - |
14 |
net-wireless/bluez/bluez-5.59-r1.ebuild | 292 --------------------- |
15 |
.../bluez/files/bluez-5.59-a2dp-parsing.patch | 38 --- |
16 |
3 files changed, 331 deletions(-) |
17 |
|
18 |
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest |
19 |
index cd48d873ea1..1320549d38b 100644 |
20 |
--- a/net-wireless/bluez/Manifest |
21 |
+++ b/net-wireless/bluez/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 |
24 |
-DIST bluez-5.59.tar.xz 2123104 BLAKE2B 59e063ffc0cd810a151f49c2d8b3e1dca46eef038dfe112bfc0524e111e00cfea78557f3d1ccf657882b76158ee9249291f9fc6e6a4cce851e0e6dc43f707398 SHA512 506ce28459a82614e5f6c55235b84e5780a9bfa821904fd40ee2928a503978248368069c57a283db9dd81f48d78f45e00d95a7c52d1538d3f5c858a29424304f |
25 |
DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b |
26 |
|
27 |
diff --git a/net-wireless/bluez/bluez-5.59-r1.ebuild b/net-wireless/bluez/bluez-5.59-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 898115e910a..00000000000 |
30 |
--- a/net-wireless/bluez/bluez-5.59-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,292 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
-PYTHON_COMPAT=( python3_{7..10} ) |
38 |
- |
39 |
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal |
40 |
- |
41 |
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux" |
42 |
-HOMEPAGE="http://www.bluez.org" |
43 |
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" |
44 |
- |
45 |
-LICENSE="GPL-2+ LGPL-2.1+" |
46 |
-SLOT="0/3" |
47 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" |
48 |
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" |
49 |
- |
50 |
-# Since this release all remaining extra-tools need readline support, but this could |
51 |
-# change in the future, hence, this REQUIRED_USE constraint could be dropped |
52 |
-# again in the future. |
53 |
-REQUIRED_USE=" |
54 |
- extra-tools? ( deprecated readline ) |
55 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
56 |
- test-programs? ( ${PYTHON_REQUIRED_USE} ) |
57 |
-" |
58 |
- |
59 |
-TEST_DEPS="${PYTHON_DEPS} |
60 |
- $(python_gen_cond_dep ' |
61 |
- >=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}] |
62 |
- dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
63 |
- ') |
64 |
-" |
65 |
-BDEPEND=" |
66 |
- dev-python/docutils |
67 |
- virtual/pkgconfig |
68 |
- test? ( ${TEST_DEPS} ) |
69 |
-" |
70 |
-DEPEND=" |
71 |
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] |
72 |
- >=sys-apps/hwids-20121202.2 |
73 |
- btpclient? ( >=dev-libs/ell-0.39 ) |
74 |
- cups? ( net-print/cups:= ) |
75 |
- mesh? ( |
76 |
- >=dev-libs/ell-0.39 |
77 |
- >=dev-libs/json-c-0.13:= |
78 |
- sys-libs/readline:0= |
79 |
- ) |
80 |
- midi? ( media-libs/alsa-lib ) |
81 |
- obex? ( dev-libs/libical:= ) |
82 |
- readline? ( sys-libs/readline:0= ) |
83 |
- systemd? ( |
84 |
- >=sys-apps/dbus-1.6:=[user-session=] |
85 |
- sys-apps/systemd |
86 |
- ) |
87 |
- !systemd? ( >=sys-apps/dbus-1.6:= ) |
88 |
- udev? ( >=virtual/udev-172 ) |
89 |
-" |
90 |
-RDEPEND="${DEPEND} |
91 |
- selinux? ( sec-policy/selinux-bluetooth ) |
92 |
- test-programs? ( ${TEST_DEPS} ) |
93 |
-" |
94 |
- |
95 |
-RESTRICT="!test? ( test )" |
96 |
- |
97 |
-PATCHES=( |
98 |
- # avdtp: Fix parsing capabilities (from 'master') |
99 |
- "${FILESDIR}"/${P}-a2dp-parsing.patch |
100 |
- |
101 |
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) |
102 |
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html |
103 |
- # https://bugs.gentoo.org/539844 |
104 |
- "${FILESDIR}"/${PN}-udevadm-path-r1.patch |
105 |
- |
106 |
- # Fedora patches |
107 |
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html |
108 |
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch |
109 |
-) |
110 |
- |
111 |
-pkg_setup() { |
112 |
- # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html |
113 |
- # to prevent bugs like: |
114 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
115 |
- CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER |
116 |
- ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL" |
117 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
118 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206815 |
119 |
- if use mesh || use test; then |
120 |
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER |
121 |
- ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" |
122 |
- fi |
123 |
- linux-info_pkg_setup |
124 |
- |
125 |
- if use test || use test-programs; then |
126 |
- python-single-r1_pkg_setup |
127 |
- fi |
128 |
- |
129 |
- if ! use udev; then |
130 |
- ewarn |
131 |
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" |
132 |
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," |
133 |
- ewarn "and hid2hci will not be available." |
134 |
- ewarn |
135 |
- fi |
136 |
-} |
137 |
- |
138 |
-src_prepare() { |
139 |
- default |
140 |
- |
141 |
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
142 |
- if ! use user-session || ! use systemd; then |
143 |
- eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch |
144 |
- fi |
145 |
- |
146 |
- eautoreconf |
147 |
- |
148 |
- if use cups; then |
149 |
- # Only not .am to not need to run eautoreconf only because of this |
150 |
- sed -i \ |
151 |
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ |
152 |
- Makefile.{in,tools} || die |
153 |
- fi |
154 |
- |
155 |
- multilib_copy_sources |
156 |
-} |
157 |
- |
158 |
-multilib_src_configure() { |
159 |
- local myconf=( |
160 |
- # readline is automagic when client is enabled |
161 |
- # --enable-client always needs readline, bug #504038 |
162 |
- # --enable-mesh is handled in the same way |
163 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline) |
164 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) |
165 |
- ) |
166 |
- |
167 |
- if ! multilib_is_native_abi; then |
168 |
- myconf+=( |
169 |
- # deps not used for the library |
170 |
- {DBUS,GLIB}_{CFLAGS,LIBS}=' ' |
171 |
- ) |
172 |
- fi |
173 |
- |
174 |
- econf \ |
175 |
- --localstatedir=/var \ |
176 |
- --disable-android \ |
177 |
- --enable-datafiles \ |
178 |
- --enable-optimization \ |
179 |
- $(use_enable debug) \ |
180 |
- --enable-pie \ |
181 |
- --enable-threads \ |
182 |
- --enable-library \ |
183 |
- --enable-tools \ |
184 |
- --enable-manpages \ |
185 |
- --enable-monitor \ |
186 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
187 |
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \ |
188 |
- $(multilib_native_use_enable btpclient) \ |
189 |
- $(multilib_native_use_enable btpclient external-ell) \ |
190 |
- $(multilib_native_use_enable cups) \ |
191 |
- $(multilib_native_use_enable deprecated) \ |
192 |
- $(multilib_native_use_enable experimental) \ |
193 |
- $(multilib_native_use_enable mesh) \ |
194 |
- $(multilib_native_use_enable mesh external-ell) \ |
195 |
- $(multilib_native_use_enable midi) \ |
196 |
- $(multilib_native_use_enable obex) \ |
197 |
- $(multilib_native_use_enable readline client) \ |
198 |
- $(multilib_native_use_enable systemd) \ |
199 |
- $(multilib_native_use_enable test-programs test) \ |
200 |
- $(multilib_native_use_enable udev) \ |
201 |
- $(multilib_native_use_enable udev hid2hci) \ |
202 |
- $(multilib_native_use_enable udev sixaxis) |
203 |
-} |
204 |
- |
205 |
-multilib_src_compile() { |
206 |
- if multilib_is_native_abi; then |
207 |
- default |
208 |
- else |
209 |
- emake -f Makefile -f - libs \ |
210 |
- <<<'libs: $(lib_LTLIBRARIES)' |
211 |
- fi |
212 |
-} |
213 |
- |
214 |
-multilib_src_test() { |
215 |
- multilib_is_native_abi && default |
216 |
-} |
217 |
- |
218 |
-multilib_src_install() { |
219 |
- if multilib_is_native_abi; then |
220 |
- emake DESTDIR="${D}" install |
221 |
- |
222 |
- # Only install extra-tools when relevant USE flag is enabled |
223 |
- if use extra-tools; then |
224 |
- ewarn "Upstream doesn't support using this tools and their bugs are" |
225 |
- ewarn "likely to be ignored forever, also they can break without" |
226 |
- ewarn "previous announcement." |
227 |
- ewarn "Upstream also states all this tools are not really needed," |
228 |
- ewarn "then, if you still need to rely on them, you must ask them" |
229 |
- ewarn "to either install that tool by default or add the needed" |
230 |
- ewarn "functionality to the existing 'official' tools." |
231 |
- ewarn "Please report this issues to:" |
232 |
- ewarn "http://www.bluez.org/development/lists/" |
233 |
- |
234 |
- # Upstream doesn't install this, bug #524640 |
235 |
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 |
236 |
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 |
237 |
- dobin tools/btmgmt |
238 |
- # gatttool is only built with readline, bug #530776 |
239 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 |
240 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 |
241 |
- # https://bugs.archlinux.org/task/37686 |
242 |
- dobin attrib/gatttool |
243 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 |
244 |
- dobin tools/avinfo |
245 |
- fi |
246 |
- |
247 |
- # Not installed by default after being built, bug #666756 |
248 |
- use btpclient && dobin tools/btpclient |
249 |
- |
250 |
- # Unittests are not that useful once installed, so make them optional |
251 |
- if use test-programs; then |
252 |
- # Drop python2 only test tools |
253 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206819 |
254 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die |
255 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206821 |
256 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die |
257 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206823 |
258 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die |
259 |
- |
260 |
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test |
261 |
- |
262 |
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do |
263 |
- dosym "${i}" /usr/bin/bluez-"${i##*/}" |
264 |
- done |
265 |
- fi |
266 |
- else |
267 |
- emake DESTDIR="${D}" \ |
268 |
- install-pkgincludeHEADERS \ |
269 |
- install-libLTLIBRARIES \ |
270 |
- install-pkgconfigDATA |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-multilib_src_install_all() { |
275 |
- # We need to ensure obexd can be spawned automatically by systemd |
276 |
- # when user-session is enabled: |
277 |
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 |
278 |
- # https://bugs.gentoo.org/show_bug.cgi?id=577842 |
279 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 |
280 |
- # https://bugs.archlinux.org/task/45816 |
281 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 |
282 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 |
283 |
- if use user-session && use systemd; then |
284 |
- ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service |
285 |
- fi |
286 |
- |
287 |
- find "${D}" -name '*.la' -type f -delete || die |
288 |
- |
289 |
- keepdir /var/lib/bluetooth |
290 |
- |
291 |
- # Upstream don't want people to play with them |
292 |
- # But we keep installing them due to 'historical' reasons |
293 |
- insinto /etc/bluetooth |
294 |
- local d |
295 |
- for d in input network; do |
296 |
- doins profiles/${d}/${d}.conf |
297 |
- done |
298 |
- # Setup auto enable as Fedora does for allowing to use |
299 |
- # keyboards/mouse as soon as possible |
300 |
- sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die |
301 |
- doins src/main.conf |
302 |
- |
303 |
- newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth |
304 |
- newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth |
305 |
- |
306 |
- einstalldocs |
307 |
- use doc && dodoc doc/*.txt |
308 |
- # Install .json files as examples to be used by meshctl |
309 |
- if use mesh; then |
310 |
- dodoc tools/mesh-gatt/*.json |
311 |
- local DOC_CONTENTS="Some example .json files were installed into |
312 |
- /usr/share/doc/${PF} to be used with meshctl. Feel free to |
313 |
- uncompress and copy them to ~/.config/meshctl to use them." |
314 |
- readme.gentoo_create_doc |
315 |
- fi |
316 |
-} |
317 |
- |
318 |
-pkg_postinst() { |
319 |
- use udev && udev_reload |
320 |
- systemd_reenable bluetooth.service |
321 |
- |
322 |
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" |
323 |
- use mesh && readme.gentoo_print_elog |
324 |
-} |
325 |
|
326 |
diff --git a/net-wireless/bluez/files/bluez-5.59-a2dp-parsing.patch b/net-wireless/bluez/files/bluez-5.59-a2dp-parsing.patch |
327 |
deleted file mode 100644 |
328 |
index 40569ec9805..00000000000 |
329 |
--- a/net-wireless/bluez/files/bluez-5.59-a2dp-parsing.patch |
330 |
+++ /dev/null |
331 |
@@ -1,38 +0,0 @@ |
332 |
-From 0388794dc5fdb73a4ea88bcf148de0a12b4364d4 Mon Sep 17 00:00:00 2001 |
333 |
-From: Archie Pusaka <apusaka@××××××××.org> |
334 |
-Date: Thu, 17 Jun 2021 08:53:34 +0800 |
335 |
-Subject: avdtp: Fix parsing capabilities |
336 |
- |
337 |
-This patch fixes size comparison and variable misassignment. |
338 |
- |
339 |
-Reviewed-by: Alain Michaud <alainm@××××××××.org> |
340 |
-Reviewed-by: Michael Sun <michaelfsun@××××××.com> |
341 |
---- |
342 |
- profiles/audio/avdtp.c | 4 ++-- |
343 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
344 |
- |
345 |
-diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c |
346 |
-index c7bf99f42..5d13104c1 100644 |
347 |
---- a/profiles/audio/avdtp.c |
348 |
-+++ b/profiles/audio/avdtp.c |
349 |
-@@ -1323,7 +1323,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, |
350 |
- |
351 |
- cap = (struct avdtp_service_capability *)data; |
352 |
- |
353 |
-- if (sizeof(*cap) + cap->length >= size) { |
354 |
-+ if (sizeof(*cap) + cap->length > size) { |
355 |
- error("Invalid capability data in getcap resp"); |
356 |
- break; |
357 |
- } |
358 |
-@@ -1345,7 +1345,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, |
359 |
- switch (cap->category) { |
360 |
- case AVDTP_MEDIA_CODEC: |
361 |
- if (codec) |
362 |
-- *codec = cap; |
363 |
-+ *codec = cpy; |
364 |
- break; |
365 |
- case AVDTP_DELAY_REPORTING: |
366 |
- if (delay_reporting) |
367 |
--- |
368 |
-cgit 1.2.3-1.el7 |
369 |
- |