diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-07 01:06:34 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-07 04:04:20 +0200 |
| commit | 0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e (patch) | |
| tree | 3c18df7895732fd8c42ec8dda9ab128f38dff6c7 /pkgs/servers | |
| parent | 241cb4ed03cb4daee940bc7d26bd7bf73f18b8c6 (diff) | |
| download | nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.tar nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.tar.gz nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.tar.bz2 nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.tar.lz nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.tar.xz nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.tar.zst nixpkgs-0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e.zip | |
apacheHttpd: 2.4.27 -> 2.4.28
Diffstat (limited to 'pkgs/servers')
| -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 ecf9ee9d84a..93fe205a8f9 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"; |