author: Greg Lewis <glewis@FreeBSD.org> 2004-03-02 17:29:42 +0000
committer: Greg Lewis <glewis@FreeBSD.org> 2004-03-02 17:29:42 +0000
commit: 38ce5c5c4ad04bd9563ef250b6bd43f5b589deeb (patch)
tree: 9b5dd8ce9b60f46df113ed1576801b6dbea05f49 /mail
parent: 52c30e3635c09d16018c038b90ff638a30f9bde6 (diff)
download: ports-38ce5c5c4ad04bd9563ef250b6bd43f5b589deeb.tar.gz
ports-38ce5c5c4ad04bd9563ef250b6bd43f5b589deeb.zip
8 files changed, 59 insertions, 133 deletions
diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index 8c8b62b72089..8c4f70fcce61 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.27.3
-PORTREVISION=	1
+PORTVERSION=	4.28.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 PKGNAMESUFFIX=	-devel
@@ -25,8 +24,8 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
-	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR
-
+	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
 		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
@@ -140,7 +139,7 @@ do-install:
 	#
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
-		mkdir ${DATADIR}/{} \;
+		${MKDIR} ${DATADIR}/{} \;
 	cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
 		${INSTALL_DATA} {} ${DATADIR}/{}.sample \;
 	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
@@ -166,7 +165,7 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
 	cd ${WRKSRC}/docs && \
-		${FIND} * -type d -exec mkdir ${DOCSDIR}/{} \; && \
+		${FIND} * -type d -exec ${MKDIR} ${DOCSDIR}/{} \; && \
 		${FIND} * -type f ! -name "*.orig" -exec \
 			${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 .endif
diff --git a/mail/mailscanner-devel/distinfo b/mail/mailscanner-devel/distinfo
index b04afaf52213..8bbf9be99653 100644
--- a/mail/mailscanner-devel/distinfo
+++ b/mail/mailscanner-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (MailScanner-4.27.3-1.tar.gz) = 96bb1eecd50ab89493280cfb9f8b1a0f
-SIZE (MailScanner-4.27.3-1.tar.gz) = 957623
+MD5 (MailScanner-4.28.1-1.tar.gz) = 65ea5f2249bbd1d4dc3f9241f8dc655e
+SIZE (MailScanner-4.28.1-1.tar.gz) = 988746
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8 b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
index 8ac56c0b5ace..800755ff3a4e 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
@@ -1,13 +1,10 @@
---- ../MailScanner-4.27.3.orig/docs/man/MailScanner.8	Fri Feb 13 11:29:03 2004
-+++ docs/man/MailScanner.8	Fri Feb 13 12:56:31 2004
+$FreeBSD$
+
+--- ../MailScanner-4.27.5.orig/docs/man/MailScanner.8	Thu Feb 26 15:25:49 2004
++++ docs/man/MailScanner.8	Thu Feb 26 15:27:36 2004
 @@ -1,4 +1,4 @@
--.TH "MailScanner" "8" "4.26.6" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.27.3" "Julian Field" "Mail"
+-.TH "MailScanner" "8" "4.27.4" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.28.1" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
-@@ -100,4 +100,3 @@
- .SH "SEE ALSO"
- .LP 
- MailScanner.conf(5)
--)
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
deleted file mode 100644
index 09cd8f1b98bc..000000000000
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
+++ /dev/null
@@ -1,9 +0,0 @@
---- ../MailScanner-4.27.3.orig/docs/man/MailScanner.8.html	Fri Feb 13 11:29:03 2004
-+++ docs/man/MailScanner.8.html	Fri Feb 13 12:56:31 2004
-@@ -1,5 +1,5 @@
- <!-- Creator     : groff version 1.19 -->
--<!-- CreationDate: Mon Jan 26 16:29:48 2004 -->
-+<!-- CreationDate: Fri Feb 13 12:56:03 2004 -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
- <html>
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
index d531a9dd5a6e..8593f55edada 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
@@ -1,34 +1,10 @@
---- ../MailScanner-4.27.3.orig/docs/man/MailScanner.conf.5	Fri Feb 13 11:29:03 2004
-+++ docs/man/MailScanner.conf.5	Fri Feb 13 12:56:36 2004
+$FreeBSD$
+
+--- ../MailScanner-4.27.5.orig/docs/man/MailScanner.conf.5	Thu Feb 26 15:25:49 2004
++++ docs/man/MailScanner.conf.5	Thu Feb 26 15:27:43 2004
 @@ -1,4 +1,4 @@
--.TH "MailScanner.conf" "5" "4.26.6" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.27.3" "Julian Field" "Mail"
+-.TH "MailScanner.conf" "5" "4.27.4" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.28.1" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
-@@ -1463,6 +1463,9 @@
- .br 
- "attachment" \- Convert the original message into an attachment of the message. This means the user has to take an extra step to open the spam, and stops "web bugs" very effectively.
- 
-+.br 
-+"bounce" \- bounce the spam message. This option should not be used and must be enabled with the "Enable Spam Bounce" option first.
-+
- .TP 
- \fBHigh Scoring Spam Actions\fR
- Default: deliver
-@@ -1518,6 +1521,15 @@
- 
- .br 
- If you use the 'notify' Spam Action or High Scoring Spam Action then this is the location of the notification message that is sent to the original recipients of the message.
-+
-+.TP 
-+\fBEnable Spam Bounce\fR
-+Default: %rules\-dir%/bounce.rules
-+.br 
-+
-+.br 
-+You can use this ruleset to enable the "bounce" Spam Action. You must *only* enable this for mail from sites with which you have agreed to bounce possible spam. Use it on low\-scoring spam only (<10) and only to your regular customers for use in the rare case that a message is mis\-tagged as spam when it shouldn't have been. Beware that many sites will automatically delete the bounce messages created by using this option unless you have agreed this with them in advance.
-+
- 
- .SH "System logging"
- .TP 
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
deleted file mode 100644
index d6d5bf197378..000000000000
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../MailScanner-4.27.3.orig/docs/man/MailScanner.conf.5.html	Fri Feb 13 11:29:03 2004
-+++ docs/man/MailScanner.conf.5.html	Fri Feb 13 12:56:36 2004
-@@ -1,5 +1,5 @@
- <!-- Creator     : groff version 1.19 -->
--<!-- CreationDate: Tue Jan 27 16:56:37 2004 -->
-+<!-- CreationDate: Fri Feb 13 12:56:03 2004 -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
- <html>
-@@ -3890,6 +3890,10 @@
- message into an attachment of the message. This means the
- user has to take an extra step to open the spam, and stops
- &quot;web bugs&quot; very effectively.</p>
-+<!-- INDENTATION -->
-+<p>&quot;bounce&quot; &minus; bounce the spam message. This
-+option should not be used and must be enabled with the
-+&quot;Enable Spam Bounce&quot; option first.</p>
- </td>
- </table>
- <!-- INDENTATION -->
-@@ -4044,6 +4048,33 @@
- Scoring Spam Action then this is the location of the
- notification message that is sent to the original recipients
- of the message.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Enable Spam Bounce</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: %rules&minus;dir%/bounce.rules</p>
-+<!-- INDENTATION -->
-+<p>You can use this ruleset to enable the &quot;bounce&quot;
-+Spam Action. You must *only* enable this for mail from sites
-+with which you have agreed to bounce possible spam. Use it
-+on low&minus;scoring spam only (&lt;10) and only to your
-+regular customers for use in the rare case that a message is
-+mis&minus;tagged as spam when it shouldn&rsquo;t have been.
-+Beware that many sites will automatically delete the bounce
-+messages created by using this option unless you have agreed
-+this with them in advance.</p>
- </td>
- </table>
- <a name="System logging"></a>
diff --git a/mail/mailscanner-devel/files/patch-lib:clamav-wrapper b/mail/mailscanner-devel/files/patch-lib:clamav-wrapper
new file mode 100644
index 000000000000..9faf1723b320
--- /dev/null
+++ b/mail/mailscanner-devel/files/patch-lib:clamav-wrapper
@@ -0,0 +1,14 @@
+$FreeBSD$
+
+--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper	Thu Feb 26 15:25:51 2004
++++ lib/clamav-wrapper	Thu Feb 26 15:26:23 2004
+@@ -51,6 +51,9 @@
+ 
+ # You may want to check this script for bash-isms
+ 
++PATH=$PATH:/usr/local/bin
++export PATH
++
+ TempDir="/tmp/clamav.$$"
+ ClamUser="clamav"
+ ClamGroup="clamav"
diff --git a/mail/mailscanner-devel/pkg-plist b/mail/mailscanner-devel/pkg-plist
index c913343ae9f3..df42dd218789 100644
--- a/mail/mailscanner-devel/pkg-plist
+++ b/mail/mailscanner-devel/pkg-plist
@@ -50,6 +50,8 @@ libexec/MailScanner/bitdefender-wrapper.sample
 libexec/MailScanner/clamav-autoupdate.sample
 libexec/MailScanner/clamav-wrapper.sample
 libexec/MailScanner/command-wrapper.sample
+libexec/MailScanner/css-wrapper.sample
+libexec/MailScanner/css-autoupdate.sample
 libexec/MailScanner/drweb-wrapper.sample
 libexec/MailScanner/etrust-autoupdate.sample
 libexec/MailScanner/etrust-wrapper.sample
@@ -77,29 +79,29 @@ libexec/MailScanner/sophos-wrapper.sample
 libexec/MailScanner/trend-autoupdate.sample
 libexec/MailScanner/trend-wrapper.sample
 libexec/MailScanner/update_virus_scanners
-%%DATADIR%%/reports/cat/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cat/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cat/disinfected.report.txt.sample
-%%DATADIR%%/reports/cat/inline.sig.html.sample
-%%DATADIR%%/reports/cat/inline.sig.txt.sample
-%%DATADIR%%/reports/cat/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cat/inline.warning.html.sample
-%%DATADIR%%/reports/cat/inline.warning.txt.sample
-%%DATADIR%%/reports/cat/languages.conf.sample
-%%DATADIR%%/reports/cat/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cat/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/cat/sender.error.report.txt.sample
-%%DATADIR%%/reports/cat/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cat/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cat/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cat/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cat/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cat/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cat/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cat/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cat/sender.content.report.txt.sample
-%%DATADIR%%/reports/cat/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cat/stored.content.message.txt.sample
+%%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
+%%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
+%%DATADIR%%/reports/ca/disinfected.report.txt.sample
+%%DATADIR%%/reports/ca/inline.sig.html.sample
+%%DATADIR%%/reports/ca/inline.sig.txt.sample
+%%DATADIR%%/reports/ca/inline.spam.warning.txt.sample
+%%DATADIR%%/reports/ca/inline.warning.html.sample
+%%DATADIR%%/reports/ca/inline.warning.txt.sample
+%%DATADIR%%/reports/ca/languages.conf.sample
+%%DATADIR%%/reports/ca/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/ca/recipient.spam.report.txt.sample
+%%DATADIR%%/reports/ca/sender.error.report.txt.sample
+%%DATADIR%%/reports/ca/sender.filename.report.txt.sample
+%%DATADIR%%/reports/ca/sender.spam.rbl.report.txt.sample
+%%DATADIR%%/reports/ca/sender.spam.report.txt.sample
+%%DATADIR%%/reports/ca/sender.spam.sa.report.txt.sample
+%%DATADIR%%/reports/ca/sender.virus.report.txt.sample
+%%DATADIR%%/reports/ca/stored.filename.message.txt.sample
+%%DATADIR%%/reports/ca/stored.virus.message.txt.sample
+%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
+%%DATADIR%%/reports/ca/sender.content.report.txt.sample
+%%DATADIR%%/reports/ca/sender.mcp.report.txt.sample
+%%DATADIR%%/reports/ca/stored.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
@@ -532,6 +534,7 @@ libexec/MailScanner/update_virus_scanners
 @dirrm %%DATADIR%%/reports/de
 @dirrm %%DATADIR%%/reports/cz
 @dirrm %%DATADIR%%/reports/cy+en
+@dirrm %%DATADIR%%/reports/ca
 @dirrm %%DATADIR%%/reports/cat
 @dirrm %%DATADIR%%/reports
 @dirrm %%DATADIR%%
author	Greg Lewis <glewis@FreeBSD.org>	2004-03-02 17:29:42 +0000
committer	Greg Lewis <glewis@FreeBSD.org>	2004-03-02 17:29:42 +0000
commit	38ce5c5c4ad04bd9563ef250b6bd43f5b589deeb (patch)
tree	9b5dd8ce9b60f46df113ed1576801b6dbea05f49 /mail
parent	52c30e3635c09d16018c038b90ff638a30f9bde6 (diff)
download	ports-38ce5c5c4ad04bd9563ef250b6bd43f5b589deeb.tar.gz ports-38ce5c5c4ad04bd9563ef250b6bd43f5b589deeb.zip