X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=PerlMail%2FConfig.pm;h=4179565e4da755b679e9f61779770a8f38ccbe7b;hb=44259a1fa77c88cfa12ead6567f50e4eb102b6f6;hp=49f6a5813a4e49a592ddd960e200bf7b94a58931;hpb=1d3d7b9ec29774424d4913e0d4389c2217ce4109;p=PerlMail.git diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm index 49f6a58..4179565 100644 --- a/PerlMail/Config.pm +++ b/PerlMail/Config.pm @@ -43,7 +43,7 @@ require Mail::Alias; BEGIN { for (qw(headerhas store headeris did dnsbl store_muttrc_alternates Received_for parts_linear mime_type - body_first mimehead razor2 header_remap)) { + body_first mimehead spamassassin header_remap lmtp_deliver)) { eval 'sub '.$_.' { return ::'.$_.'(@_); }'; } } @@ -69,6 +69,17 @@ our $MaxBodySMS=0x1000; our @SMSwebRcpt=qw(420 602 431329); # Some WWW::SMS modules require username: our $SMSwebRcpt_username="lace2"; +our $lmtp_admin="cyrus"; +our $lmtp_pwd; +{ + local *F; + open F,"$HOME/priv/lmtp.${lmtp_admin}.pwd" or die; + $lmtp_pwd=; + chomp $lmtp_pwd; + close F or die; + } +our $lmtp_user_from="lace"; +our $lmtp_user_to="lacemail"; # perlmail-submit @@ -87,7 +98,7 @@ our $DBI_database="short"; # MySQL user name: our $DBI_user="short"; # MySQL user password: -our $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd"; +our $DBI_pwd=$HOME."/priv/mysql.".$DBI_user.".pwd"; # perlmail-sendmail @@ -96,25 +107,40 @@ our $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd"; my @lists=qw( tacplus-l@disaster.com gsm@sh.cvut.cz - linux-fsdevel@vger.kernel.org n9k@pandora.cz dev9k@pandora.cz gsm@pandora.cz ros-general@reactos.com ros-kernel@reactos.com + ros-dev@reactos.com ros-cvs@reactos.com 4cinfo@atrey.karlin.mff.cuni.cz libtool@gnu.org libtool-patches@gnu.org - wine-license@winehq.com - wine-devel@winehq.com - wine-patches@winehq.com + wine-license@winehq.org gtk-devel-list@gnome.org gnome-vfs-list@gnome.org captive-announce-list@jankratochvil.net captive-list@jankratochvil.net captive-devel-list@jankratochvil.net + linux-ntfs-announce@lists.sourceforge.net + linux-ntfs-dev@lists.sourceforge.net + orbit-list@gnome.org + devel@kannel.org + automake@gnu.org + autoconf@gnu.org + autoconf-patches@gnu.org + wget-patches@sunsite.dk + wget@sunsite.dk + wineconf@winehq.org + prague-pm@pm.org + dev@httpd.apache.org + asterisk-perl@lists.gnuinter.net + isdn4linux@listserv.isdn4linux.de + libc-alpha@sources.redhat.com + squid-dev@squid-cache.org ); + #4c-list@vellum.cz # Pathname of the original sendmail(8) binary: our $sendmail_orig=(-x ($_="/usr/sbin/sendmail-orig") ? $_ : "/usr/sbin/sendmail"); @@ -223,6 +249,11 @@ our @dnsbl_whitelist=( "65.113.40.131", # bozo.vmware.com: qwest.net.spam-support.blackholes.five-ten-sg.com. "66.218.85.33", # mta2.wss.scd.yahoo.com: yahoo.com.spam.blackholes.five-ten-sg.com. "212.80.76.42", # mx2.seznam.cz: seznam.cz.free.blackholes.five-ten-sg.com. + "64.110.204.63", # hsdbrg64-110-204-63.sasknet.sk.ca: 64.110.202.181.sasknet.sk.ca.misc.spam.blackholes.five-ten-sg.com. + "212.80.76.44", # mx1.seznam.cz: 44.76.80.212.blackholes.five-ten-sg.com. + "212.80.76.29", # prace.seznam.cz: 212.80.76.42.seznam.cz.free.blackholes.five-ten-sg.com + "193.252.22.30", # smtp1.wanadoo.fr: 30.22.252.193.blackholes.five-ten-sg.com + "213.151.87.16", # posta.dobnet.cz: 16.87.151.213.relays.ordb.org ); our $Audit; # imported @@ -233,7 +264,6 @@ our $store_ignore; # imported sub audit { $store_profile=undef(); - # TODO: storage? # never spawn new mail if FROM_MAILER # $isFROM_MAILER postponed after maillists as they may look as FROM_MAILER @@ -272,7 +302,7 @@ sub audit # Do not local $store_file as it is our-imported $store_profile="silent"; local $_; - store "=spam".($_ eq 1 ? "" : ";$_") if $_=razor2(); + store "=spam".($_ eq 1 ? "" : ";$_") if $_=spamassassin(); }; $store_profile=undef(); return if did sub { @@ -282,9 +312,10 @@ sub audit store "=spam" .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1; # all hosts store "=spam" .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1; # all hosts # we don't check all hosts as they can be "dialup" category, FIXME: check for it - store "=spam" .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first +# store "=spam" .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first # I don't send viruses but viruses propagate mails of mine store "=spam" if headeris "X-Mailer",'ravmd/8.3.2'; + store "=spam" if $isFROM_MAILER && headeris("To",''); }; $store_profile=undef(); @@ -343,23 +374,32 @@ sub audit store "=mffstatnice","bell" if headeris "List-Post",''; store "=hw","log" if headeris "List-Post",''; store "=gnokii","log" if headeris "List-Id" ,''; - store "=winelic","log" if headeris "List-Id" ,''; + store "=winelic","silent" if headeris "List-Id" ,''; store "=wined","silent" if headeris "List-Id" ,''; - store "=winepat","silent" if headeris "List-Id" ,''; - store "=winecvs","silent" if headeris "List-Id" ,''; - store "=wineann","log" if headeris "List-Id" ,''; - store "=ros","log" if headeris "List-Id" ,''; - store "=roskernel","log" if headeris "List-Id" ,''; + store "=winepat","silent" if headeris "List-Id" ,''; + store "=winecvs","silent" if headeris "List-Id" ,''; + store "=wineann","silent" if headeris "List-Id" ,''; + store "=wineconf","silent" if headeris "List-Id" ,''; + store "=ros","silent" if headeris "List-Id" ,''; + store "=roskernel","silent" if headeris "List-Id" ,''; + store "=rosd","silent" if headeris "List-Id" ,''; store "=roscvs","silent" if headeris "List-Id" ,''; - store "=rosbug","log" if headeris "Reply-To" ,''; + store "=rossvn","silent" if headeris "List-Id" ,''; + store "=rosbug","silent" if headeris "Reply-To" ,''; store "=fsd","silent" if headeris "X-Mailing-List",''; - store "=kerneld","silent" if headeris "X-Mailing-List",''; + store "=kernel","silent" if headeris "X-Mailing-List",''; + store "=kernelnet","silent" if headeris "X-Mailing-List",''; + store "=ia64","silent" if headeris "X-Mailing-List",''; + store "=linuxjap","silent" if headeris "X-Mailing-List",''; + store "=kernelann","silent" if headeris "X-Mailing-List",''; + store "=sparse","silent" if headeris "X-Mailing-List",''; + store "=smp","silent" if headeris "X-Mailing-List",''; store "=surprise","sms" if headeris "List-Post",''; store "=surprisesuse","sms" if headeris "Sender" ,''; - store "=tacacs","log" if headeris "Sender" ,''; - store "=tacacs","log" if headeris "Sender" ,''; - store "=tacacs","log" if headeris "List-Id" ,''; - store "=pm","sms" if headeris "Sender" ,''; + store "=tacacs","silent" if headeris "Sender" ,''; + store "=tacacs","silent" if headeris "Sender" ,''; + store "=tacacs","silent" if headeris "List-Id" ,''; + store "=pm","log" if headeris "Sender" ,''; store "=radary","log" if headeris "Reply-To" ,''; store "=dnet","log" if headeris "Sender" ,'<@lists.distributed.net>'; store "=linux-input","log" if headeris "List-Post",''; @@ -374,24 +414,68 @@ sub audit store "=sourceforge","bell" if headeris "From" ,''; store "=gsmperlcvs","silent" if headeris("From" ,'') && $Audit->subject()=~/^'.*' has been updated!$/; - store "=libtoold","log" if headeris "List-Id" ,''; - store "=libtoolpat","log" if headeris "List-Id" ,''; - store "=cap","bell" if headeris "List-Id" ,''; - store "=capd","bell" if headeris "List-Id" ,''; - store "=capann","bell" if headeris "List-Id" ,''; + store "=libtoold","silent" if headeris "List-Id" ,''; + store "=libtoolpat","silent" if headeris "List-Id" ,''; + store "=automake","silent" if headeris "List-Id" ,''; + store "=autoconf","log" if headeris "List-Id" ,''; + store "=autoconfpat","log" if headeris "List-Id" ,''; + store "=hurd","log" if headeris "List-Id" ,''; + my %mailman=( + ''=>"=caperr", + ''=>"=caperr", + ''=>"=caperr", + '<4c-admin@>'=>"=4cerr", + ); + if (!did sub { + while ((my($mailaddr,$folder)=each(%mailman))) { + (my $maillistaddr=$mailaddr)=~s/-admin/-list$&/; + store $folder,"log" if (headeris("From",'')&&headeris("To",$mailaddr)) + || headeris("From",$maillistaddr) + || headeris("To",$maillistaddr) + || headeris("From",$mailaddr); + } + }) { + store "=cap","bell" if headeris "List-Id" ,''; + store "=capd","bell" if headeris "List-Id" ,''; + store "=capann","bell" if headeris "List-Id" ,''; + store "=4c","bell" if headeris "List-Id" ,'<4c-list.vellum.cz>'; + } + store "=ntfsann","silent" if headeris "List-Id" ,''; + store "=ntfsd","silent" if headeris "List-Id" ,''; + store "=orbit","silent" if headeris "List-Id" ,''; + store "=kand","log" if headeris "List-Id" ,''; + store "=mailmand","silent" if headeris "List-Id" ,''; + store "=asterisk-perl","log" if headeris "List-Post",''; + store "=i4l","silent" if headeris "List-Id" ,''; + store "=glibc","silent" if headeris "Mailing-List",qr/\b\Qlibc-alpha-help\E@\Qsources.redhat.com\E\b/; + store "=fedann","bell" if headeris "List-Id" ,''; + store "=fedtools","log" if headeris "List-Id" ,''; + store "=bashbug","log" if headeris "List-Id" ,''; # own webs store "=energie","bell" if headeris "From" ,qr/^EnergieWeb/; store "=ats","log" if headeris("From" ,'') || (headeris("From",'') && headerhas("To",'')); store "=atscasablanca","log" if headeris "From" ,''; store "=www-sms","log" if headeris "List-Id" ,''; + store "=httpdd","log" if headeris "list-post",''; + store "=mms2log","log" if headeris "Return-Path",''; + store "=hotelgatelog","log" if headeris "Return-Path",''; # Petr Koutecky does not mark his Stuff - store "=koutecky","log" if headeris "From" ,''; + store "=koutecky","log" if headeris "Return-Path",''; + store "=koutecky","log" if headeris "Return-Path",''; + store "=koutecky","log" if headeris "Return-Path",''; + + if (($isFROM_MAILER && !did) || !did) { + lmtp_deliver $lmtp_admin,$lmtp_pwd,$lmtp_user_from,$lmtp_user_to; + } store "=errm","bell" if $isFROM_MAILER && !did(); - store "==","sms" if !did; + if (!did) { + store "==","sms"; + spamassassin "$HOME/bin/sa-learn --ham"; + } } sub audit_sms_address