* Upgrade to 2.0.49.

svn path=/nixpkgs/trunk/; revision=851

2 files changed, 27 insertions, 28 deletions

diff --git a/pkgs/servers/http/apache-httpd/builder.sh b/pkgs/servers/http/apache-httpd/builder.sh
index 559c75d0124f0..6333dfab578b6 100755
--- a/pkgs/servers/http/apache-httpd/builder.sh
+++ b/pkgs/servers/http/apache-httpd/builder.sh
@@ -1,23 +1,25 @@
-#! /bin/sh
+#! /bin/sh -e
 
-buildinputs="$openssl $db4 $expat $perl"
-. $stdenv/setup || exit 1
+buildInputs="$openssl $db4 $expat $perl"
+. $stdenv/setup
+
+configureFlags="--with-expat=$expat --enable-mods-shared=all --without-gdbm \
+ --enable-threads --with-devrandom=/dev/urandom"
 
 if test $db4Support; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
 fi
 
 if test $sslSupport; then
-    extraflags="--enable-ssl --with-ssl=$openssl $extraflags"
+    configureFlags="--enable-ssl --with-ssl=$openssl $configureFlags"
 fi
 
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$out \
- --with-expat=$expat --enable-mods-shared=all --without-gdbm \
- --enable-threads --with-devrandom=/dev/urandom \
- $extraflags || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-rm -rf $out/manual || exit 1
+
+postInstall() {
+    echo "removing manual"
+    rm -rf $out/manual
+}
+postInstall=postInstall
+
+
+genericBuild
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index 2b2adb97af6f9..b4e7fa2359f3e 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -2,26 +2,23 @@
 , sslSupport, db4Support
 }:
 
-assert sslSupport -> !isNull openssl;
-assert db4Support -> !isNull db4;
-assert !isNull expat && !isNull perl;
+assert sslSupport -> openssl != null;
+assert db4Support -> db4 != null;
+assert expat != null && perl != null;
 
 derivation {
-  name = "apache-httpd-2.0.48";
+  name = "apache-httpd-2.0.49";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.48.tar.gz;
-    md5 = "466c63bb71b710d20a5c353df8c1a19c";
+    url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.49.tar.gz;
+    md5 = "275d3d37eed1b070f333d3618f7d1954";
   };
 
-  sslSupport = sslSupport;
-  db4Support = db4Support;
+  inherit sslSupport db4Support;
 
-  stdenv = stdenv;
-  perl = perl;
-  openssl = if sslSupport then openssl else "";
-  db4 = if db4Support then db4 else "";
-  expat = expat;
+  inherit stdenv perl expat;
+  openssl = if sslSupport then openssl else null;
+  db4 = if db4Support then db4 else null;
 }