Date: Mon, 6 Mar 2006 19:11:07 +0100 (CET) From: Jan-Peter Koopmann <j.koopmann@seceidos.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/94144: [MAINTAINER] mail/MailScanner: update to 4.51.5 Message-ID: <200603061811.k26IB7Qu095209@services.intern.seceidos.de> Resent-Message-ID: <200603061820.k26IK9n3057682@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94144 >Category: ports >Synopsis: [MAINTAINER] mail/MailScanner: update to 4.51.5 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Mar 06 18:20:09 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jan-Peter Koopmann >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan 5 10:56:46 CET >Description: - Update to 4.51.5 ChangeLog: fixed mta.sh script 2/3/2006 New in Version 4.51.5-1 ================================ * New Features and Improvements * - Syntax checking of Spam Actions (and its brothers) at run time. Message will be delivered if an error is found. - Improved detection of Solaris GCC in the installers. - New option "Use TNEF Contents" allows you to add the contents of winmail.dat attachments to messages in TNEF format. This means that users not running Microsoft Outlook can read attachments put there by badly-configured Outlook or Exchange systems. Valid values are "no", "add" or "replace" which do pretty much what they say. Explanations are in MailScanner.conf. - Improved PID handling in sendmail on SuSE systems. - Improved logging of overall batch timing. * Fixes * - "Use TNEF Contents = replace" didn't work in release 4.51.4. Fixed. 2/2/2006 New in Version 4.50.15-1 Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- MailScanner-4.51.5.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/Makefile,v retrieving revision 1.45 diff -u -r1.45 Makefile --- Makefile 16 Feb 2006 16:34:56 -0000 1.45 +++ Makefile 6 Mar 2006 18:09:43 -0000 @@ -6,8 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.50.15 -PORTREVISION= 1 +PORTVERSION= 4.51.5 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/distinfo,v retrieving revision 1.32 diff -u -r1.32 distinfo --- distinfo 15 Feb 2006 10:46:59 -0000 1.32 +++ distinfo 6 Mar 2006 18:09:43 -0000 @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.50.15-1.tar.gz) = ae3e66568abf465b8a5a34db7011d72b -SIZE (MailScanner-install-4.50.15-1.tar.gz) = 6542222 +MD5 (MailScanner-install-4.51.5-1.tar.gz) = 9d8d732aa73fdc75bf86510891dc1669 +SIZE (MailScanner-install-4.51.5-1.tar.gz) = 6544488 Index: files/CHANGES.port =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/CHANGES.port,v retrieving revision 1.1 diff -u -r1.1 CHANGES.port --- files/CHANGES.port 16 Feb 2006 16:34:56 -0000 1.1 +++ files/CHANGES.port 6 Mar 2006 18:09:43 -0000 @@ -1,3 +1,10 @@ + +Version 4.51.5 +================= +- Some changes in FreeBSD 6.1 resulted in problems in the mta.sh script. + Fixed. +- Upgrade to MailScanenr 4.51 + Version 4.50.15_1 ================= - The MailScanner binary is now put into /usr/local/sbin allowing for Index: files/mta.sh.in =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/mta.sh.in,v retrieving revision 1.2 diff -u -r1.2 mta.sh.in --- files/mta.sh.in 20 Feb 2006 20:47:12 -0000 1.2 +++ files/mta.sh.in 6 Mar 2006 18:09:43 -0000 @@ -51,11 +51,22 @@ # mta_submitqueue_pidfile="/var/spool/clientmqueue/sm-client.pid" # +PATH=$PATH:/sbin:/usr/sbin; export PATH + . %%RC_SUBR%% name="mta" rcvar=`set_rcvar` +_mta_rc_script="%%PREFIX%%/etc/rc.d/mta" +_mta_osversion="`sysctl -n kern.osreldate`" +if [ \( "$_mta_osversion" -lt "600101" \) -o \ + \( \( $_mta_osversion -ge 700000 \) -a \ + \( $_mta_osversion -lt 700007 \) \) ] +then + $_mta_rc_script="{$_mta_rc_script}.sh" +fi + load_rc_config $name : ${mta_enable="NO"} @@ -102,13 +113,13 @@ eval mta_pidfile=\${mta_${profile}_pidfile:-${mta_pidfile}} pidfile="${_pidprefix}.${profile}.pid" else - echo "$0: extra argument ignored" + echo "$_mta_rc_script: extra argument ignored" fi else if [ "x${mta_profiles}" != "x" ]; then for profile in ${mta_profiles}; do echo "===> mta profile: ${profile}" - $0 $1 $profile + $_mta_rc_script $1 $profile retcode=$? if [ "$?" -ne 0 ]; then failed="${profile} ({$retcode}) ${failed}" Index: files/patch-docs:man:MailScanner.conf.5 =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5,v retrieving revision 1.27 diff -u -r1.27 patch-docs:man:MailScanner.conf.5 --- files/patch-docs:man:MailScanner.conf.5 15 Feb 2006 10:47:00 -0000 1.27 +++ files/patch-docs:man:MailScanner.conf.5 6 Mar 2006 18:09:43 -0000 @@ -1,12 +1,35 @@ ---- ../MailScanner-install-4.50.15.orig/docs/man/MailScanner.conf.5 Tue Feb 7 13:45:33 2006 -+++ docs/man/MailScanner.conf.5 Tue Feb 7 13:58:52 2006 +--- ../MailScanner-install-4.51.5.orig/docs/man/MailScanner.conf.5 Mon Mar 6 19:05:04 2006 ++++ docs/man/MailScanner.conf.5 Mon Mar 6 19:05:25 2006 @@ -1,4 +1,4 @@ -.TH "MailScanner.conf" "5" "4.50.1" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.50.15" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.51.5" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner -@@ -423,6 +423,12 @@ +@@ -364,6 +364,22 @@ + Should we use a TNEF decoder (external or Perl module)? This should be "yes" unless the scanner you are using (Sophos, McAfee) has the facility built\-in. However, if you set it to "no", then the filenames within the TNEF attachment will not be checked against the filename rules. + + .TP ++\fBUse TNEF Contents\fR ++Default: replace ++.br ++When the TNEF (winmail.dat) attachments are expanded, should the attachments contained in there be added to the list of attachments in the message? If you set this to "add" or "replace" then recipients of messages sent in "Outlook Rich Text Format" (TNEF) will be able to read the attachments if they are not using Microsoft Outlook. ++.br ++.RS 7 ++.IP \(bu 4 ++no: Leave winmail.dat TNEF attachments alone. ++.IP \(bu 4 ++add: Add the contents of winmail.dat as extra attachments, but also still include the winmail.dat file itself. This will result in TNEF messages being doubled in size. ++.IP \(bu 4 ++replace: Replace the winmail.dat TNEF attachment with the files it contains, and delete the original winmail.dat file itself. This means the message stays the same size, but is usable by non\-Outlook recipients. ++.RE ++ ++ ++.TP + \fBDeliver Unparsable TNEF\fR + Default: no + .br +@@ -423,6 +439,12 @@ The maximum length of time the "unrar" command is allowed to run for 1 RAR archive (in seconds) .TP @@ -19,7 +42,7 @@ \fBBlock Encrypted Messages\fR Default: no .br -@@ -521,7 +527,7 @@ +@@ -521,7 +543,7 @@ .SH "Virus scanning and vulnerability testing" .TP \fBVirus Scanning\fR @@ -28,7 +51,7 @@ .br .br -@@ -529,7 +535,7 @@ +@@ -529,7 +551,7 @@ .br NOTE: Switching this to no completely disables all virus\-scanning functionality. If you just want to switch of actual virus scanning, then set "Virus Scanners = none" instead. .br @@ -37,7 +60,7 @@ .TP \fBVirus Scanners\fR -@@ -1682,7 +1688,7 @@ +@@ -1682,7 +1704,7 @@ .SH "SpamAssassin" .TP \fBUse SpamAssassin\fR @@ -46,7 +69,7 @@ .br .br -@@ -2113,6 +2119,22 @@ +@@ -2113,6 +2135,22 @@ .RE .TP @@ -69,7 +92,7 @@ \fBDebug\fR Default: no .br -@@ -2167,6 +2189,15 @@ +@@ -2167,6 +2205,15 @@ .br The value of the option is actually never used, but it is evaluated at the end of processing a batch of messages. It is designed to be used in conjunction with a Custom Function. The Custom Function should then be written to have a "side effect" of doing something useful such as logging lots of information about the batch of messages to a file or an SQL database. Index: files/patch-docs:man:MailScanner.conf.5.html =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html,v retrieving revision 1.23 diff -u -r1.23 patch-docs:man:MailScanner.conf.5.html --- files/patch-docs:man:MailScanner.conf.5.html 15 Feb 2006 10:47:00 -0000 1.23 +++ files/patch-docs:man:MailScanner.conf.5.html 6 Mar 2006 18:09:43 -0000 @@ -1,6 +1,6 @@ ---- ../MailScanner-install-4.50.15.orig/docs/man/MailScanner.conf.5.html Tue Feb 7 13:45:34 2006 -+++ docs/man/MailScanner.conf.5.html Tue Feb 7 13:58:55 2006 -@@ -1,7013 +1,7099 @@ +--- ../MailScanner-install-4.51.5.orig/docs/man/MailScanner.conf.5.html Mon Mar 6 19:05:04 2006 ++++ docs/man/MailScanner.conf.5.html Mon Mar 6 19:05:28 2006 +@@ -1,7013 +1,7172 @@ -<!-- Creator : groff version 1.19 --> -<!-- CreationDate: Wed Jan 4 14:36:14 2006 --> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" @@ -7015,7 +7015,7 @@ -</body> -</html> +<!-- Creator : groff version 1.19 --> -+<!-- CreationDate: Tue Feb 7 13:58:30 2006 --> ++<!-- CreationDate: Mon Mar 6 19:04:33 2006 --> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" +"http://www.w3.org/TR/html4/loose.dtd">; +<html> @@ -8080,6 +8080,73 @@ +<tr valign="top" align="left"> +<td width="11%"></td> +<td width="89%"> ++<p><b>Use TNEF Contents</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: replace<br> ++When the TNEF (winmail.dat) attachments are expanded, should ++the attachments contained in there be added to the list of ++attachments in the message? If you set this to ++"add" or "replace" then recipients of ++messages sent in "Outlook Rich Text Format" (TNEF) ++will be able to read the attachments if they are not using ++Microsoft Outlook.</p> ++</td> ++</table> ++<!-- TABS --> ++<table width="100%" border=0 rules="none" frame="void" ++ cols="4" cellspacing="0" cellpadding="0"> ++<tr valign="top" align="left"> ++<td width="22%"></td> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="72%"> ++ ++<p>no: Leave winmail.dat TNEF attachments alone.</p> ++</td> ++<tr valign="top" align="left"> ++<td width="22%"></td> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="72%"> ++ ++<p>add: Add the contents of winmail.dat as extra ++attachments, but also still include the winmail.dat file ++itself. This will result in TNEF messages being doubled in ++size.</p> ++</td> ++<tr valign="top" align="left"> ++<td width="22%"></td> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="72%"> ++ ++<p>replace: Replace the winmail.dat TNEF attachment with ++the files it contains, and delete the original winmail.dat ++file itself. This means the message stays the same size, but ++is usable by non−Outlook recipients.</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>Deliver Unparsable TNEF</b></p></td> +</table> +<!-- INDENTATION --> @@ -8088,8 +8155,14 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: no</p> ++<p>Default: no</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="28%"></td> ++<td width="72%"> +<p>Rich Text format attachments produced by some versions of +Microsoft Outlook cannot be completely decoded at present. +Setting this option to yes allows compatibility with the --- MailScanner-4.51.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603061811.k26IB7Qu095209>