--- dovecot-antispam-2.0+20150222.orig/debian/changelog
+++ dovecot-antispam-2.0+20150222/debian/changelog
@@ -0,0 +1,187 @@
+dovecot-antispam (2.0+20150222-1build3) zesty; urgency=medium
+
+  * No-change rebuild against dovecot-abi-2.2.abiv25 (LP: #1640058).
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Tue, 08 Nov 2016 09:03:02 +0000
+
+dovecot-antispam (2.0+20150222-1build2) yakkety; urgency=medium
+
+  * No-change rebuild against latest dovecot
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 28 Aug 2016 18:14:48 -0400
+
+dovecot-antispam (2.0+20150222-1build1) xenial; urgency=medium
+
+  * No-change rebuild against dovecot-abi-2.2.abiv22
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 25 Mar 2016 04:14:10 +0000
+
+dovecot-antispam (2.0+20150222-1) unstable; urgency=medium
+
+  * Use T_BEGIN/T_END since t_push() changed its signature and broke API
+    in dovecot 2.2.14, and this is the interface to it that things were
+    supposed to switch to some time back.  Closes: #765943
+
+ -- Ron Lee <ron@debian.org>  Sat, 04 Jul 2015 10:30:53 +0930
+
+dovecot-antispam (2.0+20130912-2) unstable; urgency=medium
+
+  * Use the correct argc for pipe.ham_args
+
+    This fixes a typo bug, where if the number of arguments set for
+    antispam_pipe_program_spam_arg is not the same as what was set
+    for antispam_pipe_program_notspam_arg, then we'll either scribble
+    past the end of the allocated argv array, or populate it with
+    pointers to whatever followed the real ham_args.
+
+    Thanks to Peter Colberg who reported this, including a correct
+    patch to fix it, to the security team.  The security implications
+    of this seem somewhat limited, since you need to edit a config
+    file as root to create the bad situation, and there is no path
+    for remote injection of crafted data (whether it overflows or
+    underflows) if you do, the argv array will just get some 'random'
+    extra pointers to existing internal data.
+
+    However it does pose a potential problem for a legitimate user
+    who does legitimately need or want to pass a different number of
+    arguments for the spam and ham cases, since that could crash
+    dovecot, or confuse the hell out of their pipe program when it
+    gets some random extra arguments.  It's probably gone unnoticed
+    for this long because most uses will pass the same number of
+    arguments for both of them, but that's not a necessary condition
+    in the general case.
+
+ -- Ron Lee <ron@debian.org>  Sun, 22 Feb 2015 09:27:51 +1030
+
+dovecot-antispam (2.0+20130912-1) unstable; urgency=medium
+
+  * Merge upstreamed patches from the upstream branch,
+    no new changes to the Debian package from this.
+  * Depend on dovecot ABI rather than a specific Dovecot package version.
+    Many thanks to Jelmer Vernooij for both adding support for that to the
+    dovecot package and providing a patch for this one to use it.  Now we
+    just need dovecot upstream to start bumping ABI less often than version :)
+    Closes: #755432
+
+ -- Ron Lee <ron@debian.org>  Sat, 04 Oct 2014 16:08:32 +0930
+
+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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <ron@debian.org>  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 <jonny@debian.org>  Wed, 08 Apr 2009 09:43:38 +0100
+
+dovecot-antispam (1.1+20090218.git.g28075fa-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Jonny Lamb <jonny@debian.org>  Wed, 04 Mar 2009 16:06:42 +0000
--- dovecot-antispam-2.0+20150222.orig/debian/compat
+++ dovecot-antispam-2.0+20150222/debian/compat
@@ -0,0 +1 @@
+5
--- dovecot-antispam-2.0+20150222.orig/debian/control
+++ dovecot-antispam-2.0+20150222/debian/control
@@ -0,0 +1,24 @@
+Source: dovecot-antispam
+Section: mail
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ron Lee <ron@debian.org>
+Build-Depends: debhelper (>= 5), dovecot-dev (>= 1:2.2.13-4)
+Standards-Version: 3.9.6.1
+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-abi-${dovecot:ABI-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+20150222.orig/debian/copyright
+++ dovecot-antispam-2.0+20150222/debian/copyright
@@ -0,0 +1,33 @@
+This package was debianized by Jonny Lamb <jonny@debian.org> 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 <johannes@sipsolutions.net>
+ Frank Cusack
+ Benedikt Boehm
+ Andreas Schneider
+
+Files: *
+Copyright:
+ Copyright 2004-2008 Johannes Berg <johannes@sipsolutions.net>
+ 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 <johannes@sipsolutions.net>
+ 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 <jonny@debian.org>
+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+20150222.orig/debian/rules
+++ dovecot-antispam-2.0+20150222/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_ABI_VERSION = $(shell cat /usr/share/dovecot/dovecot-abi)
+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:ABI-Version=$(DOVECOT_ABI_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
