Bump to 1.2. Fixes compilation issues with dovecot-1.2. Thanks to Oliver Sucker and Dennis Schridde for the patch. Closes #276111

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 129 insertions, 2 deletions

diff --git a/mail-filter/dovecot-antispam/ChangeLog b/mail-filter/dovecot-antispam/ChangeLog
index 45e0b697fe16..3daf2ff6b9f2 100644
--- a/mail-filter/dovecot-antispam/ChangeLog
+++ b/mail-filter/dovecot-antispam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/dovecot-antispam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/ChangeLog,v 1.14 2009/09/12 12:58:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/ChangeLog,v 1.15 2009/09/12 13:10:28 patrick Exp $
+
+*dovecot-antispam-1.2 (12 Sep 2009)
+
+  12 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/dovecot-antispam-dovecot1.2-compilefix.patch,
+  +dovecot-antispam-1.2.ebuild:
+  Bump to 1.2. Fixes compilation issues with dovecot-1.2. Thanks to Oliver
+  Sucker and Dennis Schridde for the patch. Closes #276111
 
   12 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   dovecot-antispam-1.1.ebuild:
diff --git a/mail-filter/dovecot-antispam/Manifest b/mail-filter/dovecot-antispam/Manifest
index 7eab3feb6579..9d9dd743ecb7 100644
--- a/mail-filter/dovecot-antispam/Manifest
+++ b/mail-filter/dovecot-antispam/Manifest
@@ -1,4 +1,7 @@
+AUX dovecot-antispam-dovecot1.2-compilefix.patch 1175 RMD160 268d23f91c84534a9111895d24dc4f722fcee406 SHA1 8896e93ef3c51207cbdf387e7f09c3bb6d8dc797 SHA256 68a6c90fa394cd48320e8c84a06add34de198416f84646b8ce00a521a142e43d
 DIST dovecot-antispam-1.1.tar.bz2 22298 RMD160 e0304f40b512422a9d8b372d204af4a1019c5260 SHA1 41c9014d43d2f0d3819563cb3b9f1e27cd336591 SHA256 3f6e0098040fb13f3dcc682ed8755b4024a7461ea16873775c600a303b38d5d7
+DIST dovecot-antispam-1.2.tar.bz2 26595 RMD160 52b56839937db36144ba63af96d732b3647a67cb SHA1 cfb834df95b42cb85c12456b953dc7686aa56100 SHA256 28b3a7819d58a66e86d5432c135c4c9486c4f08226e726d5df0d25ea578b9c15
 EBUILD dovecot-antispam-1.1.ebuild 1899 RMD160 fb155075c7adc4dd0978ad2a1f4c73ef4b9231d1 SHA1 8c9f984a810bd5a3192e7375a379279e03a4197d SHA256 163053e84539c1a40d394fefccd30cd4af80f0ddaf436342be46357851e2a958
-MISC ChangeLog 2245 RMD160 64947f0ec273fe831e6f38582cc1ce49c9c1149e SHA1 cc10add30b616a16f318a294ff0014eaf15c65db SHA256 889326339ef94cf53a78793ef9ce715e192bed23896fb643a0239db39c396a76
+EBUILD dovecot-antispam-1.2.ebuild 1955 RMD160 9a22cdb0b39fc57259f935aa399d4eb36a388b69 SHA1 f4d0c4c0edee76d442c794f19ed96758cddd40d2 SHA256 6bde25518f08012b6763606a5ecc81a92f8d320822f676eab4d468d4203c6621
+MISC ChangeLog 2554 RMD160 f126ab0763c469e283f2f93a38537ef67570d36c SHA1 e590dad2080b687d8ab3bbbe65dbc5427974e257 SHA256 6c58142565af33bb4087bd29f27aafc86891e7c08a8f5698e2d99727d21a87f9
 MISC metadata.xml 511 RMD160 77534424d270f21c285ad1c9227aedf4b2d889ad SHA1 7f3350bd08289f3ede4f84a2407c588d370621b9 SHA256 3a05249198f02f257cbcef8e41fbeea5f4903284806d567748652cad1dfe47ec
diff --git a/mail-filter/dovecot-antispam/dovecot-antispam-1.2.ebuild b/mail-filter/dovecot-antispam/dovecot-antispam-1.2.ebuild
new file mode 100644
index 000000000000..8983e6c18aca
--- /dev/null
+++ b/mail-filter/dovecot-antispam/dovecot-antispam-1.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-1.2.ebuild,v 1.1 2009/09/12 13:10:28 patrick Exp $
+
+EAPI="1"
+
+inherit confutils
+
+DESCRIPTION="A dovecot antispam plugin supporting multiple backends"
+HOMEPAGE="http://johannes.sipsolutions.net/Projects/dovecot-antispam"
+SRC_URI="http://johannes.sipsolutions.net/download/dovecot-antispam/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +dspam crm114 mailtrain signature-log syslog"
+
+DEPEND="net-mail/dovecot
+	dspam? ( mail-filter/dspam )
+	crm114? ( app-text/crm114 )"
+RDEPEND="${DEPEND}"
+
+# we need this to prevent errors from dovecot-config
+top_builddir() {
+	return
+}
+
+pkg_setup() {
+	confutils_require_one dspam signature-log mailtrain crm114
+	confutils_use_depend_all syslog debug
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# make it compile with dovecot 1.2
+	epatch "${FILESDIR}"/dovecot-antispam-dovecot1.2-compilefix.patch
+}
+
+src_compile() {
+	source "${ROOT}"/usr/lib/dovecot/dovecot-config || \
+		die "cannot find dovecot-config"
+
+	echo DOVECOT=${dovecot_incdir} > .config
+	echo INSTALLDIR=${moduledir}/imap/ >> .config
+	echo PLUGINNAME=antispam >> .config
+	echo USER=root >> .config
+	echo GROUP=root >> .config
+
+	use dspam && echo BACKEND=dspam-exec >> .config
+	use signature-log && echo BACKEND=signature-log >> .config
+	use mailtrain && echo BACKEND=mailtrain >> .config
+	use crm114 && echo BACKEND=crm114-exec >> .config
+
+	if use debug; then
+		if use syslog; then
+			echo DEBUG=syslog >> .config
+		else
+			echo DEBUG=stderr >> .config
+		fi
+	fi
+
+	emake || die "make failed"
+}
+
+src_install() {
+	source "${ROOT}"/usr/lib/dovecot/dovecot-config || \
+		die "cannot find dovecot-config"
+
+	dodir "${moduledir}"/imap/
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newman antispam.7 dovecot-antispam.7
+	dodoc NOTES README
+}
diff --git a/mail-filter/dovecot-antispam/files/dovecot-antispam-dovecot1.2-compilefix.patch b/mail-filter/dovecot-antispam/files/dovecot-antispam-dovecot1.2-compilefix.patch
new file mode 100644
index 000000000000..e1de0c14c0e6
--- /dev/null
+++ b/mail-filter/dovecot-antispam/files/dovecot-antispam-dovecot1.2-compilefix.patch
@@ -0,0 +1,40 @@
+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
+--- a/antispam-plugin.h
++++ b/antispam-plugin.h
+@@ -113,11 +113,23 @@ 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
++# include <stdlib.h>
++static inline struct dict *
++string_dict_init(const char *uri, const char *username)
++{
++	const char *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
+