Merge remote-tracking branch 'origin/master' into x-updates

pkgs/servers/http/apache-httpd/2.4.nix

@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.2";
+  version = "2.4.3";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2";
+    sha256 = "17i4zdcjfvxks0p1fbqvab37kr8d6zscqaqan8pqkw8iq6wh48fq";
   };
 
   buildInputs = [perl] ++

pkgs/servers/mail/spamassassin/default.nix

@@ -1,16 +1,16 @@
 { stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile
-, HTTPDate, MailDKIM, makeWrapper
+, HTTPDate, MailDKIM, LWP, IOSocketSSL, IOSocketInet6, makeWrapper, gnupg1
 }:
 
-# TODO:
+# TODO: Add the Perl modules ...
+#
+#   DBI
+#   Encode::Detect
+#   IP::Country::Fast
+#   Mail::SPF
+#   Net::Ident
+#   Razor2::Client::Agent
 #
-#  - Mail::SPF
-#  - IP::Country
-#  - Razor2
-#  - Net::Ident
-#  - DBI
-#  - LWP::UserAgent
-#  - Encode::Detect
 
 buildPerlPackage rec {
   name = "SpamAssassin-3.3.2";
@@ -20,18 +20,22 @@ buildPerlPackage rec {
     sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7";
   };
 
-  buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate
-    MailDKIM ];
+  buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
+    LWP IOSocketSSL IOSocketInet6 ];
 
   # Enabling 'taint' mode is desirable, but that flag disables support
   # for the PERL5LIB environment variable. Needs further investigation.
   makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no";
 
+  makeMakerFlags = "CONFDIR=/etc/spamassassin LOCALSTATEDIR=/var/lib/spamassassin";
+
   doCheck = false;
 
   postInstall = ''
+    mv "rules/"* $out/share/spamassassin/
+
     for n in "$out/bin/"*; do
-      wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB"
+      wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin"
     done
   '';
 

pkgs/servers/sip/freeswitch/default.nix

@@ -1,21 +1,16 @@
-{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
-, libzrtpcpp, autoconf, automake, libtool }:
+{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
+, libzrtpcpp }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-git-0db52e6";
+  name = "freeswitch-1.2.3";
 
-  src = fetchgit {
-    url = "git://git.freeswitch.org/freeswitch.git";
-    rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5";
-    sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff";
+  src = fetchurl {
+    url = http://files.freeswitch.org/freeswitch-1.2.3.tar.bz2;
+    sha256 = "0kfvn5f75c6r6yp18almjz9p6llvpm66gpbxcjswrg3ddgbkzg0k";
   };
 
-  preConfigure = ''
-    ./bootstrap.sh
-  '';
-
   buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
-    autoconf automake libtool libzrtpcpp ];
+    libzrtpcpp ];
 
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";