Attachment 59939 Details for Bug 90118 – file.diff

[patch] file.diff

file.diff (text/plain), 3.34 KB, created by J.R. Oldroyd on 2005-12-08 20:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2005-12-08 20:50:01 UTC

Size: 3.34 KB

patch

obsolete

>diff -ruN /usr/ports/mail/assp/Makefile mail/assp/Makefile
>--- /usr/ports/mail/assp/Makefile	Wed Jul 13 03:08:15 2005
>+++ mail/assp/Makefile	Mon Nov 14 09:39:27 2005
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	assp
> PORTVERSION=	1.1.1
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	assp
>diff -ruN /usr/ports/mail/assp/files/assp.8.in mail/assp/files/assp.8.in
>--- /usr/ports/mail/assp/files/assp.8.in	Sat May 28 05:56:27 2005
>+++ mail/assp/files/assp.8.in	Mon Nov 14 11:19:02 2005
>@@ -239,6 +239,10 @@
> .IP assp_args
> passed to the ASSP client, default is
> .I assp_args="%%ASSP_HOME%%"
>+.IP assp_logexpire
>+used by nightly script to expire logs, default is
>+.I assp_logexpire="45"
>+days
> .SH FILES
> .IP %%ASSP_HOME%%
> location of ASSP config file, log file and spam databases
>diff -ruN /usr/ports/mail/assp/files/patch-assp.pl mail/assp/files/patch-assp.pl
>--- /usr/ports/mail/assp/files/patch-assp.pl	Sat May 28 05:56:27 2005
>+++ mail/assp/files/patch-assp.pl	Mon Nov 14 10:51:23 2005
>@@ -1,5 +1,14 @@
> --- assp.pl.orig	Tue Mar 15 06:41:24 2005
> +++ assp.pl	Wed May 18 11:33:35 2005
>+@@ -39,7 +39,7 @@
>+ 
>+ loadConfig();
>+ sub loadConfig {
>+- print "loading config -- base='$base'\n";
>++ # print "loading config -- base='$base'\n";
>+  @Config=(
>+  [0,0,0,heading,'Network Setup'],
>+  # except for the heading lines, all config lines have the following:
> @@ -58,7 +58,7 @@
>    'The address:port of your message handling system\'s smtp server. For example: 127.0.0.1:125'],
>   [AsAService,'As a Service',0,checkbox,'','(\S*)',undef,
>@@ -30,6 +39,14 @@
>    'The *nix group to assume after startup: assp or nogroup -- requires ASSP restart.'],
>   [ChangeRoot,'Change Root',60,textinput,'','(.*)',undef,
>    'Non-blank means to run in chroot jail in *nix. You need an etc/protocols file to make this work<br />
>+@@ -3631,6 +3631,7 @@
>+  @PossibleOptionFiles=();
>+  for (@Config) {
>+   if($_->[6] eq 'ConfigMakeRe') {
>++   $silent=1 if($AsADaemon);
>+    ${$_->[0]}=optionList(${$_->[0]},$_->[0]);
>+    push(@PossibleOptionFiles,$_->[0]);
>+   } elsif($_->[6] eq 'ConfigCompileRe') {
> @@ -4462,4 +4462,4 @@
>         dynablock.njabl.org
>      );
>diff -ruN /usr/ports/mail/assp/files/periodic-assp.sh.in mail/assp/files/periodic-assp.sh.in
>--- /usr/ports/mail/assp/files/periodic-assp.sh.in	Sat May 28 05:56:27 2005
>+++ mail/assp/files/periodic-assp.sh.in	Mon Nov 14 10:06:01 2005
>@@ -6,14 +6,17 @@
> 
> cd %%ASSP_HOME%%
> 
>+[ -f nightly.log ] && mv nightly.log nightly.log.old
>+
> if [ ! -f %%PREFIX%%/lib/assp/rebuildspamdb.pl ]
> then
> 	echo "%%PREFIX%%/lib/assp/rebuildspamdb.pl does not exist"
> 	rc_spamdb=2
> else
> 	echo ""
>-	echo "Running ASSP rebuildspamdb.pl:"
>-	%%PERL%% %%PREFIX%%/lib/assp/rebuildspamdb.pl && rc_spamdb=0 || rc_spamdb=3
>+	echo "Running ASSP rebuildspamdb.pl (output to nightly.log)"
>+	echo "Running ASSP rebuildspamdb.pl:" >>nightly.log
>+	%%PERL%% %%PREFIX%%/lib/assp/rebuildspamdb.pl >>nightly.log && rc_spamdb=0 || rc_spamdb=3
> fi
> 
> if [ ! -f %%PREFIX%%/lib/assp/freshclam.sh ]
>@@ -27,5 +30,15 @@
> 	export PATH=$PATH:%%LOCALBASE%%/bin
> 	sh %%PREFIX%%/lib/assp/freshclam.sh && rc_clamav=0 || rc_clamav=3
> fi
>+
>+. %%RC_SUBR%%
>+name=assp
>+rcvar=`set_rcvar`
>+load_rc_config $name
>+: ${assp_logexpire="45"}
>+
>+echo ""
>+echo "Removing old ASSP log files:"
>+find . -name '*.maillog.txt' -mtime +$assp_logexpire -exec ls -l {} \; -exec rm {} \;
> 
> exit $(($rc_spamdb|$rc_clamav))

Actions: View | Diff

Attachments on bug 90118: 59939