From 57cd7524525b037cd04c31f21c5c927e12d7379b Mon Sep 17 00:00:00 2001 From: pav Date: Tue, 4 May 2004 18:04:24 +0000 Subject: - Update to 4.30.3 PR: ports/66197 Submitted by: Jan-Peter Koopmann (maintainer) --- mail/mailscanner/Makefile | 5 +- mail/mailscanner/distinfo | 4 +- .../files/patch-bin:update_virus_scanners | 12 - .../mailscanner/files/patch-docs:man:MailScanner.8 | 6 +- .../files/patch-docs:man:MailScanner.conf.5 | 352 ++++++- .../files/patch-docs:man:MailScanner.conf.5.html | 1036 ++++++++++++++++++++ .../files/patch-lib:MailScanner:MessageBatch.pm | 14 - mail/mailscanner/pkg-plist | 3 + 8 files changed, 1394 insertions(+), 38 deletions(-) delete mode 100644 mail/mailscanner/files/patch-bin:update_virus_scanners create mode 100644 mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html delete mode 100644 mail/mailscanner/files/patch-lib:MailScanner:MessageBatch.pm (limited to 'mail') diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 00cf386781c8..7708f6a0bfff 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -6,8 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.29.7 -PORTREVISION= 1 +PORTVERSION= 4.30.3 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL} @@ -36,7 +35,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} \ CONFLICTS= MailScanner-devel-* -PATCHLEVEL= 1 +PATCHLEVEL= 2 USE_PERL5= yes diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo index cf2d43882aa6..4aad5dada09f 100644 --- a/mail/mailscanner/distinfo +++ b/mail/mailscanner/distinfo @@ -1,2 +1,2 @@ -MD5 (MailScanner-4.29.7-1.tar.gz) = 89e6b726026007bd9e44ccfdb1048e11 -SIZE (MailScanner-4.29.7-1.tar.gz) = 980321 +MD5 (MailScanner-4.30.3-2.tar.gz) = f6e069ca4c46b91b937e0aa34749b2d1 +SIZE (MailScanner-4.30.3-2.tar.gz) = 996850 diff --git a/mail/mailscanner/files/patch-bin:update_virus_scanners b/mail/mailscanner/files/patch-bin:update_virus_scanners deleted file mode 100644 index a160c97304cc..000000000000 --- a/mail/mailscanner/files/patch-bin:update_virus_scanners +++ /dev/null @@ -1,12 +0,0 @@ ---- ../MailScanner-4.29.7.orig/bin/update_virus_scanners Wed Apr 28 13:38:29 2004 -+++ bin/update_virus_scanners Wed Apr 28 13:39:10 2004 -@@ -8,7 +8,8 @@ - # the lockfile is not meant to be perfect, it's just in case the - # two cron scripts get run close to each other to keep them from - # stepping on each other's toes. --[ -f $LOCKFILE ] && exit 0 -+ -+[ -f $LOCKFILE ] && [ "`find $LOCKFILE -type f -mmin +60 -print`" = "" ] && exit 0 - trap "rm -f $LOCKFILE" EXIT - touch $LOCKFILE - diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8 index c2c7e8698966..2b97168548e7 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.8 +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.8 @@ -1,8 +1,8 @@ ---- ../MailScanner-4.29.7.orig/docs/man/MailScanner.8 Thu Apr 1 15:14:21 2004 -+++ docs/man/MailScanner.8 Thu Apr 1 15:16:01 2004 +--- ../MailScanner-4.30.3.orig/docs/man/MailScanner.8 Mon May 3 10:48:25 2004 ++++ docs/man/MailScanner.8 Mon May 3 10:48:48 2004 @@ -1,4 +1,4 @@ -.TH "MailScanner" "8" "4.29.5" "Julian Field" "Mail" -+.TH "MailScanner" "8" "4.29.7" "Julian Field" "Mail" ++.TH "MailScanner" "8" "4.30.3" "Julian Field" "Mail" .SH "NAME" .LP MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 index f82418f818f1..5c81b3c9aedc 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 @@ -1,8 +1,352 @@ ---- ../MailScanner-4.29.7.orig/docs/man/MailScanner.conf.5 Thu Apr 1 15:14:21 2004 -+++ docs/man/MailScanner.conf.5 Thu Apr 1 15:16:09 2004 +--- ../MailScanner-4.30.3.orig/docs/man/MailScanner.conf.5 Mon May 3 10:48:25 2004 ++++ docs/man/MailScanner.conf.5 Mon May 3 10:48:39 2004 @@ -1,4 +1,4 @@ --.TH "MailScanner.conf" "5" "4.29.5" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.29.7" "Julian Field" "Mail" +-.TH "MailScanner.conf" "5" "4.30.1" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.30.3" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner +@@ -117,16 +117,20 @@ + Directory in which MailScanner should find e\-mail messages for scanning. This can be any of the following: + .br + ++.RS 7 ++.IP 1. 4 ++a directory name. ++.br ++Example: /var/spool/mqueue.in ++.IP 2. 4 ++a wildcard giving directory names. ++.br ++Example: /var/spool/mqueue.in/* ++.IP 3. 4 ++the name of a file containing a list of directory names, which can in turn contain wildcards. + .br +-1. a directory name. Example: /var/spool/mqueue.in +-.br +- +-.br +-2. a wildcard giving directory names. Example: /var/spool/mqueue.in/* +-.br +- +-.br +-3. the name of a file containing a list of directory names, which can in turn contain wildcards. Example: /usr/local/etc/MailScanner/mqueue.in.list.conf ++Example: /usr/local/etc/MailScanner/mqueue.in.list.conf ++.RE + + .TP + \fBOutgoing Queue Dir\fR +@@ -515,17 +519,18 @@ + .br + Messages whose virus reports contain any of the words listed here will be treated as "silent" viruses. No messages will be sent back to the senders of these viruses, and the delivery to the recipient of the message can be controlled by the next option "Still Deliver Silent Viruses". This is primarily designed for viruses such as "Klez" and "Bugbear" which put fake addresses on messages they send, so there is no point informing the sender of the message, as it won't actually be them who sent it anyway. Other words that can be put in this list are the 5 special keywords + .br ++.RS 7 ++.IP \(bu 4 + HTML\-IFrame: inserting this will stop senders being warned about HTML Iframe tags, when they are not allowed. +-.br ++.IP \(bu 4 + HTML\-Codebase: inserting this will stop senders being warned about HTML Object Codebase tags, when they are not allowed. +-.br ++.IP \(bu 4 + Zip\-Password: inserting this will stop senders being warned about password\-protected zip files when they are not allowd. This keyword is not needed if you include All\-Viruses. +-.br ++.IP \(bu 4 + All\-Viruses: inserting this will stop senders being warned about any virus, while still allowing you to warn senders about HTML\-based attacks. This includes Zip\-Password so you don't need to include both. + .br +- +-.br + The default of "All\-Viruses" means that no senders of viruses will be notified (as the sender address is always forged these days anyway), but anyone who sends a message that is blocked for other reasons will still be notified. ++.RE + + + .TP +@@ -580,17 +585,16 @@ + .br + + .br +-Do you want to allow HTML