summary refs log tree commit diff
path: root/pkgs/servers/pulseaudio
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-18 17:54:33 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-18 17:56:26 +0200
commit99b0271712e3258427c802d006bd8a32e9a8bd7a (patch)
tree6bafc027264dda884fd248f03fadc004fe885115 /pkgs/servers/pulseaudio
parentc5dca72abe369789ff0e9a8ca517d5544c3c3799 (diff)
downloadnixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.tar
nixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.tar.gz
nixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.tar.bz2
nixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.tar.lz
nixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.tar.xz
nixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.tar.zst
nixlib-99b0271712e3258427c802d006bd8a32e9a8bd7a.zip
pulseaudio: fix CVE-2014-3970 by upstream patch
Diffstat (limited to 'pkgs/servers/pulseaudio')
-rw-r--r--pkgs/servers/pulseaudio/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 0665222a9e04..2c6f6c104931 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
 , bluez, sbc, udev, libcap, json_c
 , jackaudioSupport ? false, jack2 ? null
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr";
   };
 
+  patches = [(fetchpatch {
+    name = "CVE-2014-3970.patch";
+    url = "http://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/"
+      + "?id=26b9d22dd24c17eb118d0205bf7b02b75d435e3c";
+    sha256 = "13vxp6520djgfrfxkzy5qvabl94sga3yl5pj93xawbkgwzqymdyq";
+  })];
+
   # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
   propagatedBuildInputs
     = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];