From 0ba74e83aba57860fb464da0868fa2f3af7c1b48 Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <karasz@opensde.org>
Date: Thu, 8 Oct 2009 12:50:15 +0200
Subject: [PATCH] dovecot-antispam: Updated (20080725 -> 1.2)

---
 mail/dovecot-antispam/antispam-plugin.h.patch | 48 +++++++++++++++++++
 mail/dovecot-antispam/dovecot-antispam.cache  | 10 ++--
 mail/dovecot-antispam/dovecot-antispam.desc   |  6 +--
 3 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 mail/dovecot-antispam/antispam-plugin.h.patch

diff --git a/mail/dovecot-antispam/antispam-plugin.h.patch b/mail/dovecot-antispam/antispam-plugin.h.patch
new file mode 100644
index 000000000..f84000b7b
--- /dev/null
+++ b/mail/dovecot-antispam/antispam-plugin.h.patch
@@ -0,0 +1,48 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../dovecot-antispam/antispam-plugin.h.patch
+# Copyright (C) 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+X-Git-Url: http://git.sipsolutions.net/gitweb.cgi?p=dovecot-antispam.git;a=blobdiff_plain;f=antispam-plugin.h;h=493fd1eb0f6b4643e059e660b25aee81dd1336ba;hp=df59e88e10ce68bc4f6a2ea012487d566f6f3e14;hb=af0f8f8de27901e2efb9560a1fc66c7af3cd810b;hpb=8f7c08bc8a39c22b3cca1e306cf454d64b405b8c
+
+diff --git a/antispam-plugin.h b/antispam-plugin.h
+index df59e88..493fd1e 100644
+--- a/antispam-plugin.h
++++ b/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
+
diff --git a/mail/dovecot-antispam/dovecot-antispam.cache b/mail/dovecot-antispam/dovecot-antispam.cache
index aa821dafe..ab6fab491 100644
--- a/mail/dovecot-antispam/dovecot-antispam.cache
+++ b/mail/dovecot-antispam/dovecot-antispam.cache
@@ -1,21 +1,23 @@
 
-[TIMESTAMP] 1200959597 Tue Jan 22 01:53:17 2008
-[BUILDTIME] 0 (5)
-[SIZE] 0.03 MB, 7 files
+[TIMESTAMP] 1254998296 Thu Oct  8 12:38:16 2009
+[BUILDTIME] 5 (5)
+[SIZE] 0.04 MB, 8 files
 
 [DEP] bash
 [DEP] binutils
 [DEP] bzip2
 [DEP] coreutils
 [DEP] diffutils
+[DEP] dovecot
 [DEP] fhs
 [DEP] findutils
-[DEP] gawk
 [DEP] gcc
+[DEP] git
 [DEP] glibc
 [DEP] grep
 [DEP] linux-header
 [DEP] make
+[DEP] patch
 [DEP] sed
 [DEP] sysfiles
 [DEP] tar
diff --git a/mail/dovecot-antispam/dovecot-antispam.desc b/mail/dovecot-antispam/dovecot-antispam.desc
index 04f3c2a02..83f95c981 100644
--- a/mail/dovecot-antispam/dovecot-antispam.desc
+++ b/mail/dovecot-antispam/dovecot-antispam.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../dovecot-antispam/dovecot-antispam.desc
-[COPY] Copyright (C) 2008 The OpenSDE Project
+[COPY] Copyright (C) 2008 - 2009 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -36,7 +36,7 @@
 
 [L] GPL
 [S] Beta
-[V] 20080725
+[V] 1.2
 [P] X -----5---9 800.000
 
-[D] 2078763401 dovecot-antispam-20080725.tar.gz !http://git.sipsolutions.net/?p=dovecot-antispam.git;a=snapshot;h=bb62a9435e9eaaa673d7b6f8043b79ff7951fca0;sf=tgz
+[D] 3185463441 dovecot-antispam-1.2.tar.bz2 http://johannes.sipsolutions.net/download/dovecot-antispam/