summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Gurr Timo <tgurr@exherbo.org> 2017-09-14 18:47:25 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-09-14 18:55:17 +0200
commit4c4139d6a09a589dddf03eb2dea08e5f890756bf (patch)
tree726872253eb74d6d995fb2752df6123a2de7fe0f
parent18ee5a5d93dd98426c8cd07cf766d5a7e6d3aa44 (diff)
downloadhardware-4c4139d6a09a589dddf03eb2dea08e5f890756bf.tar.gz
hardware-4c4139d6a09a589dddf03eb2dea08e5f890756bf.tar.xz
bluez: version bump to 5.47
Change-Id: I65c02f83fda8c0b9757c137b9933968a57b658fd Reviewed-on: https://galileo.mailstation.de/gerrit/10062 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/net-wireless/bluez/bluez-5.47.exheres-0 (renamed from packages/net-wireless/bluez/bluez-5.46-r1.exheres-0)1
-rw-r--r--packages/net-wireless/bluez/bluez.exlib22
-rw-r--r--packages/net-wireless/bluez/files/CVE-2017-1000250.patch27
3 files changed, 13 insertions, 37 deletions
diff --git a/packages/net-wireless/bluez/bluez-5.46-r1.exheres-0 b/packages/net-wireless/bluez/bluez-5.47.exheres-0
index 7a8380f..5554a54 100644
--- a/packages/net-wireless/bluez/bluez-5.46-r1.exheres-0
+++ b/packages/net-wireless/bluez/bluez-5.47.exheres-0
@@ -8,6 +8,5 @@ PLATFORMS="~amd64 ~x86"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
- "${FILES}"/CVE-2017-1000250.patch
)
diff --git a/packages/net-wireless/bluez/bluez.exlib b/packages/net-wireless/bluez/bluez.exlib
index a8bbdf5..47b7a92 100644
--- a/packages/net-wireless/bluez/bluez.exlib
+++ b/packages/net-wireless/bluez/bluez.exlib
@@ -19,7 +19,7 @@ efficient and uses a modular implementation. It has many interesting features:
* Standard socket interface to all layers
* Device and service level security support
"
-HOMEPAGE="http://www.${PN}.org"
+HOMEPAGE="https://www.${PN}.org"
DOWNLOADS="mirror://kernel/linux/bluetooth/${PNV}.tar.xz"
LICENCES="GPL-2 LGPL-2.1"
@@ -34,11 +34,12 @@ MYOPTIONS="
( providers: eudev systemd ) [[ number-selected = exactly-one ]]
"
-if ever at_least 5.0 ; then
+if ever at_least 5.47 ; then
MYOPTIONS+="
- deprecated [[ description = [ build deprecated tools (hciattach, hcitool, ...) ] ]]
+ deprecated [[ description = [ Build deprecated tools (hciattach, hcitool, ...) ] ]]
+ mesh [[ description = [ Bluetooth Low Energy (LE) Mesh profile support ] ]]
nfc [[ description = [ Enable NFC pairing ] ]]
- obex [[ description = [ include the OBEX profile (calendaring) ] ]]
+ obex [[ description = [ Include the OBEX profile (calendaring) ] ]]
"
else
MYOPTIONS+="
@@ -49,7 +50,7 @@ else
]]
legacy [[ description = [ Install the deprecated dund, hidd, and pand daemons ] ]]
pcmcia [[ description = [ Install udev rules and scripts for PCMCIA devices ] ]]
- usb [[ description = [ enable support for USB devices including the tools hid2hci (needed to use some dell, logitech, and csr devices) and dfutool (used to update the device firmware) ] ]]
+ usb [[ description = [ Enable support for USB devices including the tools hid2hci (needed to use some dell, logitech, and csr devices) and dfutool (used to update the device firmware) ] ]]
"
fi
@@ -66,11 +67,12 @@ DEPENDENCIES="
cups? ( net-print/cups )
"
-if ever at_least 5.0 ; then
+if ever at_least 5.47 ; then
DEPENDENCIES+="
build+run:
sys-apps/dbus[>=1.6]
sys-libs/readline:=
+ mesh? ( dev-libs/json-c )
obex? ( office-libs/libical )
run:
nfc? ( net/neard )
@@ -110,7 +112,7 @@ fi
DEFAULT_SRC_CONFIGURE_PARAMS=( --localstatedir=/var )
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( cups )
-if ever at_least 5.0 ; then
+if ever at_least 5.47 ; then
DEFAULT_SRC_CONFIGURE_PARAMS+=(
--enable-a2dp
--enable-avrcp
@@ -132,10 +134,13 @@ if ever at_least 5.0 ; then
--enable-udev
--disable-android
--with-systemdsystemunitdir=${SYSTEMDSYSTEMUNITDIR}
+ --with-systemduserunitdir=${SYSTEMDUSERUNITDIR}
+ --with-udevdir=${UDEVDIR}
)
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES+=(
'alsa midi'
deprecated
+ mesh
nfc
obex
systemd
@@ -164,10 +169,9 @@ bluez_src_install() {
default
insinto /etc/bluetooth
- if ever at_least 5.0 ; then
+ if ever at_least 5.47 ; then
doins profiles/input/input.conf
doins profiles/network/network.conf
- doins profiles/proximity/proximity.conf
doins src/main.conf
else
diff --git a/packages/net-wireless/bluez/files/CVE-2017-1000250.patch b/packages/net-wireless/bluez/files/CVE-2017-1000250.patch
deleted file mode 100644
index 1d122d6..0000000
--- a/packages/net-wireless/bluez/files/CVE-2017-1000250.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream: yes
-From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Wed, 13 Sep 2017 10:01:40 +0300
-Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function
-
-Check if there is enough data to continue otherwise return an error.
----
- src/sdpd-request.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sdpd-request.c b/src/sdpd-request.c
-index 1eefdce..318d044 100644
---- a/src/sdpd-request.c
-+++ b/src/sdpd-request.c
-@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf)
- } else {
- /* continuation State exists -> get from cache */
- sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
-- if (pCache) {
-+ if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) {
- uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
- pResponse = pCache->data;
- memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
---
-cgit v1.1
-