From ab5669146d31b98dde484fffd30ab54d4c27ac4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 20:29:23 +0000
Subject: [PATCH] * apr 1.4.2, Apache httpd 2.2.16.

svn path=/nixpkgs/trunk/; revision=23046
---
 pkgs/development/libraries/apr/default.nix | 4 ++--
 pkgs/servers/http/apache-httpd/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 38b062e08b2..372f7fd9a2d 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.3.9";
+  name = "apr-1.4.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "1qicxnk62d9mjza8vch2wxy4xlq8sa76chwi5cp6bs4cyj9s61ap";
+    sha256 = "14akizp9aq8c2qk8bj5a6n3s8hsy356prp911cmrvl4l0rqcl5r0";
   };
 
   configureFlags =
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index c44a90a1663..6048a2fa81b 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -6,12 +6,12 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  version = "2.2.15";
+  version = "2.2.16";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "5f0e973839ed2e38a4d03adba109ef5ce3381bc2";
+    sha1 = "ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9";
   };
 
   #inherit sslSupport;