diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
| commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
| tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/servers/http | |
| parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
| parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
| download | nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ecf9ee9d84a4..93fe205a8f9d 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,7 +5,6 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 -, fetchpatch }: let optional = stdenv.lib.optional; @@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.27"; + version = "2.4.28"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; + sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666"; }; # FIXME: -dev depends on -doc @@ -40,15 +39,6 @@ stdenv.mkDerivation rec { 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"; |