Updating unbound.

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

pkgs/development/libraries/ldns/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, openssl, perl}:
+
+stdenv.mkDerivation {
+  name = "ldns-1.6.11";
+  src = fetchurl {
+    url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz";
+    sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8";
+  };
+
+  patchPhase = ''
+    sed -i 's,\$(srcdir)/doc/doxyparse.pl,perl $(srcdir)/doc/doxyparse.pl,' Makefile.in
+  '';
+
+  buildInputs = [ openssl perl ];
+
+  configureFlags = [ "--with-ssl=${openssl}" ];
+
+  meta = {
+    description = "Library with the aim of simplifying DNS programming in C";
+    license = "BSD";
+    homepage = "http://www.nlnetlabs.nl/projects/ldns/";
+  };
+}

pkgs/tools/networking/unbound/default.nix

@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, expat, libevent, ldns }:
 
 stdenv.mkDerivation rec {
-  name = "unbound-1.4.1";
+  name = "unbound-1.4.13";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "2573db422d7a856a3783b96698f2d5ca18a849d0bd6f0e36eb37a4f0a65b60e2";
+    sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3";
   };
  
-  buildInputs = [openssl];
+  buildInputs = [openssl expat libevent ldns];
 
-  configureFlags = "--with-ssl=${openssl}";
+  configureFlags = [ "--with-ssl=${openssl}" "--with-libexpat=${expat}"
+    "--localstatedir=/var" ];
 
   meta = {
     description = "Unbound, a validating, recursive, and caching DNS resolver.";
     license = "BSD";
     homepage = http://www.unbound.net;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -905,6 +905,8 @@ let
 
   nodejs = callPackage ../development/web/nodejs {};
 
+  ldns = callPackage ../development/libraries/ldns { };
+
   lftp = callPackage ../tools/networking/lftp { };
 
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };