Attachment 140125 Details for Bug 186610 – assp-1.9.9.14040.diff

[patch] assp-1.9.9.14040.diff

assp-1.9.9.14040.diff (text/plain), 6.91 KB, created by rnejdl on 2014-02-09 22:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rnejdl

Created: 2014-02-09 22:30:00 UTC

Size: 6.91 KB

patch

obsolete

>diff -ruN assp/Makefile assp.new/Makefile
>--- assp/Makefile	2014-01-29 15:22:20.000000000 -0600
>+++ assp.new/Makefile	2014-01-29 15:20:42.000000000 -0600
>@@ -1,8 +1,8 @@
> # Created by: J.R. Oldroyd <fbsd@opal.com>
>-# $FreeBSD: head/mail/assp/Makefile 327742 2013-09-20 19:59:12Z bapt $
>+# $FreeBSD: mail/assp/Makefile 327742 2013-09-20 19:59:12Z bapt $
> 
> PORTNAME=	assp
>-PORTVERSION=	1.9.9.13257
>+PORTVERSION=	1.9.9.14040
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
>@@ -54,7 +54,7 @@
> 
> OPTIONS_DEFAULT=	EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_13227_install/${PORTNAME:U}
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_14040_install/${PORTNAME:U}
> 
> NO_STAGE=	yes
> .include <bsd.port.pre.mk>
>diff -ruN assp/distinfo assp.new/distinfo
>--- assp/distinfo	2014-01-29 15:22:20.000000000 -0600
>+++ assp.new/distinfo	2014-01-29 15:20:44.000000000 -0600
>@@ -1,2 +1,2 @@
>-SHA256 (ASSP_1.9.9.13257_Install.zip) = 657106e254baf1a9da182ed89c0d8a1b342110b0f01686cc7582e6b9e2f19a1c
>-SIZE (ASSP_1.9.9.13257_Install.zip) = 1741147
>+SHA256 (ASSP_1.9.9.14040_Install.zip) = c82d09680bc2edb77c6d0275fb2682fa243b9cd7bc0846fc327dfb4b7e32b6ce
>+SIZE (ASSP_1.9.9.14040_Install.zip) = 8660302
>diff -ruN assp/files/510.assp.in assp.new/files/510.assp.in
>--- assp/files/510.assp.in	2014-01-29 15:22:20.000000000 -0600
>+++ assp.new/files/510.assp.in	2013-12-28 18:17:50.000000000 -0600
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: head/mail/assp/files/510.assp.in 340872 2014-01-24 00:14:07Z mat $
>+# $FreeBSD: mail/assp/files/510.assp.in 300896 2012-07-14 13:54:48Z beat $
> #
> # Run ASSP's nightly housekeeping script, rebuildspamdb.pl
> # Delete old ASSP log files
>diff -ruN assp/files/assp.in assp.new/files/assp.in
>--- assp/files/assp.in	2014-01-29 15:22:20.000000000 -0600
>+++ assp.new/files/assp.in	2013-12-28 18:17:50.000000000 -0600
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: head/mail/assp/files/assp.in 340872 2014-01-24 00:14:07Z mat $
>+# $FreeBSD: mail/assp/files/assp.in 300896 2012-07-14 13:54:48Z beat $
> #
> 
> # PROVIDE: assp
>diff -ruN assp/files/patch-assp.pl assp.new/files/patch-assp.pl
>--- assp/files/patch-assp.pl	2014-01-29 15:22:20.000000000 -0600
>+++ assp.new/files/patch-assp.pl	2013-12-28 18:21:46.000000000 -0600
>@@ -1,16 +1,12 @@
>---- assp.pl.orig	2013-08-12 14:12:11.000000000 -0500
>-+++ assp.pl	2013-08-12 14:15:10.000000000 -0500
>-@@ -2758,15 +2758,15 @@
>+--- assp.pl.orig	2013-12-28 18:19:21.000000000 -0600
>++++ assp.pl	2013-12-28 18:21:07.000000000 -0600
>+@@ -2758,11 +2758,11 @@
> 'Set the characterset/codepage for the maillog output to your local needs. Best on non Windows systems is "utf8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 .'],
> ['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed Email::MIME module in PERL.'],
> ['AsAService','Run ASSP as a Windows Service',0,\&checkbox,'','(.*)',undef,'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://apps.sourceforge.net/mediawiki/assp/index.php?title=Win32">Quick Start for Win32</a> doku page. Information about the Win32::Daemon module which which is necessary can be found here: <a href="http://www.roth.net/perl/Daemon/">The Official Win32::Daemon Home Page</a> requires ASSP restart'],
>--['AsADaemon','Run ASSP as a Daemon','0:No|1:Yes - externaly controlled|2:Yes - run AutoRestartCmd on restart and wait|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'0','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. 
>-+['AsADaemon','Run ASSP as a Daemon','0:No|1:Yes - externaly controlled|2:Yes - run AutoRestartCmd on restart and wait|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. 
>- Similar to the command "perl assp.pl &amp;", but better. 
>- If "externaly controlled" is selected, ASSP simply ends and you have to restart assp from your daemon or watchdog script 
>- If "run AutoRestartCmd on restart and wait" is selected, assp starts the OS command defined in AutoRestartCmd - assp will NOT ! automaticaly terminate - the started command has to terminate/kill and to (re)start assp - like "service assp restart"! 
>- If "run AutoRestartCmd on restart and exit" is selected, assp starts the OS command defined in AutoRestartCmd and terminates immediatly! 
>- requires ASSP restart',undef,undef,'msg007440','msg007441'],
>+-['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &amp;", but better. 
>++['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &amp;", but better. 
>+ Changing this requires a restart of ASSP.'],
> -['runAsUser','Run as UID',20,\&textinput,'','(\S*)',undef,'The *nix user name to assume after startup (*nix only).Examples: assp, nobody
> +['runAsUser','Run as UID',20,\&textinput,'assp','(\S*)',undef,'The *nix user name to assume after startup (*nix only).Examples: assp, nobody
> Changing this requires a restart of ASSP.'],
>@@ -19,3 +15,10 @@
> Changing this requires a restart of ASSP.'],
> ['ChangeRoot','Change Root',40,\&textinput,'','(.*)',undef,'The new root directory to which ASSP should chroot (*nix only). If blank, no chroot jail will be used. Note: if you use this feature, be sure to copy or link the etc/protocols file in your chroot jail. 
> Changing this requires a restart of ASSP.'],
>+@@ -47536,4 +47536,4 @@
>+ eval{close $self->{Socket};};
>+ undef $self;
>+ }
>+-1;
>+\ No newline at end of file
>++1;
>diff -ruN assp/files/pkg-install.in assp.new/files/pkg-install.in
>--- assp/files/pkg-install.in	2014-01-29 15:22:20.000000000 -0600
>+++ assp.new/files/pkg-install.in	2013-12-28 18:17:50.000000000 -0600
>@@ -1,5 +1,5 @@
> #!/bin/sh
>-# $FreeBSD: head/mail/assp/files/pkg-install.in 340719 2014-01-22 15:52:06Z mat $
>+# $FreeBSD: mail/assp/files/pkg-install.in 300896 2012-07-14 13:54:48Z beat $
> 
> if [ "${2}" = "POST-INSTALL" ]; then
> ASSP_USER=%%ASSP_USER%%

Actions: View | Diff

Attachments on bug 186610: 140125