bluez: CVE-2018-10910

This commit is contained in:
Marek Mahut 2019-06-17 20:00:10 +02:00 committed by Frederik Rietdijk
parent 58cbb1b9e2
commit ad2aa38006

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
python3, readline, udev, libical, systemd, python3, readline, udev, libical, systemd, fetchpatch,
enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }: enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,7 +23,19 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "test" ]; outputs = [ "out" "dev" "test" ];
patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; 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 = '' postConfigure = ''
substituteInPlace tools/hid2hci.rules \ substituteInPlace tools/hid2hci.rules \