ports/125198: Dovecot-antispam does not work for mail/dovecot version 1.1.1

[Christian Ludwig]

>Number:         125198
>Category:       ports
>Synopsis:       Dovecot-antispam does not work for mail/dovecot version 1.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 02 21:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Christian Ludwig
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
>Environment:
>Description:
Update mail/dovecot-antispam to version 20080604, because it does not work anymore with mail/dovecot since http://www.freebsd.org/cgi/query-pr.cgi?pr=124856 .

Please find attached a patch to fix this issue. Note: since I needed to package a tarball myself, I changed the distfile URL to a new location. The maintainer should most probably ACK on this, or change it, if needed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nur dovecot-antispam/Makefile dovecot-antispam/Makefile
--- dovecot-antispam/Makefile	2008-01-28 21:22:04.000000000 +0100
+++ dovecot-antispam/Makefile	2008-07-01 19:05:11.000000000 +0200
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	dovecot-antispam
-PORTVERSION=	20071029
+PORTVERSION=	20080604
 CATEGORIES=	mail
-MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ehaupt
+MASTER_SITES=	http://www.chrissicool.net/projects/freebsd/distfiles/
 
 MAINTAINER=	dsh at wizard.volgograd.ru
 COMMENT=	Dovecot plugin to train dspam about spam or false positives
@@ -40,7 +38,6 @@
 do-configure:
 	DOVECOT=`${MAKE} -C ${PORTSDIR}/mail/dovecot -V WRKSRC` && \
 		${ECHO} "DOVECOT=$$DOVECOT" > ${WRKSRC}/.config
-	${ECHO} "DOVECOT_VERSION=1.0" >> ${WRKSRC}/.config
 .if defined(WITH_DSPAM)
 	${ECHO} "BACKEND=dspam-exec"  >> ${WRKSRC}/.config
 .endif
diff -Nur dovecot-antispam/distinfo dovecot-antispam/distinfo
--- dovecot-antispam/distinfo	2008-01-28 21:22:04.000000000 +0100
+++ dovecot-antispam/distinfo	2008-07-01 19:24:12.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (dovecot-antispam-20071029.tar.bz2) = 128b94b34f81807192256cfed5b3e809
-SHA256 (dovecot-antispam-20071029.tar.bz2) = 7134526bd3edb999c1292f64654f1510b993a82da3fca1c3db442e47ed9a0464
-SIZE (dovecot-antispam-20071029.tar.bz2) = 17205
+MD5 (dovecot-antispam-20080604.tar.bz2) = 959c43108d9a6fb34b6b2747f117b26d
+SHA256 (dovecot-antispam-20080604.tar.bz2) = 224534b1bff2171db83487a6e976b55c797eec94c60014a3bc67003896d3044b
+SIZE (dovecot-antispam-20080604.tar.bz2) = 423627
diff -Nur dovecot-antispam/files/patch-dspam-exec.c dovecot-antispam/files/patch-dspam-exec.c
--- dovecot-antispam/files/patch-dspam-exec.c	2008-01-28 21:22:05.000000000 +0100
+++ dovecot-antispam/files/patch-dspam-exec.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- dspam-exec.c.orig	2007-10-29 14:09:16.000000000 +0300
-+++ dspam-exec.c	2008-01-05 18:38:37.000000000 +0300
-@@ -127,7 +127,7 @@
- 
- 		argv[0] = (char *)dspam_binary;
- 		argv[1] = "--source=error";
--		argv[2] = "--stdout";
-+		argv[2] = "--deliver=";
- 		argv[3] = (char *)class_arg;
- 		argv[4] = (char *)sign_arg;
- 
-@@ -136,7 +136,7 @@
- 		 * not good with stderr debuggin since we then write to
- 		 * stderr which our parent takes as a bug
- 		 */
--		debug("%s --source=error --stdout %s %s ...",
-+		debug("%s --source=error --deliver= %s %s ...",
- 		      dspam_binary, class_arg, sign_arg);
- #endif
- 


>Release-Note:
>Audit-Trail:
>Unformatted: