commit: fe8bf6f8195c124bc74b3bdee301b594dbf4ff82
Author: layman <layman <AT> localhost>
AuthorDate: Mon Mar 14 01:06:01 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fe8bf6f8
net-wireless/bluez: in tree version 5.37 works
Package-Manager: portage-2.2.26
net-wireless/bluez/Manifest | 14 --
net-wireless/bluez/bluez-5.23-r99.ebuild | 205 ---------------------
...-obexd-without-systemd-in-the-user-sessio.patch | 58 ------
...erial.c-use-posix_openpt-instead-of-getpt.patch | 37 ----
...-GLib-helper-function-to-manipulate-paths.patch | 38 ----
...01-tools-Fix-compilation-errors-with-musl.patch | 189 -------------------
...-Logitech-diNovo-Edge-keyboard-firmware-i.patch | 29 ---
.../0002-autopair-Don-t-handle-the-iCade.patch | 47 -----
.../0004-agent-Assert-possible-infinite-loop.patch | 25 ---
net-wireless/bluez/files/bluetooth-init.d-r3 | 21 ---
.../bluez/files/bluez-5.23-use-posix_openpt.patch | 20 --
net-wireless/bluez/files/bluez-plugdev.patch | 14 --
net-wireless/bluez/files/rfcomm-init.d-r2 | 35 ----
net-wireless/bluez/metadata.xml | 25 ---
14 files changed, 757 deletions(-)
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
deleted file mode 100644
index 7febf2d..0000000
--- a/net-wireless/bluez/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch 1907
SHA256 4c07ccb23953e83d805b8b0c726a08121dc17deb26f7571bca32dfafe7bd2881 SHA512
17a0967ac291be3822e2be73912ab4c1720564bdce0765582e54bc0347d0477d38f82dbf0db9d660f982c35b3c2ea13dd37b22e18223d36745306c4c9d859423
WHIRLPOOL
67a3ab27c5f6bb15894f1fb55c9947fd97c9e64c380fe0f52540887c12f7052d54b34c2cbda3f62bcf27888c2400ddac9b239a138383f74ad28616aebefdae84
-AUX 0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch 1074 SHA256
5384d81e2feaa11268f69036385ae91f2ed5e357df6300c337e88fe5bdf06fef SHA512
620b304749e6f1e725eb9fd19a7e69cc704c5da5f4676a310bb2101eac676dcf47c64a7998403fc3f7929330da5fb5e84ef93c58f7d41aee86deb136c45c1784
WHIRLPOOL
cc09186ac50689a3f12580e6c787f91d21dabd9723e0fa7a2ea85ff8a155dd17f58a7f0706d5451d3d269b94884c7baf46f0fa112c5cc15f50c4ade0cd2af6c3
-AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 SHA256
86e3d24527f44c5a225e6d92457be52026481a7ac0d7944700ef4445d8afc8b4 SHA512
774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
WHIRLPOOL
a88e1a061ed3989251a7e350e5a2f44b3d83ca388456652e28408a37e474e6afbd3b48e25b0ebc27b90e515d62987bac05a99087d5fe337ab2ec245c2d4edd3c
-AUX 0001-tools-Fix-compilation-errors-with-musl.patch 4795 SHA256
33adc09786a5f0c07b6e8cc89d869bd27363a53c07b9d13841773540f708e207 SHA512
ce6175a6a52ad8fae11a59a80a82f6a3ebdf3e9b65e8c7a9251c4e41c55a3ea20266912ef7f259d2960acc6702c0f0a761819c24b80c605d1129b2838a3ff725
WHIRLPOOL
81b174ad64e49b2c7947021ba696f61346e1621acb509f94a2e49baee85d696efdc73546f1c2bd9390adfe6567aca673f8d774034f70f2855d2a2727854d9c8e
-AUX 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch 1165
SHA256 1c3cab160520c0f60a8b5b1e479d70a92c3564d951aca34caa8b837cdba3a5cd SHA512
928c0bbd0e2d231385a979c9c2247e6840c66520a0c5e0075f2c075ee73f424cf3b7b2469d834d839e356bf28629b05b2f179446594e090f6b0f7a3ea7822f97
WHIRLPOOL
b7ab7f22cc77f0da2030f19dddd1a42a457676e7f3c55bef09cdc42eab5faf497d1ef7568deece347086e8ca6a6d196694dda8ddf5cc9f66c0bfce3c0cc45a6b
-AUX 0002-autopair-Don-t-handle-the-iCade.patch 1412 SHA256
219c595ea7d022abc70221f99861815b248c46f45eef66006e7a77a0c9bd8911 SHA512
7911d0461a2720a083369c03038d6a6c69218756733c72f79eccd2e13821ecdba30649cd38a5e2427e1b79473809610020bd16a6aab55b35ac4136319c5832b3
WHIRLPOOL
b9e7f4dbb48bde12259d75a3a4e65d1284415a70047776f52588c795ed7216c634b31b559545425dcd44b41454327ce50bd95289be5bb94132e6ed245c2bfa97
-AUX 0004-agent-Assert-possible-infinite-loop.patch 583 SHA256
7164b3c2e759336f926210b923b917ee5b3098024fd7a46d39cfe0c0e463ddb3 SHA512
f3af46b27180f500c3f978799633b7a01a9d7720eafdb7a9fb108684161616b976b42d135a2358785830c26642ef7c2175d0f1fa3d6df898fe3bd5e77f6a191d
WHIRLPOOL
4c6ecb787db4e3922652433940e734de9c1755be9cd73a27cd0e1b62ca470c76962fef666aff1b2932e306772b5879f34bae366619bb173ae1f92a0cfeff5e3f
-AUX bluetooth-init.d-r3 571 SHA256
de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7 SHA512
e5f550a8c0b5c9e8902c920b1bd1ef120698b568fe38220eae2d49099e364ea7b05e3026356e857666a515bb9137c92a774ca1fc70a2b6814b4d03fe29c2ccc2
WHIRLPOOL
84a3655b8b13985759365ac220a27fcc18cdf97373032e2040cf4a5b27a8b1a5df92aa6b45e92442010b338419d82c4f9548af03602c101e9f34d623e4b1b174
-AUX bluez-5.23-use-posix_openpt.patch 594 SHA256
6d8f641577b769629d501aae34bcd9dba82307a93309f94a304a90b2e0b2a64c SHA512
e61fb667d2f67f90df495feba25211a2caf2a09336165859d90b9224caa6b61c256dc4b124375a2d40547f0030e03185abc358e2224638acdecf12d02c6af0e9
WHIRLPOOL
a21870b9077d2c041168945fd3d8cfdb2921e20ac42535a46d6cd4a98ea8761272f2fecb7e40029bb330f1e7ec9297256f2b2db442a570bac134350ed0d4602d
-AUX bluez-plugdev.patch 469 SHA256
ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2 SHA512
b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2
WHIRLPOOL
6364590d80d811e55e2f696ba0b57c0173bac859e69de284bbcc3b511c7ea639d48dd7451e5a4abe8746b8c0986867cb680b291880e6a6ada03004e0c72c2583
-AUX rfcomm-init.d-r2 661 SHA256
e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09 SHA512
ec3968c79bd4b0ac57f4a0fd2f286b3380951af183c68ae9c9b57339d74931d98984b3594c9e10db9f61eb2160e214572a4bae8885cd4ff9192dbbfc357d20a5
WHIRLPOOL
c37f516e2485c21d4613b821d53c2f2782ffa50a1cc4263ea8bd44c064088651c05c4880edd397fdc20b0c5f0805bef6a06ec0606748f16cd67dd7e35757fe34
-DIST bluez-5.23.tar.xz 1426660 SHA256
cdabd38d7ac8dd392a77ce7d76d5c120b277e4115040ba5d3ab91c05ab37f2c1 SHA512
5cbb5c34963c5b70badab618018eda5017b44d240c3a47b4bbaf88e41b67617c5a299a21509a917ef3bb91be79032aa10837138283b6510e2829a6be1554ef92
WHIRLPOOL
c3049637a97c80301307fa8ce7618763df706223d103e6a79c41eecc68203bcd0f999f8f523048acac6f07884ce4ecbc0ef9e2f80bbdafacbbef289fb9531fc8
-EBUILD bluez-5.23-r99.ebuild 5520 SHA256
b257a7aaad8f43b8997570b42131d9c9086ec8dc9b574eb51829b75118edfb95 SHA512
1fa9bab18bf825dec4dd3cc4df68f5b7d9713f0709e307d11215b14e864a5eb822d8a09f5b30d9aa6298d3fda743ff55ffa2b4cecccfd3e4979a667277a392f8
WHIRLPOOL
1d0cc853a7355a47b06dab2a56aed1ad41f50e2396a6f3f63c9a3c91167fb14e3c782e8eecf5166b712b3625dbdcd2502825d4832d6958914cbd07d277ced323
-MISC metadata.xml 1009 SHA256
2c1e87879382a493a11c72412ae6a4e03cbbc630fad8e409e9c7091ba6c5f982 SHA512
68cad4ca9dcda52180cb5dadd69fa34e6ab38c2474f8e66ca62ef5f02799c4ac4ba25f972fc94c92ff93daa7371a6f1d06705018fe87cdcbe5fe2e8e7be29134
WHIRLPOOL
2b44c74d582c5c8bd0c2c8ca0c82e1af2ce5b0fa43c2e0ef28307d5df95fb1603cf2f95a6d0e31fd04f5fc3c79ba11fc3f557f4fd1c128f2e751e227cb071526
diff --git a/net-wireless/bluez/bluez-5.23-r99.ebuild
b/net-wireless/bluez/bluez-5.23-r99.ebuild
deleted file mode 100644
index 467772e..0000000
--- a/net-wireless/bluez/bluez-5.23-r99.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.23.ebuild,v 1.2
2014/09/25 09:11:55 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit autotools eutils multilib python-any-r1 readme.gentoo 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 ~mips ppc x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/glib-2.28:2
- >=sys-apps/dbus-1.6:=
- >=sys-apps/hwids-20121202.2
- cups? ( net-print/cups:= )
- obex? ( dev-libs/libical )
- readline? ( sys-libs/readline:= )
- selinux? ( sec-policy/selinux-bluetooth )
- systemd? ( sys-apps/systemd )
- udev? ( >=virtual/udev-172 )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- >=dev-python/dbus-python-1
- dev-python/pygobject:2
- dev-python/pygobject:3
- )
-"
-
-DOC_CONTENTS="
- If you want to use rfcomm as a normal user, you need to add the user
- to the uucp group.
-"
-
-pkg_setup() {
- enewgroup plugdev
- use test && python-any-r1_pkg_setup
-
- 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() {
- # Use static group "plugdev" if there is no ConsoleKit (or systemd
logind)
- epatch "${FILESDIR}"/bluez-plugdev.patch
-
- # Fedora patches
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- epatch
"${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
- epatch
"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg41264.html
- epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
- # ???
- epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
- # Ubuntu workaround for bug #501120
- epatch
"${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
- # Patches for musl
- epatch "${FILESDIR}"/0001-tools-Fix-compilation-errors-with-musl.patch
- epatch
"${FILESDIR}"/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
-
- if use cups; then
- sed -i \
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config
--serverbin):" \
- Makefile.{in,tools} || die
- fi
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- # readline is automagic when client is enabled
- # --enable-client always needs readline, bug #504038
- ac_cv_header_readline_readline_h=$(multilib_native_usex
readline)
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # deps not used for the library
- {DBUS,GLIB}_{CFLAGS,LIBS}=' '
- )
- fi
-
- # Missing flags: experimental (sap, nfc, ...)
- econf \
- --localstatedir=/var \
- --disable-android \
- --enable-datafiles \
- --enable-experimental \
- --enable-optimization \
- $(use_enable debug) \
- --enable-pie \
- --enable-threads \
- --enable-library \
- $(multilib_native_use_enable test) \
- --enable-tools \
- --enable-manpages \
- --enable-monitor \
- $(multilib_native_use_enable cups) \
- $(multilib_native_use_enable obex) \
- $(multilib_native_use_enable readline client) \
- $(multilib_native_use_enable systemd) \
- $(systemd_with_unitdir) \
- $(multilib_native_use_enable udev) \
- $(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -f Makefile -f - libs \
- <<<'libs: $(lib_LTLIBRARIES)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
-
- # Unittests are not that useful once installed
- if use test ; then
- rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
- fi
- else
- emake DESTDIR="${D}" \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-
- keepdir /var/lib/bluetooth
-
- # Upstream don't want people to play with them
- # But we keep installing them due 'historical' reasons
- insinto /etc/bluetooth
- local d
- for d in input network proximity; do
- doins profiles/${d}/${d}.conf
- done
- doins src/main.conf
- doins src/bluetooth.conf
-
-# FIXME:
-# Looks like upstream installs it only for systemd, probably not needed
-# insinto /usr/share/dbus-1/system-services
-# doins src/org.bluez.service
-
- newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
- newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
-
- einstalldocs
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- use udev && udev_reload
-
- has_version net-dialup/ppp || elog "To use dial up networking you must
install net-dialup/ppp."
-
- if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd;
then
- elog "Since you don't have sys-auth/consolekit neither
sys-apps/systemd, you will only"
- elog "be able to run bluetooth clients as root. If you want to
be able to run bluetooth clients as"
- elog "a regular user, you need to add the user to the plugdev
group."
- fi
-}
diff --git
a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
deleted file mode 100644
index 1ea3e6f..0000000
---
a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <[email protected]>
-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..0000000
---- 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 0000000..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/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
b/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
deleted file mode 100644
index 766734a..0000000
---
a/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 57c33317f5c3f6d21a9b3c56f8d1e97179e4c457 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <[email protected]>
-Date: Sat, 4 Oct 2014 09:34:05 -0400
-Subject: [PATCH] emulator/serial.c: use posix_openpt() instead of getpt()
-
-getpt(3) is glibc-specific and is not provided on musl. Instead, we
-use use posix_openpt(3) which is equivalent and portable.
-
-Signed-off-by: Anthony G. Basile <[email protected]>
----
- emulator/serial.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/emulator/serial.c b/emulator/serial.c
-index 9583be4..8b49dc6 100644
---- a/emulator/serial.c
-+++ b/emulator/serial.c
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/epoll.h>
- #include <sys/uio.h>
-@@ -160,7 +161,7 @@ static void open_pty(struct serial *serial)
- {
- enum btdev_type uninitialized_var(type);
-
-- serial->fd = getpt();
-+ serial->fd = posix_openpt(O_RDWR | O_NOCTTY);
- if (serial->fd < 0) {
- perror("Failed to get master pseudo terminal");
- return;
---
-2.0.4
-
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 004a389..0000000
---
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 <[email protected]>
-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, &name,
- 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/0001-tools-Fix-compilation-errors-with-musl.patch
b/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch
deleted file mode 100644
index 501e75a..0000000
--- a/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 51ec4fd847369bc77e72850fe93d727ae9c656b9 Mon Sep 17 00:00:00 2001
-From: Szymon Janc <[email protected]>
-Date: Fri, 19 Sep 2014 16:10:07 +0200
-Subject: [PATCH] tools: Fix compilation errors with musl
-
-This fix number of includes for <sys/poll.h> instead of <poll.h>
-
- CC tools/hciattach.o
-In file included from tools/hciattach.c:41:0:
-/usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect
- #include <sys/poll.h> to <poll.h> [-Werror=cpp]
- #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
- ^
----
- tools/amptest.c | 2 +-
- tools/btattach.c | 2 +-
- tools/btsnoop.c | 1 +
- tools/ciptool.c | 2 +-
- tools/cltest.c | 2 +-
- tools/hciattach.c | 2 +-
- tools/hciattach_qualcomm.c | 2 +-
- tools/hciattach_tialt.c | 2 +-
- tools/hcidump.c | 2 +-
- tools/l2ping.c | 2 +-
- tools/l2test.c | 2 +-
- tools/rfcomm.c | 2 +-
- 12 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/tools/amptest.c b/tools/amptest.c
-index 6192f7e..bba0a9a 100644
---- a/tools/amptest.c
-+++ b/tools/amptest.c
-@@ -32,7 +32,7 @@
- #include <alloca.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/btattach.c b/tools/btattach.c
-index 9458fd7..bdbbe16 100644
---- a/tools/btattach.c
-+++ b/tools/btattach.c
-@@ -35,7 +35,7 @@
- #include <getopt.h>
- #include <termios.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
-+#include <poll.h>
-
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/hci.h>
-diff --git a/tools/btsnoop.c b/tools/btsnoop.c
-index 14581f2..71191eb 100644
---- a/tools/btsnoop.c
-+++ b/tools/btsnoop.c
-@@ -35,6 +35,7 @@
- #include <stdbool.h>
- #include <string.h>
- #include <getopt.h>
-+#include <endian.h>
- #include <arpa/inet.h>
- #include <sys/stat.h>
-
-diff --git a/tools/ciptool.c b/tools/ciptool.c
-index 72338dc..3ff9fb1 100644
---- a/tools/ciptool.c
-+++ b/tools/ciptool.c
-@@ -32,7 +32,7 @@
- #include <string.h>
- #include <getopt.h>
- #include <signal.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/cltest.c b/tools/cltest.c
-index 4ddb98a..0231805 100644
---- a/tools/cltest.c
-+++ b/tools/cltest.c
-@@ -32,7 +32,7 @@
- #include <alloca.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/hciattach.c b/tools/hciattach.c
-index 1904ac5..d8ef7e7 100644
---- a/tools/hciattach.c
-+++ b/tools/hciattach.c
-@@ -37,8 +37,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
-
-diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
-index eb72a0f..0e25905 100644
---- a/tools/hciattach_qualcomm.c
-+++ b/tools/hciattach_qualcomm.c
-@@ -36,8 +36,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/uio.h>
-diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
-index 5c7f3a5..a7c1706 100644
---- a/tools/hciattach_tialt.c
-+++ b/tools/hciattach_tialt.c
-@@ -35,8 +35,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/uio.h>
-diff --git a/tools/hcidump.c b/tools/hcidump.c
-index 37a9f00..8839eb0 100644
---- a/tools/hcidump.c
-+++ b/tools/hcidump.c
-@@ -33,7 +33,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <getopt.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-diff --git a/tools/l2ping.c b/tools/l2ping.c
-index 29fb3d0..3dd437e 100644
---- a/tools/l2ping.c
-+++ b/tools/l2ping.c
-@@ -35,7 +35,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/socket.h>
-
- #include <bluetooth/bluetooth.h>
-diff --git a/tools/l2test.c b/tools/l2test.c
-index 67ca70a..71ad109 100644
---- a/tools/l2test.c
-+++ b/tools/l2test.c
-@@ -38,7 +38,7 @@
- #include <syslog.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/rfcomm.c b/tools/rfcomm.c
-index b5bea38..659bbec 100644
---- a/tools/rfcomm.c
-+++ b/tools/rfcomm.c
-@@ -34,7 +34,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <termios.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
---
-2.0.4
-
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..0000000
---
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 <[email protected]>
-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/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 68751ae..0000000
--- 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 <[email protected]>
-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/0004-agent-Assert-possible-infinite-loop.patch
b/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
deleted file mode 100644
index 2746e0c..0000000
--- a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[email protected]>
-Date: Mon, 9 Dec 2013 18:04:56 +0100
-Subject: [PATCH 4/5] agent: Assert possible infinite loop
-
----
- src/agent.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/agent.c b/src/agent.c
-index bcba969..b292881 100644
---- a/src/agent.c
-+++ b/src/agent.c
-@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent)
- if (agent->ref > 0)
- return;
-
-+ g_assert (agent->ref == 0);
-+
- if (agent->request) {
- DBusError err;
- agent_pincode_cb pincode_cb;
---
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r3
b/net-wireless/bluez/files/bluetooth-init.d-r3
deleted file mode 100644
index f97fdb2..0000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r3,v 1.2
2014/01/09 13:24:42 joker Exp $
-
-depend() {
- after coldplug
- need dbus localmount hostname
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --background --exec
/usr/libexec/bluetooth/bluetoothd
- eend $?
-}
-
-stop() {
- ebegin "Shutting down ${SVCNAME}"
- start-stop-daemon --stop --quiet --exec
/usr/libexec/bluetooth/bluetoothd
- eend $?
-}
diff --git a/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
b/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
deleted file mode 100644
index 3630df6..0000000
--- a/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur bluez-5.23.orig/emulator/serial.c bluez-5.23/emulator/serial.c
---- bluez-5.23.orig/emulator/serial.c 2014-08-06 17:25:36.000000000 +0000
-+++ bluez-5.23/emulator/serial.c 2014-10-04 13:02:38.081336391 +0000
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/epoll.h>
-
-@@ -159,7 +160,7 @@
- {
- enum btdev_type uninitialized_var(type);
-
-- serial->fd = getpt();
-+ serial->fd = posix_openpt(O_RDWR | O_NOCTTY);
- if (serial->fd < 0) {
- perror("Failed to get master pseudo terminal");
- return;
diff --git a/net-wireless/bluez/files/bluez-plugdev.patch
b/net-wireless/bluez/files/bluez-plugdev.patch
deleted file mode 100755
index 726838a..0000000
--- a/net-wireless/bluez/files/bluez-plugdev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf
---- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100
-+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200
-@@ -17,6 +17,10 @@
- <allow send_destination="org.bluez"/>
- </policy>
-
-+ <policy group="plugdev">
-+ <allow send_destination="org.bluez"/>
-+ </policy>
-+
- <policy context="default">
- <deny send_destination="org.bluez"/>
- </policy>
diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2
b/net-wireless/bluez/files/rfcomm-init.d-r2
deleted file mode 100755
index c564055..0000000
--- a/net-wireless/bluez/files/rfcomm-init.d-r2
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d-r2,v
1.1 2014/06/26 17:18:43 alonbl Exp $
-
-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 $?
-}
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
deleted file mode 100644
index b765ca4..0000000
--- a/net-wireless/bluez/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- <name>Pacho Ramos</name>
- </maintainer>
- <use>
- <flag name="extra-tools">Install tools that upstream doesn't install on
- purpose by default. All this tools shouldn't be used. Then, please
- notify upstream about you still need them to let them know the
- situation.</flag>
- <flag name="test-programs">Install tools for testing of
- various Bluetooth functions</flag>
- <flag name="hid2hci">The HID proxying makes the keyboard / mouse show up
- as regular USB HID devices, but needs them to be
- paired before enabling this, otherwise they won't be
- detected</flag>
- <flag name="obex">Enable OBEX transfer support.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
- <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
- </upstream>
-</pkgmetadata>
