Attachment 80868 Details for Bug 115907 – MailScanner-4.62.9.patch

[patch] MailScanner-4.62.9.patch

MailScanner-4.62.9.patch (text/plain), 5.97 KB, created by Jan-Peter Koopmann on 2007-08-28 18:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan-Peter Koopmann

Created: 2007-08-28 18:30:01 UTC

Size: 5.97 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/mailscanner/Makefile,v
>retrieving revision 1.65
>diff -u -r1.65 Makefile
>--- Makefile	4 Jul 2007 15:04:02 -0000	1.65
>+++ Makefile	28 Aug 2007 17:08:45 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	MailScanner
>-PORTVERSION=	4.61.7
>+PORTVERSION=	4.62.9
> CATEGORIES=	mail
> MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
> DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
>@@ -51,7 +51,7 @@
> 
> CONFLICTS=	MailScanner-devel-[0-9]*
> 
>-PATCHLEVEL=	1
>+PATCHLEVEL=	3
> 
> USE_PERL5=	yes
> 
>@@ -125,7 +125,7 @@
> SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
> 
> post-extract:
>-	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
>+	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}-${PATCHLEVEL}/* .
> 
> do-build:
> 	${PERL} -pi -e \
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/mail/mailscanner/distinfo,v
>retrieving revision 1.44
>diff -u -r1.44 distinfo
>--- distinfo	4 Jul 2007 15:04:03 -0000	1.44
>+++ distinfo	28 Aug 2007 17:08:45 -0000
>@@ -1,3 +1,3 @@
>-MD5 (MailScanner-install-4.61.7-1.tar.gz) = 62b4af78e735a1708bb30bdbd6a0c908
>-SHA256 (MailScanner-install-4.61.7-1.tar.gz) = 1917f06684a5ba26302224f0d786911ec248384cb5c4c607965bd0ad9541d837
>-SIZE (MailScanner-install-4.61.7-1.tar.gz) = 7712590
>+MD5 (MailScanner-install-4.62.9-3.tar.gz) = f5c23f38a6d7bcb70d2820c126ce4c1a
>+SHA256 (MailScanner-install-4.62.9-3.tar.gz) = 5ff091c432585ba313eb2d10c457cd22093de188043112259c0adfd22117945f
>+SIZE (MailScanner-install-4.62.9-3.tar.gz) = 7741491
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/mail/mailscanner/pkg-plist,v
>retrieving revision 1.35
>diff -u -r1.35 pkg-plist
>--- pkg-plist	4 Jul 2007 15:04:03 -0000	1.35
>+++ pkg-plist	28 Aug 2007 17:08:45 -0000
>@@ -17,6 +17,7 @@
> lib/MailScanner/MailScanner/Config.pm
> lib/MailScanner/MailScanner/ConfigDefs.pl
> lib/MailScanner/MailScanner/CustomConfig.pm
>+lib/MailScanner/MailScanner/CustomFunctions/CustomAction.pm
> lib/MailScanner/MailScanner/CustomFunctions/GenericSpamScanner.pm
> lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
> lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
>Index: files/CHANGES.port
>===================================================================
>RCS file: /home/ncvs/ports/mail/mailscanner/files/CHANGES.port,v
>retrieving revision 1.18
>diff -u -r1.18 CHANGES.port
>--- files/CHANGES.port	4 Jul 2007 15:04:03 -0000	1.18
>+++ files/CHANGES.port	28 Aug 2007 17:08:45 -0000
>@@ -1,3 +1,10 @@
>+Version 4.62.9
>+==============
>+- Upgrade to 4.62.9
>+- update_spamassassin and update_spamassassin.cron are untouched again. I
>+  currently do not have enough time to get this running the FreeBSD way.
>+  Patches are welcome.
>+
> Version 4.61.7
> ==============
> - Upgrade to 4.61.7
>Index: files/patch-bin-cron-update_spamassassin.cron
>===================================================================
>RCS file: files/patch-bin-cron-update_spamassassin.cron
>diff -N files/patch-bin-cron-update_spamassassin.cron
>--- files/patch-bin-cron-update_spamassassin.cron	4 Jul 2007 15:04:03 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,42 +0,0 @@
>---- ../MailScanner-install-4.61.7.orig/bin/cron/update_spamassassin.cron	Mon Jul  2 12:34:52 2007
>-+++ bin/cron/update_spamassassin.cron	Mon Jul  2 12:50:12 2007
>-@@ -11,23 +11,28 @@
>-   exit;
>- fi
>- 
>--# Insert a random delay up to this value, to spread virus updates round
>--# the clock. 1800 seconds = 30 minutes.
>--# Set this to 0 to disable it.
>--UPDATEMAXDELAY=3600
>-+# Add the following line to /etc/rc.conf to configure a maximum delay in
>-+# order to spread spamassassin updates round the clock. 1800 seconds = 30 minutes.
>-+# Set this to 0 to disable it
>-+
>-+. %%RC_SUBR%%
>-+
>-+name="mailscanner"
>-+rcvar=`set_rcvar`
>-+
>-+load_rc_config $name
>-+
>-+: ${mailscanner_sa_updatemaxdelay="3600"}
>-+
>- SAUPDATE=/opt/MailScanner/bin/update_spamassassin
>--if [ -f /etc/sysconfig/MailScanner ] ; then
>--        . /etc/sysconfig/MailScanner
>--fi
>--export UPDATEMAXDELAY
>- export SAUPDATE
>- 
>- [ -x $SAUPDATE ] || exit 0
>--if [ "x$UPDATEMAXDELAY" = "x0" ]; then
>-+if [ "x${mailscanner_sa_updatemaxdelay}" = "x0" ]; then
>-   :
>- else
>--  logger -p mail.info -t update_spamassassin Delaying cron job up to $UPDATEMAXDELAY seconds
>--  perl -e "sleep int(rand($UPDATEMAXDELAY));"
>-+  logger -p mail.info -t update_spamassassin Delaying cron job up to ${mailscanner_sa_updatemaxdelay} seconds
>-+  perl -e "sleep int(rand(${mailscanner_sa_updatemaxdelay}));"
>- fi
>- exec $SAUPDATE
>- exit 0
>Index: files/patch-bin-update_spamassassin
>===================================================================
>RCS file: files/patch-bin-update_spamassassin
>diff -N files/patch-bin-update_spamassassin
>--- files/patch-bin-update_spamassassin	4 Jul 2007 15:04:03 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,31 +0,0 @@
>---- ../MailScanner-install-4.61.7.orig/bin/update_spamassassin	Mon Jul  2 12:34:52 2007
>-+++ bin/update_spamassassin	Mon Jul  2 12:53:22 2007
>-@@ -14,26 +14,17 @@
>-   exit;
>- fi
>- 
>--# Insert a random delay up to this value, to spread virus updates round
>--# the clock. 1800 seconds = 30 minutes.
>--# Set this to 0 to disable it.
>--UPDATEMAXDELAY=3600
>- SAUPDATE=/usr/bin/sa-update
>- SACOMPILE=/usr/bin/sa-compile
>- if [ -f /etc/sysconfig/MailScanner ] ; then
>-         . /etc/sysconfig/MailScanner
>- fi
>--export UPDATEMAXDELAY
>- export SAUPDATE
>- export SACOMPILE
>- 
>- [ -x $SAUPDATE ] || exit 0
>--if [ "x$UPDATEMAXDELAY" = "x0" ]; then
>--  :
>--else
>--  logger -p mail.info -t sa-update Delaying cron job up to $UPDATEMAXDELAY seconds
>--  perl -e "sleep int(rand($UPDATEMAXDELAY));"
>--fi
>-+logger -p mail.info -t sa-update Delaying cron job up to $UPDATEMAXDELAY seconds
>-+perl -e "sleep int(rand($UPDATEMAXDELAY));"
>- 
>- # Update SpamAssassin rules
>- $SAUPDATE

Actions: View | Diff

Attachments on bug 115907: 80868