Merge pull request #3918 from robberer/pkgs/clamav

clamav: update to version 0.98.4 and run freshclam in daemon mode
This commit is contained in:
Michael Raskin 2014-09-02 00:46:25 +04:00
commit 8c167b22a5
2 changed files with 10 additions and 6 deletions

View File

@ -71,10 +71,10 @@ in
mkdir -m 0755 -p ${stateDir} mkdir -m 0755 -p ${stateDir}
chown ${clamavUser}:${clamavGroup} ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir}
''; '';
exec = "${pkgs.clamav}/bin/freshclam --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
}; };
}; };
}; };
} }

View File

@ -1,19 +1,23 @@
{ stdenv, fetchurl, zlib, bzip2, libiconv }: { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clamav-${version}"; name = "clamav-${version}";
version = "0.98.1"; version = "0.98.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
sha256 = "1p13n8g3b88cxwxj07if9z1d2cav1ib94v6cq4r4bpacfd6yix9m"; sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k";
}; };
buildInputs = [ zlib bzip2 libiconv ]; buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ];
configureFlags = [ configureFlags = [
"--with-zlib=${zlib}" "--with-zlib=${zlib}"
"--with-libbz2-prefix=${bzip2}" "--with-libbz2-prefix=${bzip2}"
"--with-iconv-dir=${libiconv}" "--with-iconv-dir=${libiconv}"
"--with-xml=${libxml2}"
"--with-openssl=${openssl}"
"--with-libncurses-prefix=${ncurses}"
"--with-libcurl=${curl}"
"--disable-clamav" ]; "--disable-clamav" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {