From 0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 01:06:34 +0200
Subject: apacheHttpd: 2.4.27 -> 2.4.28

---
 pkgs/servers/http/apache-httpd/2.4.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'pkgs/servers/http')

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";
 
-- 
cgit 1.4.1