Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e38c0e7486d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24f13c23cc43
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 25, 2019

  1. bluez: CVE-2018-10910 

    (cherry picked from commit 7fdb0d28d724998fdabce5868a19bf77c3115974)
    @mmahut @worldofpeace
    mmahut authored and worldofpeace committed Jun 25, 2019
    Copy the full SHA
    638bddf View commit details

Commits on Jun 28, 2019

  1. Merge branch 'staging-19.03' into release-19.03

    @vcunat
    vcunat committed Jun 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    AluisioASG Aluísio Augusto Silva Gonçalves
    GPG key ID: DA6EA2FACDB1CBD2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24f13c2 View commit details
Showing with 14 additions and 2 deletions.
  1. +14 −2 pkgs/os-specific/linux/bluez/default.nix
16 changes: 14 additions & 2 deletions pkgs/os-specific/linux/bluez/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
python3, readline, udev, libical, systemd,
python3, readline, udev, libical, systemd, fetchpatch,
enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }:

stdenv.mkDerivation rec {
@@ -23,7 +23,19 @@ stdenv.mkDerivation rec {

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 = ''
substituteInPlace tools/hid2hci.rules \