From root@dgeo.sysadm.ec-m.fr  Sat Dec 18 21:18:17 2010
Return-Path: <root@dgeo.sysadm.ec-m.fr>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E982A1065672
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 Dec 2010 21:18:16 +0000 (UTC)
	(envelope-from root@dgeo.sysadm.ec-m.fr)
Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A08D8FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 Dec 2010 21:18:16 +0000 (UTC)
Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0)
	id B008D1CCC3; Sat, 18 Dec 2010 22:18:15 +0100 (CET)
Message-Id: <20101218211815.B008D1CCC3@dgeo.sysadm.ec-m.fr>
Date: Sat, 18 Dec 2010 22:18:15 +0100 (CET)
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dsh@wizard.volgograd.ru
Subject: [PATCH] mail/dovecot-antispam: update to 1.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify: dsh@wizard.volgograd.ru

>Number:         153282
>Category:       ports
>Synopsis:       [PATCH] mail/dovecot-antispam: update to 1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sahil
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 18 21:20:09 UTC 2010
>Closed-Date:    Thu Dec 23 04:43:03 UTC 2010
>Last-Modified:  Thu Dec 23 04:50:17 UTC 2010
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 8.1-STABLE FreeBSD 8.1-STABLE #0: Mon Nov 22 10:16:09 CET 2010
>Description:
Please update to 1.3
(see http://git.sipsolutions.net/?p=dovecot-antispam.git for changelog)
patch not needed anymore (dovecot 1.2 suported upstream)

Removed file(s):
- files/patch-antispam-plugin.h

Port maintainer (dsh@wizard.volgograd.ru) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- dovecot-antispam-1.3,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/dovecot-antispam.orig/Makefile /usr/ports/mail/dovecot-antispam/Makefile
--- /usr/ports/mail/dovecot-antispam.orig/Makefile	2010-12-18 10:41:05.000000000 +0100
+++ /usr/ports/mail/dovecot-antispam/Makefile	2010-12-18 22:04:18.000000000 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dovecot-antispam
-PORTVERSION=	1.2
-PORTREVISION=	7
+PORTVERSION=	1.3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://johannes.sipsolutions.net/download/dovecot-antispam/ \
diff -ruN --exclude=CVS /usr/ports/mail/dovecot-antispam.orig/distinfo /usr/ports/mail/dovecot-antispam/distinfo
--- /usr/ports/mail/dovecot-antispam.orig/distinfo	2009-08-17 22:55:32.000000000 +0200
+++ /usr/ports/mail/dovecot-antispam/distinfo	2010-12-18 21:49:02.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (dovecot-antispam-1.2.tar.bz2) = 4def8bf968a94b3c2cb81bd751b4737c
-SHA256 (dovecot-antispam-1.2.tar.bz2) = 28b3a7819d58a66e86d5432c135c4c9486c4f08226e726d5df0d25ea578b9c15
-SIZE (dovecot-antispam-1.2.tar.bz2) = 26595
+SIZE (dovecot-antispam-1.3.tar.bz2) = 26733
+SHA256 (dovecot-antispam-1.3.tar.bz2) = b745f13a791c080b49266e262f0c212503b9b9e0180746e78df3cca6b1ffc7a0
diff -ruN --exclude=CVS /usr/ports/mail/dovecot-antispam.orig/files/patch-antispam-plugin.h /usr/ports/mail/dovecot-antispam/files/patch-antispam-plugin.h
--- /usr/ports/mail/dovecot-antispam.orig/files/patch-antispam-plugin.h	2009-08-17 22:55:32.000000000 +0200
+++ /usr/ports/mail/dovecot-antispam/files/patch-antispam-plugin.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-From af0f8f8de27901e2efb9560a1fc66c7af3cd810b Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes@sipsolutions.net>
-Date: Thu, 2 Jul 2009 14:17:54 +0200
-Subject: [PATCH 1/1] make it compile with dovecot 1.2
-
----
- antispam-plugin.h |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/antispam-plugin.h b/antispam-plugin.h
-index df59e88..493fd1e 100644
---- antispam-plugin.h
-+++ antispam-plugin.h
-@@ -113,11 +113,24 @@ o_stream_create_from_fd(int fd, pool_t pool ATTR_UNUSED)
- 	return o_stream_create_fd(fd, 0, TRUE);
- }
- 
-+#if DOVECOT_VERSION_CODE(1, 2) == DOVECOT_VERSION
-+static inline struct dict *
-+string_dict_init(const char *uri, const char *username)
-+{
-+	const char *base_dir;
-+
-+	base_dir = getenv("BASE_DIR");
-+	if (base_dir == NULL)
-+		base_dir = "/var/run/dovecot";
-+	return dict_init(uri, DICT_DATA_TYPE_STRING, username, base_dir);
-+}
-+#else /* 1.1 */
- static inline struct dict *
- string_dict_init(const char *uri, const char *username)
- {
- 	return dict_init(uri, DICT_DATA_TYPE_STRING, username);
- }
-+#endif
- #elif DOVECOT_VERSION_CODE(1, 0) == DOVECOT_VERSION
- #define ME(err)
- #define PLUGIN_ID
--- 
-1.6.3.3
-
--- dovecot-antispam-1.3,1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Dec 18 21:20:17 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=153282 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dsh@wizard.volgograd.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/153282: [PATCH] mail/dovecot-antispam: update to 1.3
Date: Sat, 18 Dec 2010 21:20:15 UT

 Maintainer of mail/dovecot-antispam,
 
 Please note that PR ports/153282 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/153282
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Denis Shaposhnikov <dsh@wizard.volgograd.ru>
To: bug-followup@FreeBSD.org
Cc: Edwin Groothuis <edwin@FreeBSD.org>
Subject: Re: ports/153282: [PATCH] mail/dovecot-antispam: update to 1.3
Date: Sun, 19 Dec 2010 00:02:52 +0100

 On 12/18/10 22:20, Edwin Groothuis wrote:
 
 > Please note that PR ports/153282 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 
 Thank you! I approve the patch.
Responsible-Changed-From-To: freebsd-ports-bugs->sahil 
Responsible-Changed-By: sahil 
Responsible-Changed-When: Sun Dec 19 00:27:49 UTC 2010 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=153282 
State-Changed-From-To: feedback->open 
State-Changed-By: sahil 
State-Changed-When: Mon Dec 20 02:58:07 UTC 2010 
State-Changed-Why:  
Maintainer has approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=153282 
State-Changed-From-To: open->closed 
State-Changed-By: sahil 
State-Changed-When: Thu Dec 23 04:43:01 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=153282 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/153282: commit references a PR
Date: Thu, 23 Dec 2010 04:42:20 +0000 (UTC)

 sahil       2010-12-23 04:42:10 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dovecot-antispam Makefile distinfo 
   Removed files:
     mail/dovecot-antispam/files patch-antispam-plugin.h 
   Log:
   - Update to 1.3
   
   PR:             ports/153282
   Submitted by:   Geoffroy Desvernay <dgeo@centrale-marseille.fr>
   Approved by:    Denis Shaposhnikov <dsh@wizard.volgograd.ru> (maintainer)
   
   Revision  Changes    Path
   1.14      +1 -2      ports/mail/dovecot-antispam/Makefile
   1.6       +2 -3      ports/mail/dovecot-antispam/distinfo
   1.2       +0 -41     ports/mail/dovecot-antispam/files/patch-antispam-plugin.h (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
