diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 16:01:22 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 16:04:03 +0200 |
| commit | c9d11b8a1d8d1f3bff230027496e90d0fb963d8b (patch) | |
| tree | 3809194b73c6f0788bc58adcbebb9e2109497871 /pkgs/servers/http | |
| parent | 2f9cb45bd464643a29e2c61e54e141c202950395 (diff) | |
| download | nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.tar nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.tar.gz nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.tar.bz2 nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.tar.lz nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.tar.xz nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.tar.zst nixlib-c9d11b8a1d8d1f3bff230027496e90d0fb963d8b.zip | |
apacheHttpd: fix CVE-2017-9798 (Optionsbleed)
https://blog.fuzzing-project.org/60-Optionsbleed-HTTP-OPTIONS-method-can-leak-Apaches-server-memory.html
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 3393d0cf58b6..ecf9ee9d84a4 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,6 +5,7 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 +, fetchpatch }: let optional = stdenv.lib.optional; @@ -35,10 +36,19 @@ stdenv.mkDerivation rec { optional http2Support nghttp2 ++ optional stdenv.isDarwin libiconv; - patchPhase = '' + prePatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" ''; + patches = [ + (fetchpatch { + name = "CVE-2017-9798.patch"; + url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch"; + sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k"; + stripLen = 3; + }) + ]; + # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; |