Date: Mon, 17 Aug 2009 23:44:30 +0400 (MSD) From: Denis Shaposhnikov <dsh@wizard.volgograd.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137885: [MAINTAINER] mail/dovecot-antispam: update to 1.2 Message-ID: <200908171944.n7HJiUNv034831@localhost.my.domain> Resent-Message-ID: <200908171950.n7HJo3Ot083424@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137885 >Category: ports >Synopsis: [MAINTAINER] mail/dovecot-antispam: update to 1.2 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Aug 17 19:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Denis Shaposhnikov >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: System: FreeBSD localhost.my.domain 7.2-STABLE FreeBSD 7.2-STABLE #6: Fri Jul 31 16:02:16 MSD 2009 >Description: - Update to 1.2 - Make it compatible with dovecot-1.2.* (patch from upstream) Added file(s): - files/patch-antispam-plugin.h Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- dovecot-antispam-1.2,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/mail/dovecot-antispam/Makefile /home/dsh/ports/mail/dovecot-antispam/Makefile --- /usr/ports/mail/dovecot-antispam/Makefile 2009-08-15 01:35:13.000000000 +0400 +++ /home/dsh/ports/mail/dovecot-antispam/Makefile 2009-08-17 23:42:26.000000000 +0400 @@ -6,8 +6,7 @@ # PORTNAME= dovecot-antispam -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://johannes.sipsolutions.net/download/dovecot-antispam/ \ diff -ruN --exclude=CVS /usr/ports/mail/dovecot-antispam/distinfo /home/dsh/ports/mail/dovecot-antispam/distinfo --- /usr/ports/mail/dovecot-antispam/distinfo 2008-12-02 00:17:35.000000000 +0300 +++ /home/dsh/ports/mail/dovecot-antispam/distinfo 2009-08-17 22:43:50.000000000 +0400 @@ -1,6 +1,3 @@ -MD5 (dovecot-antispam-1.0.tar.bz2) = aeb77a04b0a5f7d37d892118f3791344 -SHA256 (dovecot-antispam-1.0.tar.bz2) = 001cb927b52b06141b5e738d0684f15f0314cbdd7fb0f52ad198c5ff6bdced21 -SIZE (dovecot-antispam-1.0.tar.bz2) = 22279 -MD5 (dovecot-antispam-1.1.tar.bz2) = 551e2c55c1716a1860648fec75f49b18 -SHA256 (dovecot-antispam-1.1.tar.bz2) = 3f6e0098040fb13f3dcc682ed8755b4024a7461ea16873775c600a303b38d5d7 -SIZE (dovecot-antispam-1.1.tar.bz2) = 22298 +MD5 (dovecot-antispam-1.2.tar.bz2) = 4def8bf968a94b3c2cb81bd751b4737c +SHA256 (dovecot-antispam-1.2.tar.bz2) = 28b3a7819d58a66e86d5432c135c4c9486c4f08226e726d5df0d25ea578b9c15 +SIZE (dovecot-antispam-1.2.tar.bz2) = 26595 diff -ruN --exclude=CVS /usr/ports/mail/dovecot-antispam/files/patch-antispam-plugin.h /home/dsh/ports/mail/dovecot-antispam/files/patch-antispam-plugin.h --- /usr/ports/mail/dovecot-antispam/files/patch-antispam-plugin.h 1970-01-01 03:00:00.000000000 +0300 +++ /home/dsh/ports/mail/dovecot-antispam/files/patch-antispam-plugin.h 2009-08-17 22:44:59.000000000 +0400 @@ -0,0 +1,41 @@ +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.2,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908171944.n7HJiUNv034831>