cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 4.80.7-1 (notable addition: support for storing config in sql)

Browse Source 
From Brad.
This commit is contained in:
sthen 2010-06-18 21:48:23 +00:00
parent 1e375f016d
commit 56f09cbf4d
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/mailscanner/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2010/05/27 11:04:30 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2010/06/18 21:48:23 sthen Exp $
COMMENT= virus/spam scanning framework
V= 4.80
Vs= 4
Vs= 7
Vss= ${Vs}-1
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
@ -31,6 +31,7 @@ RUN_DEPENDS+= ::databases/p5-DBI \
::archivers/zoo \
::net/wget \
::devel/p5-OLE-Storage_Lite \
::devel/p5-Sys-SigAction \
::textproc/antiword
# GPLv2+

10
mail/mailscanner/distinfo
View File

@ -1,5 +1,5 @@
MD5 (MailScanner-install-4.80.4-1.tar.gz) = WHevau8UVxnlyPfVXsGsZA==
RMD160 (MailScanner-install-4.80.4-1.tar.gz) = rXPVPb2+aD6UghRLEtWc3swojBM=
SHA1 (MailScanner-install-4.80.4-1.tar.gz) = 6COAUUxi8649GpeWn+dc+EJztsg=
SHA256 (MailScanner-install-4.80.4-1.tar.gz) = yPYaQUm/YRou9NF/mubusJcG4DKm5kcy9CsEhHopcd0=
SIZE (MailScanner-install-4.80.4-1.tar.gz) = 9119787
MD5 (MailScanner-install-4.80.7-1.tar.gz) = D+f7Pni32kZfhD6OoSyq0g==
RMD160 (MailScanner-install-4.80.7-1.tar.gz) = 5plq0dWSjZQV2y+Prcuu5O9kGko=
SHA1 (MailScanner-install-4.80.7-1.tar.gz) = p7Uw0u73GW3tWbI6uq6mhP+grSQ=
SHA256 (MailScanner-install-4.80.7-1.tar.gz) = djt69YKPbuZgkjSp8b31O5cYtzhCque065rPV/6XDHE=
SIZE (MailScanner-install-4.80.7-1.tar.gz) = 9499977

16
mail/mailscanner/patches/patch-bin_MailScanner
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bin_MailScanner,v 1.9 2009/10/07 20:59:29 sthen Exp $
--- bin/MailScanner.orig Thu Aug 13 06:18:29 2009
+++ bin/MailScanner Thu Aug 13 11:39:04 2009
$OpenBSD: patch-bin_MailScanner,v 1.10 2010/06/18 21:48:23 sthen Exp $
--- bin/MailScanner.orig Wed Jun 2 04:17:25 2010
+++ bin/MailScanner Tue Jun 15 18:46:32 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I/opt/MailScanner/lib
+#!/usr/bin/perl -I%PREFIX%/lib/MailScanner
@ -32,9 +32,9 @@ $OpenBSD: patch-bin_MailScanner,v 1.9 2009/10/07 20:59:29 sthen Exp $
-$ConfFile = '/opt/MailScanner/etc/MailScanner.conf' if $ConfFile eq "" ||
+$ConfFile = '%SYSCONFDIR%/MailScanner/MailScanner.conf' if $ConfFile eq "" ||
!(-f $ConfFile);
# Do they just want a dump of the processing-database table?
@@ -335,7 +333,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
# Tell ConfigSQL where the configuration file is.
$MailScanner::ConfigSQL::ConfFile = $ConfFile;
@@ -337,7 +335,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
Currently you are using no virus scanners.
This is probably not what you want.
@ -43,7 +43,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.9 2009/10/07 20:59:29 sthen Exp $
Virus Scanners = clamav
Then download
http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/install-Clam-SA.tar.gz
@@ -422,7 +420,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
@@ -424,7 +422,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
}
my $cluid = MailScanner::Config::QuickPeek($ConfFile, 'runasuser');
my $clgid = MailScanner::Config::QuickPeek($ConfFile, 'runasgroup');
@ -52,7 +52,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.9 2009/10/07 20:59:29 sthen Exp $
print STDERR "Error: Attempt to create locks in $lockdir failed!\n"
if ($clr>>8) != 0;
@@ -719,7 +717,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) {
@@ -721,7 +719,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";
}

12
mail/mailscanner/patches/patch-etc_MailScanner_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.11 2010/05/27 11:04:30 sthen Exp $
--- etc/MailScanner.conf.orig Sat Apr 24 18:54:47 2010
+++ etc/MailScanner.conf Mon May 24 10:21:05 2010
$OpenBSD: patch-etc_MailScanner_conf,v 1.12 2010/06/18 21:48:23 sthen Exp $
--- etc/MailScanner.conf.orig Wed Jun 2 04:17:25 2010
+++ etc/MailScanner.conf Tue Jun 15 18:46:32 2010
@@ -43,7 +43,7 @@
# normal shell wildcard characters such as "*".
# For each setting, the last value read will be used by MailScanner.
@ -297,7 +297,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.11 2010/05/27 11:04:30 sthen Exp $
SpamAssassin Default Rules Dir =
#
@@ -2757,9 +2759,9 @@ MCP Actions = deliver
@@ -2842,9 +2844,9 @@ MCP Actions = deliver
High Scoring MCP Actions = deliver
Bounce MCP As Attachment = no
@ -309,7 +309,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.11 2010/05/27 11:04:30 sthen Exp $
High Scoring MCP Subject Text = {MCP?}
Is Definitely MCP = no
@@ -2928,7 +2930,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks
@@ -3013,7 +3015,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.
@ -318,7 +318,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.11 2010/05/27 11:04:30 sthen Exp $
# How to lock spool files.
# Don't set this unless you *know* you need to.
@@ -2987,5 +2989,5 @@ Minimum Code Status = supported
@@ -3072,5 +3074,5 @@ Minimum Code Status = supported
# They will be read and processed in alphabetical order.
#
#

10
mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.8 2009/10/07 20:59:29 sthen Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Thu Jul 30 15:16:52 2009
+++ lib/MailScanner/ConfigDefs.pl Sun Aug 2 03:31:39 2009
@@ -358,8 +358,8 @@ qmailintdhashnumber 1
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.9 2010/06/18 21:48:23 sthen Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Wed May 26 12:14:00 2010
+++ lib/MailScanner/ConfigDefs.pl Tue Jun 15 18:46:32 2010
@@ -359,8 +359,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.8 2009/10/07 20:59:29 sthen Ex
FileCommand /usr/bin/file
FirstCheck mcp
getipfromheader 0
@@ -383,7 +383,7 @@ QuarantinePerms 0600
@@ -384,7 +384,7 @@ QuarantinePerms 0600
RunAsUser 0
RunAsGroup 0
SACache /var/spool/MailScanner/incoming/SpamAssassin.cache.db

3
mail/mailscanner/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2010/05/27 11:04:30 sthen Exp $
@comment $OpenBSD: PLIST,v 1.11 2010/06/18 21:48:23 sthen Exp $
@conflict clamav-<0.94
bin/MailScanner
bin/Quick.Peek
@ -26,6 +26,7 @@ lib/MailScanner/MailScanner/Antiword.pm
lib/MailScanner/MailScanner/BinHex.pm
lib/MailScanner/MailScanner/Config.pm
lib/MailScanner/MailScanner/ConfigDefs.pl
lib/MailScanner/MailScanner/ConfigSQL.pm
lib/MailScanner/MailScanner/CustomConfig.pm
lib/MailScanner/MailScanner/CustomFunctions/
lib/MailScanner/MailScanner/CustomFunctions/CustomAction.pm