bluez: 5.50 -> 5.51

Also add new configuration flag options and enable them for the bluezFull package by default.
This commit is contained in:
Bastian Köcher 2019-09-26 08:22:02 +02:00 committed by André-Patrick Bubel
parent 9e144d5527
commit 19f42620ef
No known key found for this signature in database
GPG key ID: 28925CBA8869FF29
3 changed files with 26 additions and 84 deletions

View file

@ -1,61 +0,0 @@
Submitted By: Armin K. <krejzi at email dot com>
Date: 2013-04-29
Initial Package Version: 5.17
Upstream Status: unknown
Origin: Arch Linux (Giovanni Campagna)
Description: 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

View file

@ -1,13 +1,21 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
python3, readline, udev, libical, systemd, fetchpatch,
enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }:
{ stdenv, lib, fetchurl, pkgconfig, dbus, glib, alsaLib,
python3, readline, udev, libical, systemd, json_c,
enableHealth ? false,
enableMesh ? false,
enableMidi ? false,
enableNfc ? false,
enableSap ? false,
enableSixaxis ? false,
enableWiimote ? false,
}:
stdenv.mkDerivation rec {
name = "bluez-5.50";
version = "5.51";
name = "bluez-${version}";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z";
sha256 = "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb";
};
pythonPath = with python3.pkgs; [
@ -17,26 +25,12 @@ stdenv.mkDerivation rec {
buildInputs = [
dbus glib alsaLib python3 python3.pkgs.wrapPython
readline udev libical
];
] ++ lib.optional enableSap json_c;
nativeBuildInputs = [ pkgconfig ];
outputs = [ "out" "dev" "test" ];
patches = [
./bluez-5.37-obexd_without_systemd-1.patch
(fetchpatch {
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102";
name = "CVE-2018-10910-1.patch";
sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4";
})
(fetchpatch {
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984";
name = "CVE-2018-10910-2.patch";
sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn";
})
];
postConfigure = ''
substituteInPlace tools/hid2hci.rules \
--replace /sbin/udevadm ${systemd}/bin/udevadm \
@ -54,9 +48,14 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
"--with-udevdir=${placeholder "out"}/lib/udev"
] ++ optional enableWiimote [ "--enable-wiimote" ]
] ++ optional enableHealth [ "--enable-health" ]
++ optional enableMesh [ "--enable-mesh" ]
++ optional enableMidi [ "--enable-midi" ]
++ optional enableSixaxis [ "--enable-sixaxis" ]);
++ optional enableNfc [ "--enable-nfc" ]
++ optional enableSap [ "--enable-sap" ]
++ optional enableSixaxis [ "--enable-sixaxis" ]
++ optional enableWiimote [ "--enable-wiimote" ]
);
# Work around `make install' trying to create /var/lib/bluetooth.
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";

View file

@ -15853,9 +15853,13 @@ in
bluez = bluez5;
bluezFull = bluez.override {
enableWiimote = true;
enableHealth = true;
enableMesh = true;
enableMidi = true;
enableNfc = true;
enableSap = true;
enableSixaxis = true;
enableWiimote = true;
};
inherit (python3Packages) bedup;