Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

libusbmuxd, libimobiledevice: Fix CVE-2016-5104

(cherry picked from commit 77f2fff41d636ae9f7c599f55abdf006a2180066)

+16 -3
+8 -2
pkgs/development/libraries/libimobiledevice/default.nix
··· 1 - { stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, libgcrypt, 2 libtasn1, libplist, readline, libusbmuxd, openssl }: 3 4 stdenv.mkDerivation rec { ··· 8 buildInputs = [ readline ]; 9 propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ]; 10 11 - patches = [ ./disable_sslv3.patch ]; 12 13 postPatch = ''sed -e 's@1\.3\.21@@' -i configure''; 14 passthru.swig = libplist.swig;
··· 1 + { stdenv, fetchurl, fetchpatch, python, pkgconfig, usbmuxd, glib, libgcrypt, 2 libtasn1, libplist, readline, libusbmuxd, openssl }: 3 4 stdenv.mkDerivation rec { ··· 8 buildInputs = [ readline ]; 9 propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ]; 10 11 + patches = [ 12 + ./disable_sslv3.patch 13 + (fetchpatch { # CVE-2016-5104 14 + url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch"; 15 + sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1"; 16 + }) 17 + ]; 18 19 postPatch = ''sed -e 's@1\.3\.21@@' -i configure''; 20 passthru.swig = libplist.swig;
+8 -1
pkgs/development/libraries/libusbmuxd/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, libplist }: 2 3 stdenv.mkDerivation rec { 4 name = "libusbmuxd-1.0.10"; ··· 6 url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; 7 sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; 8 }; 9 10 nativeBuildInputs = [ pkgconfig ]; 11 buildInputs = [ libplist ];
··· 1 + { stdenv, fetchurl, fetchpatch, pkgconfig, libplist }: 2 3 stdenv.mkDerivation rec { 4 name = "libusbmuxd-1.0.10"; ··· 6 url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; 7 sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; 8 }; 9 + 10 + patches = [ 11 + (fetchpatch { # CVE-2016-5104 12 + url = "https://github.com/libimobiledevice/libusbmuxd/commit/4397b3376dc4e4cb1c991d0aed61ce6482614196.patch"; 13 + sha256 = "0cl3vys7bkwbdzf64d0rz3zlqpfc30w4l7j49ljv01agh42ywhgk"; 14 + }) 15 + ]; 16 17 nativeBuildInputs = [ pkgconfig ]; 18 buildInputs = [ libplist ];