svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32338

pkgs/applications/graphics/ufraw/default.nix

@@ -2,12 +2,12 @@
 , libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }:
 
 stdenv.mkDerivation rec {
-  name = "ufraw-0.16";
+  name = "ufraw-0.18";
 
   src = fetchurl {
     # XXX: These guys appear to mutate uploaded tarballs!
     url = "mirror://sourceforge/ufraw/${name}.tar.gz";
-    sha256 = "06fzyd7wyv5ixbmhbsz80pphhbic18d1w8ji0gz38aq1vdmgxw9n";
+    sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4";
   };
 
   buildInputs =

pkgs/tools/networking/dnsmasq/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.57";
+  name = "dnsmasq-2.59";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "1bpq1wsc7cs1nqs7abhn96nxmdncdf7c58987f9kdmi246wcgq62";
+    sha256 = "02s1y5320aiqhcrgzc7c2zs292vidijc156k5w7apzzsk5hfdhdx";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";

pkgs/tools/networking/openresolv/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "openresolv-3.4.6";
+
+  src = fetchurl {
+    url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2";
+    sha256 = "026z4973b0vqp5acr6mn5fyxyc84y4ahg1f8fddh8dph86jcnhba";
+  };
+
+  configurePhase =
+    ''
+      cat > config.mk <<EOF
+      PREFIX=$out
+      SYSCONFDIR=/etc
+      SBINDIR=$out/sbin
+      LIBEXECDIR=$out/libexec/resolvconf
+      VARDIR=/var/run/resolvconf
+      MANDIR=$out/share/man
+      RESTARTCMD="initctl restart \1"
+      EOF
+    '';
+
+  installFlags = "SYSCONFDIR=$(out)/etc";
+
+  meta = { 
+    description = "A program to manage /etc/resolv.conf";
+    homepage = http://roy.marples.name/projects/openresolv;
+    license = "bsd";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -583,9 +583,7 @@ let
     stdenv = overrideInStdenv stdenv [gnumake381];
   };
 
-  dnsmasq = callPackage ../tools/networking/dnsmasq {
-    # TODO i18n can be installed as well, implement it?
-  };
+  dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
   dnstop = callPackage ../tools/networking/dnstop { };
 
@@ -1132,6 +1130,8 @@ let
 
   openobex = callPackage ../tools/bluetooth/openobex { };
 
+  openresolv = callPackage ../tools/networking/openresolv { };
+
   opensc_0_11_7 = callPackage ../tools/security/opensc/0.11.7.nix { };
 
   opensc = opensc_0_11_7;