Merge branch 'staging'

A security update of libxml2 is within.

4 files changed, 15 insertions, 16 deletions

diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 1f11f1526f94..82a571ca77c3 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
-stdenv.mkDerivation {
-  name = "ircd-hybrid-8.2.2";
+stdenv.mkDerivation rec {
+  name = "ircd-hybrid-8.2.21";
 
   src = fetchurl {
-    url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-8.2.2.tgz;
-    sha256 = "0k9w2mxgi03cpnmagshcr5v6qjgnmyidf966b50dd6yn1fgqcibm";
+    url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
+    sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3";
   };
 
   buildInputs = [ openssl zlib ];
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
   meta = {
     description = "An IPv6-capable IRC server";
     platforms = stdenv.lib.platforms.unix;
+    homepage = "http://www.ircd-hybrid.org/";
   };
 }
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index ebc7e7c3128e..4dd57b17fed3 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, openssl, pam, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "ngircd-21";
+  name = "ngircd-24";
 
   src = fetchurl {
     url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
-    sha256 = "19llx54zy6hc8k7kcs1f234qc20mqpnlnb30c663c42jxq5x6xii";
+    sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
   };
 
   configureFlags = [
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index ac8c3a1b1c91..5c9737660c42 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,19 +1,19 @@
 { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline
-, openssl, perl, sqlite, libjpeg, libzrtpcpp, speex, pcre
+, openssl, perl, sqlite, libjpeg, speex, pcre
 , ldns, libedit, yasm, which, lua, libopus, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.6.9";
+  name = "freeswitch-1.6.15";
 
   src = fetchurl {
     url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
-    sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7";
+    sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld";
   };
   postPatch = "patchShebangs libs/libvpx/build/make/rtcd.pl";
 
   buildInputs = [
-    ncurses curl pkgconfig gnutls readline openssl perl libjpeg
-    sqlite libzrtpcpp pcre speex ldns libedit yasm which lua libopus
+    openssl ncurses curl pkgconfig gnutls readline perl libjpeg
+    sqlite pcre speex ldns libedit yasm which lua libopus
     libsndfile
   ];
 
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index 32dcb98b20ea..22cc5646f8bf 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -2,16 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "uftp-${version}";
-  version = "4.9.2";
+  version = "4.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "0pra2sm8rdscyqkagi2v99az1vxbcch47wkdnz9wv4qg1x5phpmr";
+    sha256 = "13y7k6g6jksnllw0mwgzw4dqczh5c5hvq3zlqin7q98m0fpib4ly";
   };
 
-  buildInputs = [
-    openssl
-  ];
+  buildInputs = [ openssl ];
 
   outputs = [ "out" "doc" ];