Attachment 41248 Details for Bug 64618 – MailScanner-devel-4.29.5.patch

[patch] MailScanner-devel-4.29.5.patch

MailScanner-devel-4.29.5.patch (text/plain), 8.93 KB, created by Jan-Peter Koopmann on 2004-03-23 13:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan-Peter Koopmann

Created: 2004-03-23 13:50:11 UTC

Size: 8.93 KB

patch

obsolete

>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/Makefile /server-root/ports/mail/mailscanner-devel/Makefile
>--- /server-root/ports/mail/mailscanner-devel.orig/Makefile	Fri Mar 19 17:20:20 2004
>+++ /server-root/ports/mail/mailscanner-devel/Makefile	Tue Mar 23 14:29:46 2004
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	MailScanner
>-PORTVERSION=	4.29.2
>+PORTVERSION=	4.29.5
> CATEGORIES=	mail
> MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
> PKGNAMESUFFIX=	-devel
>@@ -24,6 +24,7 @@
> 	${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}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
> 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
> 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
> 	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
>@@ -75,7 +76,8 @@
> 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
> 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
> 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
>-		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
>+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
>+		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g;' \
> 		${WRKSRC}/etc/MailScanner.conf
> 	${PERL} -pi -e \
> 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
>@@ -148,6 +150,7 @@
> 	# Step 4: Install lib
> 	#
> 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
>+	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
> 	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
> 		${PREFIX}/lib/MailScanner/MailScanner.pm
> 	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/distinfo /server-root/ports/mail/mailscanner-devel/distinfo
>--- /server-root/ports/mail/mailscanner-devel.orig/distinfo	Fri Mar 19 17:20:20 2004
>+++ /server-root/ports/mail/mailscanner-devel/distinfo	Tue Mar 23 13:54:02 2004
>@@ -1,2 +1,2 @@
>-MD5 (MailScanner-4.29.2-1.tar.gz) = e10decebce84808c83394cecf16a0b3a
>-SIZE (MailScanner-4.29.2-1.tar.gz) = 972551
>+MD5 (MailScanner-4.29.5-1.tar.gz) = 44cb5971ce7611be52a95b919385da90
>+SIZE (MailScanner-4.29.5-1.tar.gz) = 978263
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8	Fri Mar 19 17:20:21 2004
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8	Tue Mar 23 14:42:34 2004
>@@ -1,8 +1,8 @@
>---- ../MailScanner-4.29.2.orig/docs/man/MailScanner.8	Thu Mar 18 13:51:47 2004
>-+++ docs/man/MailScanner.8	Thu Mar 18 13:53:42 2004
>+--- ../MailScanner-4.29.5.orig/docs/man/MailScanner.8	Tue Mar 23 14:41:54 2004
>++++ docs/man/MailScanner.8	Tue Mar 23 14:42:11 2004
> @@ -1,4 +1,4 @@
> -.TH "MailScanner" "8" "4.28.5" "Julian Field" "Mail"
>-+.TH "MailScanner" "8" "4.28.6" "Julian Field" "Mail"
>++.TH "MailScanner" "8" "4.29.5" "Julian Field" "Mail"
>  .SH "NAME"
>  .LP 
>  MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8.html /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8.html	Thu Jan  1 01:00:00 1970
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html	Tue Mar 23 14:42:34 2004
>@@ -0,0 +1,9 @@
>+--- ../MailScanner-4.29.5.orig/docs/man/MailScanner.8.html	Tue Mar 23 14:41:54 2004
>++++ docs/man/MailScanner.8.html	Tue Mar 23 14:42:14 2004
>+@@ -1,5 +1,5 @@
>+ 
>+-
>++
>+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
>+ "http://www.w3.org/TR/html4/loose.dtd">
>+ <html>
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5	Fri Mar 19 17:20:21 2004
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5	Tue Mar 23 14:42:34 2004
>@@ -1,8 +1,25 @@
>---- ../MailScanner-4.29.2.orig/docs/man/MailScanner.conf.5	Thu Mar 18 13:51:47 2004
>-+++ docs/man/MailScanner.conf.5	Thu Mar 18 13:53:42 2004
>+--- ../MailScanner-4.29.5.orig/docs/man/MailScanner.conf.5	Tue Mar 23 14:41:54 2004
>++++ docs/man/MailScanner.conf.5	Tue Mar 23 14:42:19 2004
> @@ -1,4 +1,4 @@
> -.TH "MailScanner.conf" "5" "4.28.5" "Julian Field" "Mail"
>-+.TH "MailScanner.conf" "5" "4.28.6" "Julian Field" "Mail"
>++.TH "MailScanner.conf" "5" "4.29.5" "Julian Field" "Mail"
>  .SH "NAME"
>  .LP 
>  MailScanner.conf \- Main configuration for MailScanner
>+@@ -1739,6 +1739,16 @@
>+ 
>+ .br 
>+ This is the directory in which lock files are placed to stop the virus scanners used while they are in the middle of updating themselves with new virus definitions. If you change this at all, you will need to edit the "autoupdate" scripts for all your virus scanners. 
>++
>++.TP 
>++\fBCustom Functions Dir\fR
>++Default: /opt/MailScanner/lib/MailScanner/CustomFunctions
>++.br 
>++Default FreeBSD: /usr/local/lib/MailScanner/MailScanner/CustomFunctions
>++.br 
>++
>++.br 
>++Where to put the code for your "Custom Functions". No code in this 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.
>+ 
>+ .TP 
>+ \fBLock Type\fR
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5.html /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5.html	Thu Jan  1 01:00:00 1970
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html	Tue Mar 23 14:42:34 2004
>@@ -0,0 +1,43 @@
>+--- ../MailScanner-4.29.5.orig/docs/man/MailScanner.conf.5.html	Tue Mar 23 14:41:54 2004
>++++ docs/man/MailScanner.conf.5.html	Tue Mar 23 14:42:22 2004
>+@@ -1,5 +1,5 @@
>+ 
>+-
>++
>+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
>+ "http://www.w3.org/TR/html4/loose.dtd">
>+ <html>
>+@@ -4701,6 +4701,33 @@
>+ change this at all, you will need to edit the
>+ &quot;autoupdate&quot; scripts for all your virus
>+ scanners.</p>
>++</td>
>++</table>
>++
>++<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>Custom Functions Dir</b></p></td>
>++</table>
>++
>++<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:
>++/opt/MailScanner/lib/MailScanner/CustomFunctions<br>
>++Default FreeBSD:
>++/usr/local/lib/MailScanner/MailScanner/CustomFunctions</p>
>++
>++<p>Where to put the code for your &quot;Custom
>++Functions&quot;. No code in this directory should be
>++over&minus;written by the installation or upgrade process.
>++All files starting with &quot;.&quot; or ending with
>++&quot;.rpmnew&quot; will be ignored, all other files will be
>++compiled and may be used with Custom Functions.</p>
>+ </td>
>+ </table>
>+ 
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/pkg-plist /server-root/ports/mail/mailscanner-devel/pkg-plist
>--- /server-root/ports/mail/mailscanner-devel.orig/pkg-plist	Fri Mar 19 17:20:20 2004
>+++ /server-root/ports/mail/mailscanner-devel/pkg-plist	Tue Mar 23 14:31:49 2004
>@@ -11,6 +11,7 @@
> etc/rc.d/mailscanner.sh.sample
> etc/rc.d/mta.sh.sample
> lib/MailScanner/MailScanner.pm
>+lib/MailScanner/MailScanner/BinHex.pm
> lib/MailScanner/MailScanner/Config.pm
> lib/MailScanner/MailScanner/ConfigDefs.pl
> lib/MailScanner/MailScanner/CustomConfig.pm
>@@ -42,6 +43,7 @@
> lib/MailScanner/MailScanner/ZMDiskStore.pm
> lib/MailScanner/MailScanner/ZMailer.pm
> lib/MailScanner/MailScanner/notes.txt
>+lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
> libexec/MailScanner/MailScanner
> libexec/MailScanner/antivir-autoupdate.sample
> libexec/MailScanner/antivir-wrapper.sample
>@@ -538,6 +540,7 @@
> @dirrm %%DATADIR%%/reports
> @dirrm %%DATADIR%%
> @dirrm libexec/MailScanner
>+@dirrm lib/MailScanner/MailScanner/CustomFunctions
> @dirrm lib/MailScanner/MailScanner
> @dirrm lib/MailScanner
> @dirrm etc/MailScanner/rules

Actions: View | Diff

Attachments on bug 64618: 41248