spamassassin: major service fixes -> added more perl packages to spamassassin and abstracted service to not use /etc/spamassassin, also running sa-update as spamd user periodically (#26470)
thanks @grahamc for IRC comments
This commit is contained in:
@@ -1,17 +1,7 @@
|
||||
{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile
|
||||
{ stdenv, fetchurl, buildPerlPackage, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile
|
||||
, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1
|
||||
}:
|
||||
|
||||
# TODO: Add the Perl modules ...
|
||||
#
|
||||
# DBI
|
||||
# Encode::Detect
|
||||
# IP::Country::Fast
|
||||
# Mail::SPF
|
||||
# Net::Ident
|
||||
# Razor2::Client::Agent
|
||||
#
|
||||
|
||||
buildPerlPackage rec {
|
||||
name = "SpamAssassin-3.4.1";
|
||||
|
||||
@@ -20,14 +10,17 @@ buildPerlPackage rec {
|
||||
sha256 = "0la6s5ilamf9129kyjckcma8cr6fpb6b5f2fb64v7106iy0ckhd0";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
|
||||
LWP IOSocketSSL ];
|
||||
# https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434
|
||||
patches = [ ./sa-update_add--siteconfigpath.patch ];
|
||||
|
||||
buildInputs = with perlPackages; [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
|
||||
LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable ];
|
||||
|
||||
# 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";
|
||||
makeMakerFlags = "CONFDIR=/homeless/shelter LOCALSTATEDIR=/var/lib/spamassassin";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -45,6 +38,6 @@ buildPerlPackage rec {
|
||||
description = "Open-Source Spam Filter";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.peti ];
|
||||
maintainers = with stdenv.lib.maintainers; [ peti qknight ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user