Update to MailScanner 4.84.6-1.

ok sthen@
This commit is contained in:
brad 2013-08-12 20:22:44 +00:00
parent 18644709c4
commit a7c3fdab88
3 changed files with 5 additions and 29 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.50 2013/03/11 11:23:51 espie Exp $
# $OpenBSD: Makefile,v 1.51 2013/08/12 20:22:44 brad Exp $
COMMENT= virus/spam scanning framework
V= 4.84
Vs= 5
Vss= ${Vs}-3
Vs= 6
Vss= ${Vs}-1
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
DISTNAME= mailscanner-${V}.${Vss}

View File

@ -1,2 +1,2 @@
SHA256 (MailScanner-install-4.84.5-3.tar.gz) = xRtUN6AAy/Kgwrtbh/ptUCi5HwwvqswXfNFncb41nmE=
SIZE (MailScanner-install-4.84.5-3.tar.gz) = 9510226
SHA256 (MailScanner-install-4.84.6-1.tar.gz) = 2IAGKL8rftSAEhvAYgmHILE/NMk4x1oeNbakGP/NLAM=
SIZE (MailScanner-install-4.84.6-1.tar.gz) = 9507315

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-lib_MailScanner_TNEF_pm,v 1.2 2012/03/06 08:34:20 sthen Exp $
http://permalink.gmane.org/gmane.mail.virus.mailscanner/77741
--- lib/MailScanner/TNEF.pm.orig Sat Aug 20 13:32:02 2011
+++ lib/MailScanner/TNEF.pm Mon Mar 5 13:13:40 2012
@@ -229,8 +229,7 @@ sub ExternalDecoder {
# Create the subdir to unpack it into
#my $unpackdir = "tnef.$$";
- my ($tmpfh, $unpackdir) = tempfile("tnefXXXXXX", TMPDIR => $dir, UNLINK => 0);
- $dir =~ s,^.*/,,;
+ my $unpackdir = tempdir("tnefXXXXXX");
$unpackdir = $message->MakeNameSafe($unpackdir, $dir);
unless (mkdir "$dir/$unpackdir", 0777) {
MailScanner::Log::WarnLog("Trying to unpack %s in message %s, could not create subdirectory %s, failed to unpack TNEF message", $tnefname, $message->{id},
@@ -238,6 +237,7 @@ sub ExternalDecoder {
return 0;
}
chmod 0700, "$dir/$unpackdir";
+ chown $owner, $group, "$dir/$unpackdir" if $change;
my $cmd = MailScanner::Config::Value('tnefexpander') .
" -f $dir/$tnefname -C $dir/$unpackdir --overwrite";