Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708451 additions and 130034 deletions
@@ -5,13 +5,18 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "pcre-8.36";
+  name = "pcre-8.37";

  src = fetchurl {
    url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg";
+    sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi";
  };

+  patches =
+    [ ./cve-2015-3210.patch
+      ./cve-2015-5073.patch
+    ];
+
  outputs = [ "dev" "out" "bin" "doc" "man" ];

  configureFlags = ''