--- dovecot-antispam-2.0+20130822.orig/antispam-plugin.c +++ dovecot-antispam-2.0+20130822/antispam-plugin.c @@ -392,4 +392,8 @@ } /* put dovecot version we built against into plugin for checking */ +#if DOVECOT_IS_GE(2,2) +const char *PLUGIN_FUNCTION(version) = DOVECOT_ABI_VERSION; +#else const char *PLUGIN_FUNCTION(version) = PACKAGE_VERSION; +#endif --- dovecot-antispam-2.0+20130822.orig/debian/changelog +++ dovecot-antispam-2.0+20130822/debian/changelog @@ -0,0 +1,126 @@ +dovecot-antispam (2.0+20130822-2build1) trusty; urgency=medium + + * Rebuild against dovecot 2.2.9. + + -- Colin Watson Thu, 09 Jan 2014 00:10:40 +0000 + +dovecot-antispam (2.0+20130822-2) unstable; urgency=low + + * More updates for dovecot 2.2. Thanks again to Micah for really testing + it this time :) + + -- Ron Lee Thu, 12 Sep 2013 18:53:17 +0930 + +dovecot-antispam (2.0+20130822-1) unstable; urgency=low + + * Update for compatibility with dovecot 2.2. Thanks to Micah for doing the + legwork of testing and getting things patched. + + -- Ron Lee Sun, 08 Sep 2013 00:14:37 +0930 + +dovecot-antispam (2.0+20120225-3) unstable; urgency=low + + * Apply patch from Johannes for dovecot 2.1 Closes: #676007 + + -- Ron Lee Wed, 20 Jun 2012 01:55:54 +0930 + +dovecot-antispam (2.0+20120225-2) unstable; urgency=low + + * Try that again with a dependency range that allows for the Debian version. + + -- Ron Lee Sun, 25 Mar 2012 03:37:09 +1030 + +dovecot-antispam (2.0+20120225-1) unstable; urgency=low + + * Pull in upstream patch to allow multiple spam/notspam arguments. + * Fix dspam config in antispam.7 examples. Closes: #663721 + * Hard depend on the version of dovecot this is built with. Closes: #664616 + Maybe this will remind the dovecot maintainers to request a binNMU when they + push a new upstream version, since asking nicely, repeatedly, hasn't helped. + + -- Ron Lee Sun, 25 Mar 2012 00:11:15 +1030 + +dovecot-antispam (2.0-2) unstable; urgency=low + + * Dovecot modules are now installed in $moduledir, the /imap subdirectory + is gone with version 2. + + -- Ron Lee Sat, 26 Nov 2011 00:13:03 +1030 + +dovecot-antispam (2.0-1) unstable; urgency=low + + * Now with support for the dovecot 2.0 release. Closes: #625188, #631143 + + -- Ron Lee Fri, 11 Nov 2011 04:13:57 +1030 + +dovecot-antispam (1.4~rc3-1) unstable; urgency=low + + * Update the antispam_backend docs for crm114 and dspam. + Reapply the mainline revert of the extra mail_plugins options, + which was swallowed in the v1.4-rc2 merge. Closes: #617273. + + -- Ron Lee Sat, 12 Mar 2011 15:59:16 +1030 + +dovecot-antispam (1.4~rc2-1) unstable; urgency=low + + * Drop all the extra builds again. + All of the backends build into a single plugin now. + + -- Ron Lee Sun, 06 Mar 2011 07:49:56 +1030 + +dovecot-antispam (1.3-1) unstable; urgency=low + + * New upstream release. Merges patches from the previous Debian release + and fixes some error checking. Closes: #544588, #564682, #581676 + * Build more of the backends. None of them add any extra hard deps, and + they're all tiny, so just put them all in the one package. Closes: #540283 + + -- Ron Lee Thu, 08 Apr 2010 14:13:38 +0930 + +dovecot-antispam (1.2+20090702-1) unstable; urgency=low + + * Adopt this one officially now with the maintainer's blessing. Thanks Jonny! + * Update the Vcs-* URLs to point at the repo this was prepared from. + + -- Ron Lee Sat, 25 Jul 2009 04:45:14 +0930 + +dovecot-antispam (1.2+20090702-0.2) unstable; urgency=low + + * Include stdlib.h for the getenv prototype. Closes: #537765 + * Fix the match_fn_t prototype for dovecot 1.2 which makes more parameters + to it const. + + -- Ron Lee Wed, 22 Jul 2009 23:14:52 +0930 + +dovecot-antispam (1.2+20090702-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Import upstream fix af0f8f8de27901e2efb9560a1fc66c7af3cd810b, required to + build this with dovecot 1.2 now in unstable. Closes: #537077 + + -- Ron Lee Fri, 17 Jul 2009 08:36:46 +0930 + +dovecot-antispam (1.2-0.1) unstable; urgency=low + + * Non-maintainer upload. (Pulling in new upstream source) + * Rebuild to suit dovecot 1.1.16 currently in unstable. + * Note in the description this package is built using the mailtrain backend. + half- Closes: #532605, it probably still would be nice to build for all of + the backends, but I only need this one too, so add others as people to test + them put their hands up. + * Tidy up a little in debian/rules. + + -- Ron Lee Sun, 12 Jul 2009 21:19:58 +0930 + +dovecot-antispam (1.1+20090218.git.g28075fa-2) unstable; urgency=low + + * debian/gbp.conf: Removed no-create-orig line. + * Rebuilding with newer dovecot. (Closes: #521643) + + -- Jonny Lamb Wed, 08 Apr 2009 09:43:38 +0100 + +dovecot-antispam (1.1+20090218.git.g28075fa-1) unstable; urgency=low + + * Initial release. + + -- Jonny Lamb Wed, 04 Mar 2009 16:06:42 +0000 --- dovecot-antispam-2.0+20130822.orig/debian/compat +++ dovecot-antispam-2.0+20130822/debian/compat @@ -0,0 +1 @@ +5 --- dovecot-antispam-2.0+20130822.orig/debian/control +++ dovecot-antispam-2.0+20130822/debian/control @@ -0,0 +1,24 @@ +Source: dovecot-antispam +Section: mail +Priority: optional +Maintainer: Ron Lee +Build-Depends: debhelper (>= 5), dovecot-dev +Standards-Version: 3.9.4.0 +Homepage: http://johannes.sipsolutions.net/Projects/dovecot-antispam +Vcs-Git: git://git.debian.org/users/ron/dovecot-antispam.git +Vcs-Browser: http://git.debian.org/?p=users/ron/dovecot-antispam.git;a=summary + +Package: dovecot-antispam +Architecture: any +Depends: ${shlibs:Depends}, dovecot-imapd (>= ${dovecot:Version}), + dovecot-imapd (<< ${dovecot:Version}.) +Suggests: crm114 | dspam +Description: Dovecot plugins for training spam filters + dovecot-antispam watches designated spam folders and trains mail as spam or + not-spam when it moves in or out of those folders respectively. + . + dovecot-antispam supports dspam, crm114, and generic training by mailing spam + and non-spam to training addresses. For crm114, it supports folders for the + additional "unsure" classification, and trains when moving from there to spam + or normal folders. + --- dovecot-antispam-2.0+20130822.orig/debian/copyright +++ dovecot-antispam-2.0+20130822/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Jonny Lamb on +Wed, 18 Feb 2009 15:07:27 +0000. + +A tarball was created from a git snapshot of: + http://git.sipsolutions.net/dovecot-antispam.git + +Upstream Author: + Johannes Berg + Frank Cusack + Benedikt Boehm + Andreas Schneider + +Files: * +Copyright: + Copyright 2004-2008 Johannes Berg + Copyright 2006 Frank Cusack +License: GPL-2 + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL-2'. + +Files: antispam-storage-* +Copyright: + Copyright 2007-2008 Johannes Berg + Copyright (C) 2005 Timo Sirainen +License: GPL-2 + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: Copyright 2009 Jonny Lamb +License: GPL-2 + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL-2'. --- dovecot-antispam-2.0+20130822.orig/debian/rules +++ dovecot-antispam-2.0+20130822/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f +# +# Copyright 2003 - 2012, Ron Lee. + +SHELL = /bin/bash + + +clean: + dh_testdir + $(MAKE) clean || true + $(RM) .config dovecot-antispam.7 + dh_clean + + +build: build-arch +build-arch: lib90_antispam_plugin.so +build-indep: + +lib90_antispam_plugin.so: + dh_testdir + cp -f defconfig .config + $(MAKE) + + +install: install-arch + +install-arch: build-arch + dh_testdir + dh_testroot + dh_clean -k + dh_install lib90_antispam_plugin.so usr/lib/dovecot/modules + ln -sf antispam.7 dovecot-antispam.7 + dh_installman dovecot-antispam.7 + +install-indep: build-indep + + +binary: binary-arch + +binary-arch: DOVECOT_VERSION = $(shell V="$$(dpkg-query -W -f='$${Version}' dovecot-dev)"; echo "$${V%-*}" ) +binary-arch: install-arch + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol -- -V'dovecot:Version=$(DOVECOT_VERSION)' + dh_md5sums + dh_builddeb + +binary-indep: install-indep + + +.PHONY: clean build build-arch build-indep \ + binary binary-arch binary-indep \ + install install-arch install-indep --- dovecot-antispam-2.0+20130822.orig/dovecot-version.c +++ dovecot-antispam-2.0+20130822/dovecot-version.c @@ -54,8 +54,8 @@ printf("#define DOVECOT_IS_LE(maj, min) " "DOVECOT_VCODE <= DOVECOT_VERSION_CODE(maj, min, 0)\n"); - /* Use the antispam-storage-2.0.c for dovecot 2.1 as well */ - if (maj == 2 && min == 1) + /* Use the antispam-storage-2.0.c for dovecot 2.1 and 2.2 as well */ + if (maj == 2 && min < 3) min = 0; printf("#define ANTISPAM_STORAGE "