From 2c01ec6bc65f020bc9ab7dfd3f460ca2c95ab925 Mon Sep 17 00:00:00 2001 From: todd Date: Wed, 8 Apr 2009 22:29:24 +0000 Subject: [PATCH] update to 4.75.11, tested by brad and sthen@ for nearly a week now, from brad --- mail/mailscanner/Makefile | 8 +-- mail/mailscanner/distinfo | 10 ++-- .../mailscanner/patches/patch-bin_MailScanner | 22 ++++---- .../patch-bin_processing_messages_alert | 18 +++++++ .../patches/patch-etc_MailScanner_conf | 54 +++++++++---------- .../patch-lib_MailScanner_ConfigDefs_pl | 10 ++-- .../patches/patch-lib_MailScanner_Message_pm | 8 +-- .../patches/patch-lib_mcafee-autoupdate | 8 +-- mail/mailscanner/pkg/PLIST | 3 +- 9 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 mail/mailscanner/patches/patch-bin_processing_messages_alert diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 13f61808c8f..fc82566f025 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2009/01/28 15:16:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2009/04/08 22:29:24 todd Exp $ COMMENT= virus/spam scanning framework -V= 4.74 -Vs= 16 +V= 4.75 +Vs= 11 Vss= ${Vs}-1 CATEGORIES= mail MASTER_SITES= http://mailscanner.info/files/4/tar/ @@ -50,7 +50,7 @@ do-install: install_libexec install_etc install_share install_lib install_bin BINS= MailScanner df2mbox d2mbox update_bad_phishing_sites update_phishing_sites BINS+= check_mailscanner clean.quarantine clean.SA.cache analyse_SpamAssassin_cache -BINS+= mailscanner_create_locks +BINS+= mailscanner_create_locks processing_messages_alert _MS_sed_frag= _subst() { sed 's,%PREFIX%,${LOCALBASE},g;s,%SYSCONFDIR%,${SYSCONFDIR},g' \ "$$2" > ${WRKDIST}/file; \ diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo index e83193dd046..11d65bb6ce5 100644 --- a/mail/mailscanner/distinfo +++ b/mail/mailscanner/distinfo @@ -1,5 +1,5 @@ -MD5 (MailScanner-install-4.74.16-1.tar.gz) = hXDU8adjCoqIRpAv6+jrDg== -RMD160 (MailScanner-install-4.74.16-1.tar.gz) = TXkod37JX6e9bGQi5TnwbtCodqA= -SHA1 (MailScanner-install-4.74.16-1.tar.gz) = 821FXOd8MUuFRS1zlyjGFczbGCk= -SHA256 (MailScanner-install-4.74.16-1.tar.gz) = pXVUZTbm8sqfJsNv6Pgkts7PGuy7CFHV6XUL24yM4Jo= -SIZE (MailScanner-install-4.74.16-1.tar.gz) = 8405637 +MD5 (MailScanner-install-4.75.11-1.tar.gz) = 04D/78chmAz2dT4uipsFdQ== +RMD160 (MailScanner-install-4.75.11-1.tar.gz) = /XWOvGiRn7AKJimmViu7nsY9l2A= +SHA1 (MailScanner-install-4.75.11-1.tar.gz) = wkk6FN386BoQTLVEiAcG3DESrQE= +SHA256 (MailScanner-install-4.75.11-1.tar.gz) = GMedEXDWgJG8guSAN0QN2dt4ga2T37dkPViBZiV4FvI= +SIZE (MailScanner-install-4.75.11-1.tar.gz) = 8429830 diff --git a/mail/mailscanner/patches/patch-bin_MailScanner b/mail/mailscanner/patches/patch-bin_MailScanner index c97c5b75cb5..63e4c20d984 100644 --- a/mail/mailscanner/patches/patch-bin_MailScanner +++ b/mail/mailscanner/patches/patch-bin_MailScanner @@ -1,6 +1,6 @@ -$OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $ ---- bin/MailScanner.orig Thu Jan 8 14:11:44 2009 -+++ bin/MailScanner Sun Jan 11 13:34:41 2009 +$OpenBSD: patch-bin_MailScanner,v 1.7 2009/04/08 22:29:24 todd Exp $ +--- bin/MailScanner.orig Wed Apr 1 12:07:08 2009 ++++ bin/MailScanner Wed Apr 1 18:15:30 2009 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -I/opt/MailScanner/lib +#!/usr/bin/perl -I%PREFIX%/lib/MailScanner @@ -16,7 +16,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $ unshift @INC, $path; } -@@ -179,8 +179,6 @@ if ($Versions) { +@@ -183,8 +183,6 @@ if ($Versions) { my($module, $s, $v, $m); printf("Running on\n%s", `uname -a`); @@ -25,7 +25,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $ printf("This is Perl version %f (%vd)\n", $], $^V); print "\nThis is MailScanner version " . $MailScanner::Config::MailScannerVersion . "\n"; print "Module versions are:\n"; -@@ -207,9 +205,10 @@ $Debug = 1 if $DebugSpamAssassin; +@@ -211,9 +209,10 @@ $Debug = 1 if $DebugSpamAssassin; # Check version of MIME-tools against its requirements my $error = 0; @@ -37,7 +37,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $ print STDERR "\n\n**** ERROR: You must upgrade your perl IO module to at least\n**** ERROR: version 1.2301 or MailScanner will not work!\n\n"; $error = 1; } -@@ -250,7 +249,7 @@ if ($WantLintOnly || $WantLintLiteOnly) { +@@ -254,7 +253,7 @@ if ($WantLintOnly || $WantLintLiteOnly) { # Find the mailscanner.conf file, with a default just in case. my $ConfFile = $ARGV[0]; # Use the default if we couldn't find theirs. Will save a lot of grief. @@ -45,17 +45,17 @@ $OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $ +$ConfFile = '%SYSCONFDIR%/MailScanner/MailScanner.conf' if $ConfFile eq "" || !(-f $ConfFile); - # Check the MailScanner version number against what is in MailScanner.conf -@@ -295,7 +294,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc + # Do they just want a dump of the processing-database table? +@@ -309,7 +308,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc Currently you are using no virus scanners. This is probably not what you want. -In your /opt/MailScanner/etc/MailScanner.conf file, set -+In your %SYSCONFDIR%/MailScanner.conf file, set ++In your %SYSCONFDIR%/MailScanner/MailScanner.conf file, set Virus Scanners = clamav Then download http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/install-Clam-SA.tar.gz -@@ -382,7 +381,7 @@ if ($WantLintOnly || $WantLintLiteOnly) { +@@ -396,7 +395,7 @@ if ($WantLintOnly || $WantLintLiteOnly) { } my $cluid = MailScanner::Config::QuickPeek($ConfFile, 'runasuser'); my $clgid = MailScanner::Config::QuickPeek($ConfFile, 'runasgroup'); @@ -64,7 +64,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $ print STDERR "Error: Attempt to create locks in $lockdir failed!\n" if ($clr>>8) != 0; -@@ -675,7 +674,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) { +@@ -691,7 +690,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) { print STDERR "Please move your \"Lockfile Dir\" setting in MailScanner.conf.\n"; print STDERR "It should point outside /tmp, preferably /var/spool/MailScanner/incoming/Locks\n"; } diff --git a/mail/mailscanner/patches/patch-bin_processing_messages_alert b/mail/mailscanner/patches/patch-bin_processing_messages_alert new file mode 100644 index 00000000000..c74391855e7 --- /dev/null +++ b/mail/mailscanner/patches/patch-bin_processing_messages_alert @@ -0,0 +1,18 @@ +$OpenBSD: patch-bin_processing_messages_alert,v 1.1 2009/04/08 22:29:24 todd Exp $ +--- bin/processing_messages_alert.orig Wed Apr 1 18:09:59 2009 ++++ bin/processing_messages_alert Wed Apr 1 18:14:53 2009 +@@ -1,10 +1,10 @@ + #!/bin/sh + +-noticesfrom=`perl -n -e 'print "$_" if chomp && s/^\s*Notices\s*From\s*=\s*([^\s#]+).*$/$1/' /opt/MailScanner/etc/MailScanner.conf` +-localpostmaster=`perl -n -e 'print "$_" if chomp && s/^\s*Local\s*Postmaster\s*=\s*([^\s#]+).*$/$1/' /opt/MailScanner/etc/MailScanner.conf` +-noticesto=`perl -n -e 'print "$_" if chomp && s/^\s*Notices\s*To\s*=\s*([^\s#]+).*$/$1/' /opt/MailScanner/etc/MailScanner.conf` ++noticesfrom=`perl -n -e 'print "$_" if chomp && s/^\s*Notices\s*From\s*=\s*([^\s#]+).*$/$1/' %SYSCONFDIR%/MailScanner/MailScanner.conf` ++localpostmaster=`perl -n -e 'print "$_" if chomp && s/^\s*Local\s*Postmaster\s*=\s*([^\s#]+).*$/$1/' %SYSCONFDIR%/MailScanner/MailScanner.conf` ++noticesto=`perl -n -e 'print "$_" if chomp && s/^\s*Notices\s*To\s*=\s*([^\s#]+).*$/$1/' %SYSCONFDIR%/MailScanner/MailScanner.conf` + +-alert=`/opt/MailScanner/bin/MailScanner --processing` ++alert=`%PREFIX%/bin/MailScanner --processing` + + if [ \! "x$alert" = "x" ]; then + #cat < 5, for example. # This can also be the filename of a ruleset. @@ -258,7 +258,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.6 2009/01/28 15:16:17 sthen Exp $ # Many naive spammers send out the same message to lots of people. # These messages are very likely to have roughly the same SpamAssassin score. -@@ -2536,14 +2538,14 @@ SpamAssassin Install Prefix = +@@ -2594,14 +2596,14 @@ SpamAssassin Install Prefix = SpamAssassin Site Rules Dir = /etc/mail/spamassassin # The site-local rules are searched for here, and in prefix/etc/spamassassin, @@ -275,7 +275,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.6 2009/01/28 15:16:17 sthen Exp $ SpamAssassin Local Rules Dir = # The rules created by the "sa-update" tool are searched for here. -@@ -2557,10 +2559,10 @@ SpamAssassin Local Rules Dir = +@@ -2615,10 +2617,10 @@ SpamAssassin Local Rules Dir = SpamAssassin Local State Dir = # /var/lib/spamassassin # The default rules are searched for here, and in prefix/share/spamassassin, @@ -288,7 +288,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.6 2009/01/28 15:16:17 sthen Exp $ SpamAssassin Default Rules Dir = # -@@ -2593,9 +2595,9 @@ MCP Actions = deliver +@@ -2651,9 +2653,9 @@ MCP Actions = deliver High Scoring MCP Actions = deliver Bounce MCP As Attachment = no @@ -300,7 +300,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.6 2009/01/28 15:16:17 sthen Exp $ High Scoring MCP Subject Text = {MCP?} Is Definitely MCP = no -@@ -2758,7 +2760,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks +@@ -2816,7 +2818,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks # directory should be over-written by the installation or upgrade process. # All files starting with "." or ending with ".rpmnew" will be ignored, # all other files will be compiled and may be used with Custom Functions. diff --git a/mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl b/mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl index ea1c618f269..f0dd7fcf9f0 100644 --- a/mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl +++ b/mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.5 2008/11/07 02:33:58 brad Exp $ ---- lib/MailScanner/ConfigDefs.pl.orig Wed Aug 20 11:22:39 2008 -+++ lib/MailScanner/ConfigDefs.pl Thu Sep 4 00:53:09 2008 -@@ -340,8 +340,8 @@ qmailintdhashnumber 1 +$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.6 2009/04/08 22:29:24 todd Exp $ +--- lib/MailScanner/ConfigDefs.pl.orig Wed Apr 1 12:07:05 2009 ++++ lib/MailScanner/ConfigDefs.pl Wed Apr 1 17:45:47 2009 +@@ -354,8 +354,8 @@ qmailintdhashnumber 1 # filename containing a list of directories. [Simple,Other] cachetiming 1800,300,10800,172800,600 @@ -12,7 +12,7 @@ $OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.5 2008/11/07 02:33:58 brad Exp FileCommand /usr/bin/file FirstCheck mcp GunzipCommand /bin/gunzip -@@ -363,7 +363,7 @@ QuarantinePerms 0600 +@@ -378,7 +378,7 @@ QuarantinePerms 0600 RunAsUser 0 RunAsGroup 0 SACache /var/spool/MailScanner/incoming/SpamAssassin.cache.db diff --git a/mail/mailscanner/patches/patch-lib_MailScanner_Message_pm b/mail/mailscanner/patches/patch-lib_MailScanner_Message_pm index ed17d9287ed..186bf076c82 100644 --- a/mail/mailscanner/patches/patch-lib_MailScanner_Message_pm +++ b/mail/mailscanner/patches/patch-lib_MailScanner_Message_pm @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.5 2008/11/07 02:33:58 brad Exp $ ---- lib/MailScanner/Message.pm.orig Mon Oct 27 07:31:59 2008 -+++ lib/MailScanner/Message.pm Thu Nov 6 20:24:55 2008 -@@ -680,12 +680,19 @@ sub IsSpam { +$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.6 2009/04/08 22:29:24 todd Exp $ +--- lib/MailScanner/Message.pm.orig Thu Mar 12 11:37:44 2009 ++++ lib/MailScanner/Message.pm Wed Apr 1 17:45:47 2009 +@@ -694,12 +694,19 @@ sub IsSpam { # rblspamheader is useful start to spamreport if RBLsaysspam. # Do the Custom Spam Checker diff --git a/mail/mailscanner/patches/patch-lib_mcafee-autoupdate b/mail/mailscanner/patches/patch-lib_mcafee-autoupdate index 4e1da76b015..2594a1c6887 100644 --- a/mail/mailscanner/patches/patch-lib_mcafee-autoupdate +++ b/mail/mailscanner/patches/patch-lib_mcafee-autoupdate @@ -1,10 +1,10 @@ -$OpenBSD: patch-lib_mcafee-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $ ---- lib/mcafee-autoupdate.orig Mon Mar 20 17:48:20 2006 -+++ lib/mcafee-autoupdate Mon Mar 20 17:48:20 2006 +$OpenBSD: patch-lib_mcafee-autoupdate,v 1.2 2009/04/08 22:29:24 todd Exp $ +--- lib/mcafee-autoupdate.orig Wed Mar 18 14:20:37 2009 ++++ lib/mcafee-autoupdate Wed Apr 1 17:46:41 2009 @@ -20,7 +20,7 @@ # defaults - OPTS="" + OPTS="-d" -PREFIX=/opt/uvscan +PREFIX=%PREFIX%/uvscan FTPDIR=http://download.nai.com/products/datfiles/4.x/nai diff --git a/mail/mailscanner/pkg/PLIST b/mail/mailscanner/pkg/PLIST index 37b22ae9b4b..7a5106f668d 100644 --- a/mail/mailscanner/pkg/PLIST +++ b/mail/mailscanner/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2009/01/28 15:16:17 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.6 2009/04/08 22:29:24 todd Exp $ @conflict clamav-<0.94 bin/MailScanner bin/analyse_SpamAssassin_cache @@ -8,6 +8,7 @@ bin/clean.quarantine bin/d2mbox bin/df2mbox bin/mailscanner_create_locks +bin/processing_messages_alert bin/update_bad_phishing_sites bin/update_phishing_sites lib/MailScanner/