Merge ~paelzer/ubuntu/+source/dovecot:merge into ~usd-import-team/ubuntu/+source/dovecot:debian/sid

[ChristianEhrhardt]

Merge of Dovecot from Debian

Along that I also provided a no change rebuild of a depending package dovecot-antispam at bug 1524526. Once review approves and uploads this it would be great to pick that one up on top.

Changelog as in the Upload:
  * Merge with Debian; Remaining Changes:
    + Add mail-stack-delivery
      - add package in d/rules, d/control
      - add d/*mail-stack-delivery* maintainer scripts and default conf
      - d/mail-stack-delivery.preinst: Move previously installed backups and
        config files to a new package namespace.
    + Drop build dependency on libstemmer-dev (universe)
    + Use Snakeoil SSL certificates by default
      - d/control: Depend on ssl-cert
      - add lsb base dependency
    + Add autopkgtest to debian/tests/*.
      - also fixup the tests we had to work with recent dovecot versions
    + Add ufw integration:
      - d/dovecot-core.ufw.prol-stack-deliveryfile: new ufw profile.
      - d/rules: install profile in dovecot-core.
      - d/control: dovecot-core - suggest ufw.
    + Add apport hook:
      - d/rules, d/source_dovecot.py
    + Remove lintian override for drac
  * Added Changes:
    - Disable dovecot-lucene plugin as it had various issues, has universe
      dependencies and is deprecated in favor of solr anyway (LP: #1524526).
  * Dropped Changes:
    - Add upstart job (that means we no more add it now)
    - no more needed upgrade hangling of mail-stack-delivery related to
      2.1.7-7 and 1.2.9-1ubuntu8 (both out of scope of any possible
      paths now)
    - d/dovecot-core.dirs: Added usr/share/doc/dovecot-core (was only left
      in changelog)
    - ntpdate Recommends (was missing in former Changelog, now superseeded
      by timesyncd which is available by default)

Note: the importer helped a lot to find changelog-only and missing-in-changelog modifications.

[Robie Basak (racb)]

Thank you for tackling a really challenging merge!

You've done a good job of following the process with reconstruct, deconstruct and logical deltas, and this made it much easier for me to review.

Please note that our convention is to use {reconstruct,deconstruct,logical}/<version> (with standard dep14 substitutions). This allows us to store multiple tags associated with multiple versions for archival purposes. I've also written my lint tool to expect these tags so it breaks otherwise. Temporarily I just created the tags locally based on what you already had (you had the right tags, just not with the standard names). I hope to publish my lint tool soon, so it can be run before submitting a merge proposal.

A second note that has not occurred to me before: it would be helpful if the ordering of changelog entries matched the order of the git commits in the proposed branch. This would make it easier to review, but I appreciate that re-ordering can be quite painful because of merge conflicts, so I'm not sure if it's reasonable to require this in our process.

Further comments inline, with some required fixes. I haven't checked if this passes dep8, but will do that before uploading.

I think some of the delta we're applying is relevant to Debian and should be sent there or dropped. I also want to propose the deprecation of the mail-stack-delivery stuff, and then for us to drop that delta too to make the package simpler. But I'm not proposing to do any of this for this particular merge. You've cleaned this package up considerably, and I think it's OK to finish everything off in later iterations rather than trying to do everything all at once.

review: Needs Fixing

43baf2d... by ChristianEhrhardt on 2016-06-28

changelog: correct reason to have lsb base dependency

8be1eed... by ChristianEhrhardt on 2016-06-28

changelog: clarify that the fixes to autopackagetests were added

dce051a... by ChristianEhrhardt on 2016-06-28

changelog: fix name of dovecot-core.ufw.profile

800699a... by ChristianEhrhardt on 2016-06-28

d/control drop build dependency to libclucene-dev

b93ebfa... by ChristianEhrhardt on 2016-06-28

changelog: fix typos

4a3e003... by ChristianEhrhardt on 2016-06-28

drop d/docs as it is not needed

087b554... by ChristianEhrhardt on 2016-06-28

changelog: add dropping of d/docs as delta

0b88d95... by ChristianEhrhardt on 2016-06-28

changelog: clarified use of configuration files for mail-stack-delivery

94ebfd6... by ChristianEhrhardt on 2016-06-28

handle conffile removal of /etc/init/dovecot.conf

[ChristianEhrhardt (paelzer)]

Hi Robie,
thanks a lot for the thorough review, going to address and fix them one by one.
Challenging is always good to learn, even if it means we might have a few rounds of review iteration.

Yeah integrating that lint check before submission will surely help to be on the same page.
Be sure to mention it in https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow once available.

Back last year it still was the release at least in the repo I still had on disk and the doc said <ubuntu version>. Which is correct as I did use <ubuntu release>, but that said I not only fixed my tags but also added an explanation to the wiki for documentation.
I renamed my tags and hope that goes well without conflict with your locals or so when pushing for merge next time.

I see the benefit of having the changelog and the commits in order.
It is probably too much pain to do so for the logical split for the merge conflicts you already pointed out.
But at least we could - if that helps you - define to have the final merge changelog ordered.
First all "Remaining Changes" with changelog in order to the commits.
Second all "Added Changes" with changelog in order to the commits.
Because reordering text in the changelog is easy that could be done easily.
Would that help you as well or were you particularly interested in the logical split to be ordered?

For Dep8 I can tell you that it went through adt nicely for me, but double check is always better.

You are right about submitting to debian. I'll look into the delta after I addressed your feedback and will submit accordingly.

I already worked on addressing all your great inline feedbacks ...
But I put some tests on my list before uploading again.

P.S. also I run out of power and need to buy a new power adapter first :-/

[Robie Basak (racb)]

On Tue, Jun 28, 2016 at 07:19:45AM -0000, ChristianEhrhardt wrote:
> I see the benefit of having the changelog and the commits in order.
> It is probably too much pain to do so for the logical split for the merge conflicts you already pointed out.
> But at least we could - if that helps you - define to have the final merge changelog ordered.
> First all "Remaining Changes" with changelog in order to the commits.
> Second all "Added Changes" with changelog in order to the commits.
> Because reordering text in the changelog is easy that could be done easily.
> Would that help you as well or were you particularly interested in the logical split to be ordered?

This would help I think. Shall we try it and see? I end up looking at
three things side-by-side: the old logical delta, the new logical delta,
and the new changelog. Perhaps my pain is that all three were in
different orders. If "Remaining Changes" were in the same order as the
new logical delta order, that would make it easier to review.

> You are right about submitting to debian. I'll look into the delta
> after I addressed your feedback and will submit accordingly.

Sure, but don't worry about it this time. We can do it on the next
merge. As long as we're making incremental improvements each time, I
don't mind not doing it all at once.

> Thanks, I misinterpreted where this belongs to, but right now I think you as well :-)
>
> Due to your feedback I thought more about it.
> I think what is needed for d/p/dovecot_name.patch is lsb-release which is already in the build dependencies (and it is only used at build time in configure.ac).
>
> I think I found what this is really for, see:
> debian/dovecot-core.dovecot.init:46:# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
> debian/dovecot-core.dovecot.init:47:. /lib/lsb/init-functions

Ah right, sorry. I wonder though if it is still needed now? Sometimes
it's a transitional thing. But now that sourcing init-functions is
standard, I'd expect something in Debian at a deeper level to depend on
the right thing so every single package doesn't have to do it (or, at
least, for dh_installinit to automatically add it). But I haven't
looked.

c204b18... by ChristianEhrhardt on 2016-06-28

changelog: handling of conffile removal for /etc/init/dovecot.conf

[ChristianEhrhardt (paelzer)]

> > Thanks, I misinterpreted where this belongs to, but right now I think you as
> well :-)
> >
> > Due to your feedback I thought more about it.
> > I think what is needed for d/p/dovecot_name.patch is lsb-release which is
> already in the build dependencies (and it is only used at build time in
> configure.ac).
> >
> > I think I found what this is really for, see:
> > debian/dovecot-core.dovecot.init:46:# Depend on lsb-base (>= 3.0-6) to
> ensure that this file is present.
> > debian/dovecot-core.dovecot.init:47:. /lib/lsb/init-functions
>
> Ah right, sorry. I wonder though if it is still needed now? Sometimes
> it's a transitional thing. But now that sourcing init-functions is
> standard, I'd expect something in Debian at a deeper level to depend on
> the right thing so every single package doesn't have to do it (or, at
> least, for dh_installinit to automatically add it). But I haven't
> looked.

While I agree that one would think it is always there it not necessarily is.
It is not auto-added to the list of dependencies in debian-sid.
I was able to leave the init script disfunctional in a debian-sid container by running
"apt-get remove lsb-base cron logrotate"
So I think it is a valid fix to add - as well as to pass to debian.

With all my breaks today I have a hard time to make progress, but I hope to get the testing done until this evening for a new push to the MP.

9903570... by ChristianEhrhardt on 2016-06-28

changelog: order changelog in commit order

[ChristianEhrhardt (paelzer)]

Ok, now I tested it once more plus the new conffile handling in modified and unmodified case.
I think I'm ready to push the updated merge branch.

Please let me know if the tags arrived as they should

[ChristianEhrhardt (paelzer)]

pushed all changes, ready for the next round of review

[Robie Basak (racb)]

Here's a quick review. Just a couple of inline points. Sorry, I may never have told you about dh_builddeb(1) and maintscript files.

I want to finish for the day now, but am not quite finished reviewing. But I thought it might be useful to give you this now.

review: Needs Fixing

[ChristianEhrhardt (paelzer)]

Hi Robie,
it is clearly not your fault for not telling, maybe mine for not knowing, but in this case especially googles fault for "debian remove conffile" hitting plain dpkg-maintscript-helper in like place 1-5 for me.

6d94694... by ChristianEhrhardt on 2016-07-01

rework conffile handling to use dh_installdebs package.maintscript

[ChristianEhrhardt (paelzer)]

Hi,
almost forgot to push that, but just found in a console that also the adt completed in the meantime.
Before I already tested in a container that conffile removal/backup is still working.

[ChristianEhrhardt (paelzer)]

Ping on this review, I checked but as far as I could see all open issues were resolved.
It seems we just were both too busy in the meantime.

[Robie Basak (racb)]

Uploaded. Thanks!

review: Approve

diff --git a/debian/99-mail-stack-delivery.conf b/debian/99-mail-stack-delivery.conf
new file mode 100644
index 0000000..e69c518
--- /dev/null
+++ b/debian/99-mail-stack-delivery.conf
@@ -0,0 +1,48 @@
+# Some general options
+protocols = imap pop3 sieve
+disable_plaintext_auth = yes
+ssl = yes
+ssl_cert = </etc/dovecot/dovecot.pem
+ssl_key = </etc/dovecot/private/dovecot.pem
+ssl_cipher_list = ALL:!LOW:!SSLv2:ALL:!aNULL:!ADH:!eNULL:!EXP:RC4+RSA:+HIGH:+MEDIUM
+mail_location = maildir:~/Maildir
+auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@
+
+# IMAP configuration
+protocol imap {
+        mail_max_userip_connections = 10
+        imap_client_workarounds = delay-newmail
+}
+
+# POP3 configuration
+protocol pop3 {
+        mail_max_userip_connections = 10
+        pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+}
+
+# LDA configuration
+protocol lda {
+        postmaster_address = postmaster
+        mail_plugins = sieve
+        quota_full_tempfail = yes
+        deliver_log_format = msgid=%m: %$
+        rejection_reason = Your message to <%t> was automatically rejected:%n%r
+}
+
+# Plugins configuration
+plugin {
+        sieve=~/.dovecot.sieve
+        sieve_dir=~/sieve
+}
+
+# Authentication configuration
+auth_mechanisms = plain login
+
+service auth {
+  # Postfix smtp-auth
+  unix_listener /var/spool/postfix/private/dovecot-auth {
+    mode = 0660
+    user = postfix
+    group = postfix
+  }
+}
diff --git a/debian/changelog b/debian/changelog
index 84c9b37..b36a058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+dovecot (1:2.2.24-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian; Remaining Changes:
+    + Add autopkgtest to debian/tests/*.
+    + Drop build dependency on libstemmer-dev (universe)
+    + Use Snakeoil SSL certificates by default
+      - d/control: Depend on ssl-cert
+    + add lsb base dependency to ensure debian/dovecot-core.dovecot.init is
+      working correctly
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Remove lintian override for drac
+    + Add mail-stack-delivery
+      - add package in d/rules, d/control
+      - add d/*mail-stack-delivery* maintainer scripts and default conf
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+  * Added Changes:
+    - Disable dovecot-lucene plugin as it had various issues, has universe
+      dependencies and is deprecated in favor of solr anyway (LP: #1524526).
+    - Fixup the autopkgtests we add to work with recent dovecot versions
+    - d/mail-stack-delivery.README.Debian clarified use of configuration files
+    - handle conffile removal of /etc/init/dovecot.conf (due to dropping
+      upstart). Can be removed once no upgrade path from <yakkety is left.
+  * Dropped Changes:
+    - Add upstart job (that means we no more add it now)
+    - no more needed upgrade handling of mail-stack-delivery related to
+      2.1.7-7 and 1.2.9-1ubuntu8 (both out of scope of any possible
+      paths now)
+    - d/dovecot-core.dirs: Added usr/share/doc/dovecot-core (was only left
+      in changelog)
+    - ntpdate Recommends (was missing in former Changelog, now superseded
+      by timesyncd which is available by default)
+    - adding of d/docs for dh_installdocs
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 21 Jun 2016 16:31:29 +0200
+
 dovecot (1:2.2.24-1) unstable; urgency=medium
 
   * [26020b6] Imported Upstream version 2.2.24 (Closes: #818652)
@@ -14,6 +55,61 @@ dovecot (1:2.2.23-1) unstable; urgency=medium
 
  -- Apollon Oikonomopoulos <[e-mail]>  Tue, 12 Apr 2016 17:30:03 +0300
 
+dovecot (1:2.2.22-1ubuntu4) xenial; urgency=medium
+
+  * Urgh. Previous upload added a runtime dependency on libstemmer0d to
+    dovecot-core that I missed. Revert it, and reopen LP: 1524526.
+
+ -- Christopher James Halse Rogers <[e-mail]>  Thu, 21 Apr 2016 09:59:28 +1000
+
+dovecot (1:2.2.22-1ubuntu3) xenial; urgency=medium
+
+  * Re-add build dependency on libstemmer-dev
+    - In universe, but only adds runtime dependencies to packages already in
+      universe.
+    - Fixes crash with missing symbol when enabling fts-lucene plugin
+      (LP: #1524526)
+
+ -- Christopher James Halse Rogers <[e-mail]>  Wed, 20 Apr 2016 12:44:08 +1000
+
+dovecot (1:2.2.22-1ubuntu2) xenial; urgency=medium
+
+  * Rebuild against libmysqlclient20.
+
+ -- Robie Basak <[e-mail]>  Tue, 05 Apr 2016 12:19:25 +0000
+
+dovecot (1:2.2.22-1ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}.
+        d/mail-stack-deliver.postinst: Convert init script to upstart.
+    + d/control: Drop dovecot-postfix package as its no longer required.
+    + Drop build dependency on libstemmer-dev (universe).
+
+ -- Matthias Klose <[e-mail]>  Mon, 21 Mar 2016 19:44:11 +0100
+
 dovecot (1:2.2.22-1) unstable; urgency=medium
 
   [ Jaldhar H. Vyas ]
@@ -75,6 +171,40 @@ dovecot (1:2.2.19-1) UNRELEASED; urgency=medium
 
  -- Jaldhar H. Vyas <[e-mail]>  Sun, 13 Dec 2015 09:41:56 -0500
 
+dovecot (1:2.2.18-2ubuntu2) wily; urgency=medium
+
+  * Merge with Debian (after 552 days); remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}.
+        d/mail-stack-deliver.postinst: Convert init script to upstart.
+    + d/control: Drop dovecot-postfix package as its no longer required.
+    + Rename init.d script to work with the dh_installinit --name option, so
+      that it comes back.
+  * Drop build dependency on libstemmer-dev (universe).
+
+ -- Matthias Klose <[e-mail]>  Mon, 14 Sep 2015 13:58:42 +0200
+
 dovecot (1:2.2.18-2) unstable; urgency=high
 
   * [3f3bf71] Updated pigeonhole patch to 0.4.8 (Closes: #792669)
@@ -256,6 +386,76 @@ dovecot (1:2.2.10-1) unstable; urgency=low
 
  -- Jaldhar H. Vyas <[e-mail]>  Thu, 06 Mar 2014 02:51:34 -0500
 
+dovecot (1:2.2.9-1ubuntu5) utopic; urgency=medium
+
+  * No-change rebuild against current debhelper to drop unnecessary upstart
+    dependency. (LP: #1351306)
+
+ -- Martin Pitt <[e-mail]>  Wed, 03 Sep 2014 09:50:41 +0200
+
+dovecot (1:2.2.9-1ubuntu4) utopic; urgency=medium
+
+  * Rename init.d script to work with the dh_installinit --name option, so
+    that it comes back. (LP: #1323274)
+
+ -- Martin Pitt <[e-mail]>  Mon, 26 May 2014 14:24:43 +0200
+
+dovecot (1:2.2.9-1ubuntu3) utopic; urgency=medium
+
+  * SECURITY UPDATE: denial of service via SSL connection exhaustion
+    - debian/patches/CVE-2014-3430.patch: properly close connections in
+      src/login-common/client-common.c,
+      src/login-common/ssl-proxy-openssl.c,
+      src/login-common/ssl-proxy.h.
+    - CVE-2014-3430
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 15 May 2014 10:19:29 -0400
+
+dovecot (1:2.2.9-1ubuntu2) trusty; urgency=medium
+
+  * d/dovecot-core.config: Drop db_input for ssl-cert-exists; this message
+    not actually an error, is documented in the README.Debian, and blocks
+    automated upgrades (LP: #1278897).
+
+ -- James Page <[e-mail]>  Fri, 07 Mar 2014 12:42:58 +0000
+
+dovecot (1:2.2.9-1ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+      - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}.
+        d/mail-stack-deliver.postinst: Convert init script to upstart.
+    + Use the autotools-dev dh addon to update config.guess/config.sub for
+      arm64.
+  * Dropped changes, included in Debian:
+    - Update Dovecot name to reflect distribution in login greeting.
+    - Update Drac plugin for >= 2.0.0 support.
+  * d/control: Drop dovecot-postfix package as its no longer required.
+
+ -- James Page <[e-mail]>  Wed, 08 Jan 2014 09:35:49 +0000
+
 dovecot (1:2.2.9-1) unstable; urgency=low
 
   [ Jaldhar H. Vyas ]
@@ -337,6 +537,78 @@ dovecot (1:2.1.7-8) experimental; urgency=low
 
  -- Jaldhar H. Vyas <[e-mail]>  Thu, 13 Jun 2013 16:14:21 -0400
 
+dovecot (1:2.1.7-7ubuntu3) saucy; urgency=low
+
+  * Use the autotools-dev dh addon to update config.guess/config.sub for
+    arm64.
+
+ -- Colin Watson <[e-mail]>  Thu, 10 Oct 2013 11:55:27 +0100
+
+dovecot (1:2.1.7-7ubuntu2) saucy; urgency=low
+
+  * debian/patches/dovecot_name.patch: updated Dovecot name to reflect 
+    distribution in login greeting
+  * debian/control: added lsb-release as build-dependency
+  * debian/rules: added autoconf in config-stamp
+
+ -- Yolanda Robla <[e-mail]>  Wed, 26 Jun 2013 08:34:42 +0200
+
+dovecot (1:2.1.7-7ubuntu1) raring; urgency=low
+
+  [ James Page ]
+  * Merge from Debian unstable (LP: #1117613, #1075456), remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+      - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}.
+        d/mail-stack-deliver.postinst: Convert init script to upstart.
+    + d/control: Added Pre-Depends: dpkg (>= 1.15.6) to dovecot-dbg to support
+      xz compression in Ubuntu.
+    + d/control: Demote dovecot-common Recommends: to Suggests: to prevent
+      install of extra packages on upgrade.
+    + d/patches/dovecot-drac.patch: Updated with version for dovecot >= 2.0.0.
+  * Dropped changes, included in Debian:
+    + d/{control,rules}: enable PIE hardening.
+    + d/control: Drop B-D on systemd.
+  * d/p/mail-stack-delivery.postinst: Updated to ensure that configured SSL
+    cert and key locations are used when configuring postfix, sorted out
+    formatting.
+  * d/p/dovecot-core.postinst: Create compat links to old style, existing
+    SSL cert and key if found.
+  * d/rules: Don't pass hardening flags for DRAC plugin.
+  * d/dovecot-{pop3d,imapd}.prerm: Re-sync with Debian.
+  * d/dovecot-core.lintian-overrides: Drop override for DRAC plugin as not
+    required in Ubuntu.
+  * d/01-mail-stack-delivery: Renamed 99-mail-stack-delivery to ensure that
+    the mail-stack-delivery configuration overrides configuration options
+    set elsewhere, updated with new cert/key file locations.
+
+  [ Ante Karamatic ]
+  * Change configuration file for LDA on new installs and upgrades
+    (LP: #671065).
+
+ -- James Page <[e-mail]>  Mon, 11 Feb 2013 12:41:24 +0000
+
 dovecot (1:2.1.7-7) unstable; urgency=high
 
   * If you are upgrading from stable or earlier versions of this package
@@ -432,6 +704,53 @@ dovecot (1:2.1.7-2) unstable; urgency=low
 
  -- Jaldhar H. Vyas <[e-mail]>  Thu, 21 Jun 2012 23:54:47 -0400
 
+dovecot (1:2.1.7-1ubuntu2) quantal; urgency=low
+
+  * d/dovecot-core.dovecot.upstart: Respawn to handle unexpected but
+    recoverable problems. (LP: #718188)
+
+ -- Clint Byrum <[e-mail]>  Thu, 09 Aug 2012 12:22:52 -0700
+
+dovecot (1:2.1.7-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+      - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/{control,rules}: enable PIE hardening.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}.
+        d/mail-stack-deliver.postinst: Convert init script to upstart.
+    + d/control: Added Pre-Depends: dpkg (>= 1.15.6) to dovecot-dbg to support
+      xz compression in Ubuntu.
+    + d/control: Demote dovecot-common Recommends: to Suggests: to prevent
+      install of extra packages on upgrade.
+    + d/patches/dovecot-drac.patch: Updated with version for dovecot >= 2.0.0.
+    + d/control: Drop B-D on systemd.
+  * Dropped changes:
+    + d/patches/fix-racey-restart.patch: part of 2.1.x, no longer required.
+
+ -- James Page <[e-mail]>  Mon, 11 Jun 2012 11:11:54 +0100
+
 dovecot (1:2.1.7-1) unstable; urgency=low
 
   * [7668742] Imported upstream 2.1.7 (Closes: #663243)
@@ -470,6 +789,49 @@ dovecot (1:2.1.1-1) experimental; urgency=low
 
  -- Micah Anderson <[e-mail]>  Tue, 13 Mar 2012 23:08:06 -0400
 
+dovecot (1:2.0.19-0ubuntu1) precise; urgency=low
+
+  * New upstream release (LP: #970782).
+  * Merge from Debian testing, remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+      - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/{control,rules}: enable PIE hardening.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}.
+        d/mail-stack-deliver.postinst:
+        Convert init script to upstart.
+    + d/patches/fix-racey-restart.patch: Backported patch from current
+      development release which ensures all child processes terminate prior
+      to the main dovecot process.
+    + debian/patches/CVE-2011-4318.patch: Dropped - applied upstream
+    + d/control: Added Pre-Depends: dpkg (>= 1.15.6) to dovecot-dbg to support
+      xz compression in Ubuntu.
+    + d/control: Demote dovecot-common Recommends: to Suggests: to prevent
+      install of extra packages on upgrade.
+  * d/patches/dovecot-drac.patch: Updated with version for dovecot >= 2.0.0.
+
+ -- James Page <[e-mail]>  Wed, 04 Apr 2012 14:56:38 +0100
+
 dovecot (1:2.0.18-1) unstable; urgency=low
 
   * [85ae320] Imported Upstream version 2.0.18
@@ -483,6 +845,78 @@ dovecot (1:2.0.18-1) unstable; urgency=low
 
  -- Jaldhar H. Vyas <[e-mail]>  Fri, 09 Mar 2012 00:55:13 -0500
 
+dovecot (1:2.0.15-1ubuntu5) precise; urgency=low
+
+  * SECURITY UPDATE: Incorrect cert Common Name verification when proxying
+    - debian/patches/CVE-2011-4318.patch: correctly validate Common Name
+      when a hostname is specified in src/login-common/{login-proxy.c,
+      ssl-proxy.*,ssl-proxy-openssl.c}.
+    - CVE-2011-4318
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 08 Dec 2011 14:34:36 -0500
+
+dovecot (1:2.0.15-1ubuntu4) precise; urgency=low
+
+  * No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
+
+ -- Adam Conrad <[e-mail]>  Fri, 02 Dec 2011 17:39:55 -0700
+
+dovecot (1:2.0.15-1ubuntu3) precise; urgency=low
+
+  * Rebuild for libmysqlclient transition.
+
+ -- Clint Byrum <[e-mail]>  Wed, 23 Nov 2011 16:38:01 -0800
+
+dovecot (1:2.0.15-1ubuntu2) precise; urgency=low
+
+  * Resolve issue with intermittent restart failures (LP: #873390):
+    - d/patches/fix-racey-restart.patch: Backported patch from current 
+      development release which ensures all child processes terminate prior
+      to the main dovecot process. 
+
+ -- James Page <[e-mail]>  Fri, 11 Nov 2011 14:38:41 +0000
+
+dovecot (1:2.0.15-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian Testing, remaining changes:
+    + Add mail-stack-delivery package:
+      - Update d/rules
+      - d/control: convert existing dovecot-postfix package to a dummy
+        package and add new mail-stack-delivery package.
+      - Update maintainer scripts.
+      - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
+      - d/mail-stack-delivery.preinst: Move previously installed backups and 
+        config files to a new package namespace.
+      - d/mail-stack-delivery.prerm: Added to handle downgrades.
+    + Use Snakeoil SSL certificates by default:
+      - d/control: Depend on ssl-cert.
+      - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - d/dovecot-core.ufw.profile: new ufw profile.
+      - d/rules: install profile in dovecot-core.
+      - d/control: dovecot-core - suggest ufw.
+    + d/{control,rules}: enable PIE hardening.
+    + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
+    + Add apport hook:
+      - d/rules, d/source_dovecot.py
+    + Add upstart job:
+      - d/rules, d/dovecot-core.dovecot.upstart, d/control,
+        d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        d/dovecot-pop3d.{postinst, postrm, prerm}. 
+        d/mail-stack-deliver.postinst:
+        Convert init script to upstart.
+  * d/01-mail-stack-delivery.conf: Add postfix->dovecot auth listener
+    to mail-stack-delivery configuration (LP: #874135).
+  * d/mail-stack-delivery.{postinst,postrm}: Restart dovecot to pickup/drop
+    mail-stack-delivery configuration (LP: #870244).
+  * d/control: Added Pre-Depends: dpkg (>= 1.15.6) to dovecot-dbg to support
+    xz compression in Ubuntu.
+  * d/control: Demote dovecot-common Recommends: to Suggests: to prevent
+    install of extra packages on upgrade.
+
+ -- James Page <[e-mail]>  Wed, 19 Oct 2011 15:54:40 +0100
+
 dovecot (1:2.0.15-1) unstable; urgency=low
 
   * [a22575a] New upstream version 2.0.15: (Closes: #642045)
@@ -577,6 +1011,60 @@ dovecot (1:2.0.13-1.1) unstable; urgency=low
 
  -- Luk Claes <[e-mail]>  Sat, 18 Jun 2011 12:31:28 +0200
 
+dovecot (1:2.0.13-1ubuntu3) oneiric; urgency=medium
+
+  [ Ben Howard ]
+  * debian/dovecot-common.dovecot.upstart: changed start to runlevel [2345]
+    (LP: #820685)
+
+  [ James Page ]
+  * Make mail-stack-delivery work with new version of dovecot (LP: #860336):
+    - debian/control: Added dovecot-managesieved to mail-stack-delivery Depends.
+    - debian/01-mail-stack-delivery.conf: Renamed mangesieve protocol -> sieve. 
+      Tidied up obsolete and changed configuration stanzas.
+    - debian/mail-stack-delivery.postinst: drop -n flag from dovecot deliver 
+      command in postfix configuration.
+
+ -- Ben Howard <[e-mail]>  Mon, 19 Sep 2011 14:44:56 -0600
+
+dovecot (1:2.0.13-1ubuntu2) oneiric; urgency=low
+
+  * debian/dovecot-common.postinst: fix ssl cert typos that prevent
+    certs from being generated (LP: #792557)
+
+ -- Steve Beattie <[e-mail]>  Fri, 03 Jun 2011 14:02:53 -0700
+
+dovecot (1:2.0.13-1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian Unstable, remaining changes: 
+    + Add mail-stack-delivery as per server-maverick-mail-integration spec:
+      - Update debian/rules
+      - Convert existing package to a dummy package and new binary in debian/control.
+      - Update maintainer scripts.
+      - Move previously installed backups and config files to a new package namespace in preinst.
+      - Add new debian/mail-stack-delivery.prerm to handle downgrades.
+      - Rename debian/dovecot-postfix.* to debian/mail-stack-delivery.*
+    + Use Snakeoil SSL certifications by default:
+      - debian/control: Depend on ssl-cert.
+      - debian/dovecot-common.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - Create debian/dovecot-common.ufw.profile.
+      - debian/rules: install profile
+      - debian/control: suggest ufw.
+    + debian/{control,rules}: enable PIE hardening.
+    + debian/dovecot-common.dirs: Added usr/share/doc/dovecot-common
+    + Add apport hook:
+      - debian/rules, debian/source_dovecot.py
+    + Add upstart job:
+      - debian/rules, debian/dovecot-common.dovecot.upstart, debian/control,
+        debian/dovecot-common.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        debian/dovecot-pop3d.{postinst, postrm, prerm}. mail-stack-deliver.postinst:
+        Convert init script to upstart. Apart of the server-maverick-upstart-conversion
+        specification.
+
+ -- Chuck Short <[e-mail]>  Wed, 01 Jun 2011 13:32:07 -0400
+
 dovecot (1:2.0.13-1) unstable; urgency=high
 
   [ Marco Nenciarini ]
@@ -601,6 +1089,37 @@ dovecot (1:2.0.13-1) unstable; urgency=high
 
  -- Marco Nenciarini <[e-mail]>  Sat, 21 May 2011 23:58:06 +0200
 
+dovecot (1:2.0.12-1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian Unstable, remaining changes are:
+    + Add mail-stack-delivery as per server-maverick-mail-integration spec:
+      - Update debian/rules
+      - Convert existing package to a dummy package and new binary in debian/control.
+      - Update maintainer scripts.
+      - Move previously installed backups and config files to a new package namespace in preinst.
+      - Add new debian/mail-stack-delivery.prerm to handle downgrades.
+      - Rename debian/dovecot-postfix.* to debian/mail-stack-delivery.*
+    + Use Snakeoil SSL certifications by default:
+      - debian/control: Depend on ssl-cert.
+      - debian/dovecot-common.postinst: Relax grep for SSL_* a bit.
+    + Add autopkgtest to debian/tests/*.
+    + Add ufw integration:
+      - Create debian/dovecot-common.ufw.profile.
+      - debian/rules: install profile
+      - debian/control: suggest ufw.
+    + debian/{control,rules}: enable PIE hardening.
+    + debian/dovecot-common.dirs: Added usr/share/doc/dovecot-common
+    + Add apport hook:
+      - debian/rules, debian/source_dovecot.py
+    + Add upstart job:
+      - debian/rules, debian/dovecot-common.dovecot.upstart, debian/control,
+        debian/dovecot-common.dirs, dovecot-imapd.{postrm, postinst, prerm},
+        debian/dovecot-pop3d.{postinst, postrm, prerm}. mail-stack-deliver.postinst:
+        Convert init script to upstart. Apart of the server-maverick-upstart-conversion
+        specification.
+
+ -- Chuck Short <[e-mail]>  Mon, 16 May 2011 10:18:41 -0400
+
 dovecot (1:2.0.12-1) unstable; urgency=low
 
   [ Jaldhar H. Vyas ]
diff --git a/debian/control b/debian/control
index f361853..8b4a42b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: dovecot
 Section: mail
 Priority: optional
-Maintainer: Dovecot Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Dovecot Maintainers <[e-mail]>
 Uploaders: Jaldhar H. Vyas <[e-mail]>, Fabio Tranchitella <[e-mail]>, Joel Johnson <[e-mail]>, Marco Nenciarini <[e-mail]>, Jelmer Vernooij <[e-mail]>, Apollon Oikonomopoulos <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
@@ -23,11 +24,9 @@ Build-Depends: debhelper (>= 9),
                libwrap0-dev,
                dh-systemd,
                lsb-release,
-               libclucene-dev (>= 2.3),
                liblzma-dev,
                liblz4-dev,
                libexttextcat-dev,
-               libstemmer-dev,
                autotools-dev,
                dh-exec
 Standards-Version: 3.9.7
@@ -37,11 +36,13 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/dovecot.git
 
 Package: dovecot-core
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), openssl, adduser, ucf (>= 2.0020)
-Suggests: ntp, dovecot-gssapi, dovecot-sieve, dovecot-pgsql, dovecot-mysql, dovecot-sqlite, dovecot-ldap, dovecot-imapd, dovecot-pop3d, dovecot-lmtpd, dovecot-managesieved, dovecot-solr, dovecot-lucene
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), openssl, adduser, ucf (>= 2.0020), ssl-cert, lsb-base
+Suggests: ntp, dovecot-gssapi, dovecot-sieve, dovecot-pgsql, dovecot-mysql, dovecot-sqlite, dovecot-ldap, dovecot-imapd, dovecot-pop3d, dovecot-lmtpd, dovecot-managesieved, dovecot-solr, ufw
 Provides: dovecot-common, dovecot-abi-${dovecot:ABI-Version}
-Replaces: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4)
-Breaks: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4)
+Replaces: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4),
+          dovecot-lucene (<<1:2.2.24~)
+Breaks: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4),
+        dovecot-lucene (<<1:2.2.24~)
 Description: secure POP3/IMAP server - core files
  Dovecot is a mail server whose major goals are security and extreme
  reliability. It tries very hard to handle all error conditions and verify
@@ -206,18 +207,6 @@ Description: secure POP3/IMAP server - Solr support
  .
  This package provides Solr full text search support for Dovecot.
 
-Package: dovecot-lucene
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
-Description: secure POP3/IMAP server - Lucene support
- Dovecot is a mail server whose major goals are security and extreme
- reliability. It tries very hard to handle all error conditions and verify
- that all data is valid, making it nearly impossible to crash. It supports
- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
- fast, extensible, and portable.
- .
- This package provides Lucene full text search support for Dovecot.
-
 Package: dovecot-dbg
 Section: debug
 Priority: extra
@@ -231,3 +220,18 @@ Description: secure POP3/IMAP server - debug symbols
  fast, extensible, and portable.
  .
  This package contains debug symbols for Dovecot.
+
+Package: mail-stack-delivery
+Architecture: all
+Depends: dovecot-core, dovecot-imapd, dovecot-pop3d, dovecot-managesieved,
+ postfix, ${misc:Depends}
+Replaces: dovecot-postfix (<< 1:1.2.12-0ubuntu1~)
+Description: mail server delivery agent stack provided by Ubuntu server team
+ Ubuntu's mail stack provides fully operational delivery with
+ safe defaults and additional options. Out of the box it supports IMAP,
+ POP3 and SMTP services with SASL authentication and Maildir as default
+ storage engine.
+ .
+ This package contains configuration files for dovecot.
+ .
+ This package modifies postfix's configuration to integrate with dovecot
diff --git a/debian/dovecot-core.dirs b/debian/dovecot-core.dirs
index a04bea3..211a634 100644
--- a/debian/dovecot-core.dirs
+++ b/debian/dovecot-core.dirs
@@ -1,5 +1,7 @@
 etc/dovecot/conf.d
 etc/dovecot/private
+etc/ssl/certs
+etc/ufw/applications.d
 usr/sbin
 usr/share/dovecot/protocols.d
 var/lib/dovecot
diff --git a/debian/dovecot-core.lintian-overrides b/debian/dovecot-core.lintian-overrides
index 2280c54..c53492a 100644
--- a/debian/dovecot-core.lintian-overrides
+++ b/debian/dovecot-core.lintian-overrides
@@ -7,7 +7,6 @@ dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/gdbhelper
 dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/libdovecot-login.so.0.0.0
 dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/libdovecot-sql.so.0.0.0
 dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/modules/auth/libauthdb_imap.so
-dovecot-core: hardening-no-relro usr/lib/dovecot/modules/drac.so
 dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/modules/lib05_pop3_migration_plugin.so
 dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/modules/lib10_quota_plugin.so
 dovecot-core: hardening-no-fortify-functions usr/lib/dovecot/modules/lib11_trash_plugin.so
diff --git a/debian/dovecot-core.maintscript b/debian/dovecot-core.maintscript
new file mode 100644
index 0000000..274820e
--- /dev/null
+++ b/debian/dovecot-core.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/init/dovecot.conf 1:2.2.22-1ubuntu4
diff --git a/debian/dovecot-core.ufw.profile b/debian/dovecot-core.ufw.profile
new file mode 100644
index 0000000..8d70761
--- /dev/null
+++ b/debian/dovecot-core.ufw.profile
@@ -0,0 +1,23 @@
+[Dovecot POP3]
+title=Secure mail server (POP3)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=110/tcp
+
+[Dovecot Secure POP3]
+title=Secure mail server (POP3S)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=995/tcp
+
+[Dovecot IMAP]
+title=Secure mail server (IMAP)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=143/tcp
+
+[Dovecot Secure IMAP]
+title=Secure mail server (IMAPS)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=993/tcp
diff --git a/debian/mail-stack-delivery.README.Debian b/debian/mail-stack-delivery.README.Debian
new file mode 100644
index 0000000..c48decd
--- /dev/null
+++ b/debian/mail-stack-delivery.README.Debian
@@ -0,0 +1,24 @@
+Introduction
+-------------------
+
+Mail-stack-delivery will not install any binary or library files. This package
+contains only configuration file /etc/dovecot/mail-stack-delivery.conf with
+configuration prerpared by Ubuntu Server Team.
+
+The matching configuration for dovecot is placed in:
+  /etc/dovecot/conf.d/99-mail-stack-delivery.conf
+
+During installation of package, it modifies postfix's configuration and
+stores original version of /etc/postfix/main.cf in /var/backup/mail-stack-delivery.
+
+Features of mail-stack-delivery:
+----------------------------
+
+- IMAP4rev1 and POP3, including support for TLS and SSL
+- SMTP, including support for TLS and SSL
+- support for sieve scripting
+- managesieve for managing sieve scripts directly on server
+- dovecot MDA, including extensions separated with '+'
+- Maildir storage engine
+- SASL authentication (plain and login)
+- support only for medium and high TLS/SSL ciphers
diff --git a/debian/mail-stack-delivery.dirs b/debian/mail-stack-delivery.dirs
new file mode 100644
index 0000000..6771044
--- /dev/null
+++ b/debian/mail-stack-delivery.dirs
@@ -0,0 +1,2 @@
+var/backups
+var/backups/mail-stack-delivery
diff --git a/debian/mail-stack-delivery.postinst b/debian/mail-stack-delivery.postinst
new file mode 100644
index 0000000..ebda461
--- /dev/null
+++ b/debian/mail-stack-delivery.postinst
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+set -e
+
+POSTFIX_BCKFILE="/var/backups/mail-stack-delivery/main.cf-backup"
+
+set_postfix_option() {
+    opt="$1"
+    # Backup the existion value of the option
+    postconf $(echo ${opt} | cut -d= -f1) >> ${POSTFIX_BCKFILE} || true
+    # Set the new value of the option
+    postconf -e "${opt}"
+    echo -n '.'
+}
+
+if [ "$1" = "configure" ]; then
+    # Create initial symlinks for certificates
+    SSL_CERT=$( (grep -m 1 "ssl_cert_file" /etc/dovecot/conf.d/10-ssl.conf || echo '/etc/dovecot/dovecot.pem') | cut -d'=' -f2)
+    SSL_KEY=$( (grep -m 1 "ssl_key_file" /etc/dovecot/conf.d/10-ssl.conf || echo '/etc/dovecot/private/dovecot.pem') | cut -d'=' -f2)
+
+    if [ ! -e "${SSL_KEY}" ]; then
+        ln -s /etc/ssl/private/ssl-cert-snakeoil.key ${SSL_KEY}
+    fi
+    if [ ! -e "${SSL_CERT}" ]; then
+        ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem ${SSL_CERT}
+    fi
+    # Configure postfix either on new install 
+    # or if the postfix backup file is no longer there 
+    # (only deleted when the pkg is removed)
+    if [ -f "/etc/postfix/main.cf" ]; then
+        if [ -e "$POSTFIX_BCKFILE" ]; then
+           cp $POSTFIX_BCKFILE ${POSTFIX_BCKFILE}-$(date +%Y%m%d%H%M)
+        fi
+        if [ -z "$2" -o ! -e "$POSTFIX_BCKFILE" ]; then
+            if which postconf >/dev/null; then
+                # Setup postfix
+                echo 'Mail stack delivery changes some postfix settings.'
+                echo 'Old values are stored in '$POSTFIX_BCKFILE'.'
+                echo 'Feel free to revert any of them when the process is done.'
+                echo -n 'Configuring postfix for mail-stack-delivery integration: '
+                set_postfix_option "home_mailbox = Maildir/"
+                set_postfix_option "smtpd_sasl_auth_enable = yes"
+                set_postfix_option "smtpd_sasl_type = dovecot"
+                set_postfix_option "smtpd_sasl_path = private/dovecot-auth"
+                set_postfix_option "smtpd_sasl_authenticated_header = yes"
+                set_postfix_option "smtpd_sasl_security_options = noanonymous"
+                set_postfix_option "smtpd_sasl_local_domain = \$myhostname"
+                set_postfix_option "broken_sasl_auth_clients = yes"
+                set_postfix_option "smtpd_recipient_restrictions = reject_unknown_sender_domain, reject_unknown_recipient_domain, reject_unauth_pipelining, permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination"
+                set_postfix_option "smtpd_sender_restrictions = reject_unknown_sender_domain"
+                set_postfix_option "mailbox_command = /usr/lib/dovecot/deliver -c /etc/dovecot/dovecot.conf -m \"\${EXTENSION}\""
+                set_postfix_option "smtpd_tls_cert_file = ${SSL_CERT}"
+                set_postfix_option "smtpd_tls_key_file = ${SSL_KEY}"
+                set_postfix_option "smtpd_use_tls = yes"
+                set_postfix_option "smtp_use_tls = yes"
+                set_postfix_option "smtpd_tls_received_header = yes"
+                set_postfix_option "smtpd_tls_mandatory_protocols = SSLv3, TLSv1"
+                set_postfix_option "smtpd_tls_mandatory_ciphers = medium"
+                set_postfix_option "smtpd_tls_auth_only = yes"
+                set_postfix_option "tls_random_source = dev:/dev/urandom"
+                echo ' done.'
+            fi
+        fi
+    else
+        echo ""
+        echo "Postfix not configured. Run"
+        echo "sudo dpkg-reconfigure postfix and choose"
+        echo "the type of mail server. Then run"
+        echo "sudo dpkg-reconfigure mail-stack-delivery to"
+        echo "finish mail-stack-delivery installation."
+        echo ""
+    fi
+
+    if [ -x "/etc/init.d/dovecot" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d dovecot restart
+        else
+            service dovecot restart
+        fi
+    fi
+    if [ -x "/etc/init.d/postfix" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d postfix restart
+        else
+            service postfix restart
+        fi
+    fi
+
+fi
+
+#DEBHELPER#
diff --git a/debian/mail-stack-delivery.postrm b/debian/mail-stack-delivery.postrm
new file mode 100644
index 0000000..bb3f0fb
--- /dev/null
+++ b/debian/mail-stack-delivery.postrm
@@ -0,0 +1,35 @@
+#!/bin/sh
+set -e
+
+POSTFIX_BCKFILE="/var/backups/mail-stack-delivery/main.cf-backup"
+
+PATH=/usr/sbin:$PATH
+export PATH
+
+if [ "$1" = "remove" -o "$1" = "purge" ]; then
+	# Restore postfix configuration
+	if [ "$1" = "remove" ]; then
+		if which postconf >/dev/null && [ -f "${POSTFIX_BCKFILE}" ]; then
+			while read line; do
+				postconf -e "$line"
+			done < "${POSTFIX_BCKFILE}"
+			rm -f "${POSTFIX_BCKFILE}"
+		fi
+	fi
+    if [ -x "/etc/init.d/dovecot" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d dovecot restart
+        else
+            service dovecot restart 
+        fi
+    fi
+	if [ -x "/etc/init.d/postfix" ]; then
+       	if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d postfix restart
+       	else
+            service postfix restart
+       	fi
+	fi
+fi
+
+#DEBHELPER#
diff --git a/debian/mail-stack-delivery.preinst b/debian/mail-stack-delivery.preinst
new file mode 100644
index 0000000..6065fde
--- /dev/null
+++ b/debian/mail-stack-delivery.preinst
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+set -e
+
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
+    PKGNAME="$1"
+    CONFFILE="$2"
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+            rm -f "$CONFFILE"
+        else
+            if [ -e "$CONFFILE" ]; then
+                if [ "$CONFFILE" = "/etc/dovecot/conf.d/01-dovecot-postfix.conf" ]; then
+                    mv -f "$CONFFILE" "/etc/dovecot/conf.d/01-mail-stack-delivery.conf"
+                fi
+                if [ "$CONFFILE" = "/etc/dovecot/auth.d/01-dovecot-postfix.auth" ]; then
+                    mv -f "$CONFFILE" "/etc/dovecot/auth.d/01-mail-stack-delivery.auth"
+                fi
+            fi
+        fi
+    fi
+}
+case "$1" in
+install|upgrade)
+  # Check if mail-stack-delivery.conf had any customizations
+  if [ -f "/usr/share/dovecot/mail-stack-delivery.conf" ]; then
+    if [ -f "/etc/dovecot/mail-stack-delivery.conf" ]; then
+            mv /etc/dovecot/mail-stack-delivery.conf /etc/dovecot/mail-stack-delivery.conf.bak
+            DIR=`mktemp -d`
+            egrep -v ^protocol /etc/dovecot/mail-stack-delivery.conf.bak > $DIR/mail-stack-delivery-custom.conf
+            egrep -v ^protocol /usr/share/dovecot/mail-stack-delivery.conf > $DIR/mail-stack-delivery.conf
+            if diff -qur $DIR/mail-stack-delivery-dist.conf $DIR/mail-stack-delivery-custom.conf 1>/dev/null 2>&1; then
+                    rm -f /etc/dovecot/mail-stack-delivery.conf.bak
+            else
+                    awk ' /^auth default/ {flag=1;next} /^}/{flag=0} flag { print }' /etc/dovecot/mail-stack-delivery.conf.bak > /etc/dovecot/auth.d/01-mail-stack-delivery.auth
+                    awk ' /^## Dovecot conf/{flag=1} /^auth default/{flag=0} flag { print }' /etc/dovecot/mail-stack-delivery.conf.bak > /etc/dovecot/conf.d/01-mail-stack-delivery.conf
+                    awk ' /^# If you wish to use another authentication server than dovecot-auth/{flag=1} flag { print }' /etc/dovecot/mail-stack-delivery.conf.bak >> /etc/dovecot/conf.d/01-mail-stack-delivery.conf
+            fi
+            rm -rf $DIR
+    fi
+  fi
+  ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+    echo "preinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index a05807c..0e26497 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,8 +57,6 @@ sieve_files = usr/bin/sieve* \
 
 solr_files = usr/lib/dovecot/modules/lib??_fts_solr_*
 
-lucene_files = usr/lib/dovecot/modules/lib??_fts_lucene_*
-
 dev_files = usr/include/* \
 	    usr/lib/dovecot/dovecot-config
 
@@ -77,7 +75,7 @@ override_dh_auto_configure:
 	            --with-solr \
 	            --with-ioloop=best \
 	            --with-libwrap \
-	            --with-lucene \
+	            --without-lucene \
 		    --with-lz4 \
 	            --prefix=/usr \
 	            --sysconfdir=/etc \
@@ -143,6 +141,14 @@ override_dh_install:
 		| perl -ne '/"(.+)\(.+\)"/ && print $$1' \
 		| tr '[A-Z]' '[a-z]' > $(PKG_DIR:PKG=dev)/usr/share/dovecot/dovecot-abi
 
+	install -m644 debian/dovecot-core.ufw.profile debian/dovecot-core/etc/ufw/applications.d/dovecot-core
+
+	# Install apport hook
+	install -D -m 644 debian/source_dovecot.py $(CURDIR)/debian/dovecot-core/usr/share/apport/package-hooks/dovecot-core.py
+
+	mkdir -p $(CURDIR)/debian/mail-stack-delivery/etc/dovecot/conf.d/
+	cp $(CURDIR)/debian/99-mail-stack-delivery.conf $(CURDIR)/debian/mail-stack-delivery/etc/dovecot/conf.d/
+
 override_dh_installpam:
 	dh_installpam -pdovecot-core --name=dovecot
 
diff --git a/debian/source_dovecot.py b/debian/source_dovecot.py
new file mode 100644
index 0000000..bd9958c
--- /dev/null
+++ b/debian/source_dovecot.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+'''Dovecot Apport interface
+
+Copyright (C) 2010 Canonical Ltd/
+Author: Chuck Short <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+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.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+
+def add_info(report, ui):
+	response = ui.yesno("The output of dovecot -n may help developers diagnose your bug more quickly, however, it may contain sensitive information. Do you want to include it in your bug report?")
+
+	if response == None: #user canceled
+		raise StopIteration
+
+	elif response == True:
+		report['DovecotConf'] = root_command_output(['/usr/sbin/dovecot', '-n'])
+		
+
+	elif response == False:
+		ui.information("The contents of dovecot -n will NOT be includeded in the bug report")
+
+	packages=['dovecot-common', 'dovecot-core', 'dovecot-dev', 'dovecot-pop3d', 'dovecot-imapd',  'mail-stack-delivery', 'dovecot-postfix']
+	versions = ''
+	for package in packages:
+		try:
+			version  = package.get_version(package)
+		except:
+			version = 'N/A'
+		versions += '%s %s\n' %(package, version)
+	report['DovecotInstalledVersions'] = versions	
+             
diff --git a/debian/tests/control b/debian/tests/control
index 70b78e4..96fd8c8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -4,3 +4,9 @@ Restrictions: needs-root
 
 Tests: systemd
 Depends: dovecot-core, systemd-sysv
+
+# the old Ubuntu tests
+Tests: general
+Restrictions: needs-root
+Features: no-build-needed
+Depends: python, dovecot-imapd, dovecot-pop3d, dovecot-managesieved, mail-stack-delivery
diff --git a/debian/tests/general b/debian/tests/general
new file mode 100644
index 0000000..ba69fbd
--- /dev/null
+++ b/debian/tests/general
@@ -0,0 +1,218 @@
+#!/usr/bin/python
+
+import unittest, subprocess, shutil, grp, os, os.path, sys, time
+import imaplib, poplib
+
+import testlib
+import testlib_dovecot
+
+class DovecotBasics(unittest.TestCase):
+    '''Base operational tests for Dovecot server.'''
+
+    def _setUp(self,config_mmap_disable=False):
+        '''Create test scenario.
+
+        dovecot is configured for all protocols (imap[s] and pop3[s]), a test
+        user is set up, and /var/mail/$user contains an unread and a read mail.
+        '''
+
+        self.user = testlib.TestUser()
+
+        config = '''
+protocols = imap pop3
+log_timestamp = "%Y-%m-%d %H:%M:%S "
+mail_privileged_group = mail
+managesieve_notify_capability = mailto
+managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date index ihave duplicate mime foreverypart extracttext
+'''
+        if config_mmap_disable:
+            config += '''
+mmap_disable = yes
+'''
+        config += '''
+ssl = yes
+ssl_cert = </etc/dovecot/dovecot.pem
+ssl_key = </etc/dovecot/private/dovecot.pem
+auth_mechanisms = PLAIN
+mail_location = mbox:~/mail:INBOX=/var/mail/%u
+service auth {
+  user = root
+}
+protocol pop3 {
+  pop3_uidl_format = %08Xu%08Xv
+}
+userdb {
+  driver = passwd
+}
+passdb {
+  driver = passwd-file
+  args = username_format=%n scheme=PLAIN /etc/dovecot/test.passwd
+}
+'''
+        self.dovecot = testlib_dovecot.Dovecot(self.user,config)
+
+    def tearDown(self):
+        self.dovecot = None
+        self.user = None
+
+    def _test_pop3_proto(self, pop):
+        '''Internal factorization of POP3 protocol checks with an established
+        connection.'''
+
+        # check empty password
+        self.assertEqual(pop.user(self.user.login), '+OK')
+        self.assertRaises(poplib.error_proto, pop.pass_, '')
+            
+        # check wrong password
+        self.assertEqual(pop.user(self.user.login), '+OK')
+        self.assertRaises(poplib.error_proto, pop.pass_, '123')
+
+        # check correct password
+        self.assertEqual(pop.user(self.user.login), '+OK')
+        self.assertEqual(pop.pass_(self.user.password), '+OK Logged in.')
+
+        # check messages
+        self.assertEqual(pop.stat()[0], 2, '2 available messages')
+        self.assertEqual(pop.list()[1], ['1 163', '2 161'])
+        self.assertEqual('\n'.join(pop.retr(1)[1]), '''Date: Thu, 16 Nov 2006 17:12:23 -0800
+From: Test User 1 <[e-mail]>
+To: Dovecot tester <[e-mail]>
+Subject: Test 1
+
+Some really important news.''')
+        self.assertEqual('\n'.join(pop.retr(2)[1]), '''Date: Tue, 28 Nov 2006 11:29:34 +0100
+From: Test User 2 <[e-mail]>
+To: Dovecot tester <[e-mail]>
+Subject: Test 2
+
+More news.
+
+Get cracking!''')
+
+        self.assertEqual(pop.quit(), '+OK Logging out.')
+
+        # check new status
+        status = ''
+        for l in open(self.dovecot.get_mailbox()):
+            if l.startswith('Status:'):
+                status += l
+        self.assertEqual(status, 'Status: NRO\nStatus: RO\n')
+
+    def test_pop3(self):
+        '''Test POP3 protocol.'''
+
+        pop = poplib.POP3('localhost')
+        self.assertEqual(pop.getwelcome(), '+OK Dovecot ready.')
+
+        self._test_pop3_proto(pop)
+
+    def test_pop3s(self):
+        '''Test POP3S protocol.'''
+
+        pop = poplib.POP3_SSL('localhost')
+        self.assertEqual(pop.getwelcome(), '+OK Dovecot ready.')
+
+        self._test_pop3_proto(pop)
+
+    def _test_imap_proto(self, imap):
+        '''Internal factorization of IMAP4 protocol checks with an established
+        connection.'''
+
+        # invalid passwords
+        self.assertRaises(imaplib.IMAP4.error, imap.login, self.user.login, '')
+        self.assertRaises(imaplib.IMAP4.error, imap.login, self.user.login, '123')
+        
+        # correct password
+        imap.login(self.user.login, self.user.password)
+
+        # list mailboxes
+        status, imlist = imap.list()
+        self.assertEqual(status, 'OK')
+        self.assert_(imlist[0].endswith('INBOX'))
+
+        # check mails
+        imap.select()
+        self.assertEqual(imap.search(None, 'ALL'), ('OK', ['1 2']))
+        self.assertEqual(imap.fetch('1', '(FLAGS)'), 
+            ('OK', ['1 (FLAGS (\\Recent))']))
+        self.assertEqual(imap.fetch('2', '(FLAGS)'), 
+            ('OK', ['2 (FLAGS (\\Seen \\Recent))']))
+        self.assertEqual(imap.fetch('1', '(BODY[TEXT])')[1][0][1], 
+            'Some really important news.\r\n')
+        self.assertEqual(imap.fetch('2', '(BODY[TEXT])')[1][0][1], 
+            'More news.\r\n\r\nGet cracking!')
+
+        self.assertEqual(imap.fetch('1', '(RFC822)')[1],
+            [('1 (RFC822 {163}', 
+            '''Date: Thu, 16 Nov 2006 17:12:23 -0800\r
+From: Test User 1 <[e-mail]>\r
+To: Dovecot tester <[e-mail]>\r
+Subject: Test 1\r
+\r
+Some really important news.\r
+'''), ')'])
+
+        # delete mail 1
+        self.assertEqual(imap.store('1', '+FLAGS', '\\Deleted')[0], 'OK')
+        self.assertEqual(imap.expunge()[0], 'OK')
+        self.assertEqual(imap.search(None, 'ALL'), ('OK', ['1']))
+
+        # old mail 2 is mail 1 now
+        self.assertEqual(imap.fetch('1', '(RFC822)')[1],
+            [('1 (RFC822 {161}', 
+            '''Date: Tue, 28 Nov 2006 11:29:34 +0100\r
+From: Test User 2 <[e-mail]>\r
+To: Dovecot tester <[e-mail]>\r
+Subject: Test 2\r
+\r
+More news.\r
+\r
+Get cracking!'''), ')'])
+        imap.close()
+        imap.logout()
+
+    def test_imap(self):
+        '''Test IMAP4 protocol.'''
+
+        imap = imaplib.IMAP4('localhost')
+        self._test_imap_proto(imap)
+
+    def test_imaps(self):
+        '''Test IMAP4S protocol.'''
+
+        imap = imaplib.IMAP4_SSL('localhost')
+        self._test_imap_proto(imap)
+
+
+class DovecotMmapTest(DovecotBasics):
+    '''Test dovecot with mmap support.'''
+
+    def setUp(self):
+        self._setUp()
+
+    def test_configuration(self):
+        '''Test dovecot configuration has mmap support.'''
+        self.assertEquals(subprocess.call(['/bin/grep', '-q', '^mmap_disable = yes','/etc/dovecot/dovecot.conf'], stdout=subprocess.PIPE), 1)
+        
+
+class DovecotDirectTest(DovecotBasics):
+    '''Test dovecot without mmap support.'''
+
+    def setUp(self):
+        self._setUp(config_mmap_disable=True)
+
+    def test_configuration(self):
+        '''Test dovecot configuration has mmap disabled.'''
+        self.assertEquals(subprocess.call(['/bin/grep', '-q', '^mmap_disable = yes','/etc/dovecot/dovecot.conf'], stdout=subprocess.PIPE), 0)
+        
+
+
+if __name__ == '__main__':
+    os.dup2(1,2)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(DovecotDirectTest))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(DovecotMmapTest))
+    result = unittest.TextTestRunner(verbosity=2).run(suite)
+    sys.exit(not result.wasSuccessful())
+
+#unittest.main()
diff --git a/debian/tests/testlib.py b/debian/tests/testlib.py
new file mode 100644
index 0000000..61f9074
--- /dev/null
+++ b/debian/tests/testlib.py
@@ -0,0 +1,101 @@
+'''Common classes and functions for package tests.'''
+
+import string, random, crypt, subprocess, pwd, signal, time
+
+class TimedOutException(Exception):
+    def __init__(self, value = "Timed Out"):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+
+def timeout(secs, f, *args):
+    def handler(signum, frame):
+        raise TimedOutException()
+    
+    old = signal.signal(signal.SIGALRM, handler)
+    result = None
+    signal.alarm(secs)
+    try:
+        result = f(*args)
+    finally:
+        signal.alarm(0)
+        signal.signal(signal.SIGALRM, old)
+
+    return result
+
+def random_string(length):
+    '''Return a random string, consisting of ASCII letters, with given
+    length.'''
+
+    s = ''
+    maxind = len(string.letters)-1
+    for l in range(length):
+        s += string.letters[random.randint(0, maxind)]
+    return s.lower()
+
+def login_exists(login):
+    '''Checks whether the given login exists on the system.'''
+
+    try:
+        pwd.getpwnam(login)
+        return True
+    except KeyError:
+        return False
+
+def cmd(command, input = None, stderr = subprocess.STDOUT):
+    '''Try to execute given command (array) and return its stdout, or return
+    a textual error if it failed.'''
+
+    try:
+       sp = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=stderr, close_fds=True)
+    except OSError, e:
+        return [127, str(e)]
+
+    out = sp.communicate(input)[0]
+    return [sp.returncode,out]
+
+class TestUser:
+    '''Create a temporary test user and remove it again in the dtor.'''
+
+    def __init__(self, login=None, home=True):
+        '''Create a new user account with a random password. 
+        
+        By default, the login name is random, too, but can be explicitly
+        specified with 'login'. By default, a home directory is created, this
+        can be suppressed with 'home=False'.'''
+
+        self.login = None
+
+        if login:
+            if login_exists(login):
+                raise ValueError, 'login name already exists'
+        else:
+            while(True):
+                login = random_string(8)
+                if not login_exists(login):
+                    break
+
+        self.salt = random_string(2)
+        self.password = random_string(8)
+        self.crypted = crypt.crypt(self.password, self.salt)
+
+        if home:
+            assert subprocess.call(['useradd', '-p', self.crypted, '-m', login]) == 0
+        else:
+            assert subprocess.call(['useradd', '-p', self.crypted, login]) == 0
+
+        self.login = login
+        p = pwd.getpwnam(self.login)
+        self.uid = p[2]
+        self.gid = p[3]
+
+    def __del__(self):
+        '''Remove the created user account.'''
+
+        if self.login:
+            # seems to already have gone here
+            try:
+                import subprocess
+            except:
+                pass
+            assert subprocess.call(['userdel', '-r', self.login]) == 0
diff --git a/debian/tests/testlib_dovecot.py b/debian/tests/testlib_dovecot.py
new file mode 100644
index 0000000..a2c216b
--- /dev/null
+++ b/debian/tests/testlib_dovecot.py
@@ -0,0 +1,112 @@
+#!/usr/bin/python
+'''
+    Packages required: dovecot-imapd dovecot-pop3d
+'''
+
+import subprocess, shutil, grp, os, os.path, sys, time
+
+class Dovecot:
+    def get_mailbox(self):
+        return self.mailbox
+
+    def __init__(self,user,config=None):
+        '''Create test scenario.
+
+        dovecot is configured for all protocols (imap[s] and pop3[s]), a test
+        user is set up, and /var/mail/$user contains an unread and a read mail.
+        '''
+
+        self.old_version = False
+        if config == None:
+                config='''
+protocols = imap pop3
+log_timestamp = "%Y-%m-%d %H:%M:%S "
+mail_privileged_group = mail
+managesieve_notify_capability = mailto
+managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date index ihave duplicate mime foreverypart extracttext
+mmap_disable = yes
+ssl = yes
+ssl_cert = </etc/dovecot/dovecot.pem
+ssl_key = </etc/dovecot/private/dovecot.pem
+auth_mechanisms = PLAIN
+mail_location = mbox:~/mail:INBOX=/var/mail/%u
+service auth {
+  user = root
+}
+protocol pop3 {
+  pop3_uidl_format = %08Xu%08Xv
+}
+userdb {
+  driver = passwd
+}
+passdb {
+  driver = passwd-file
+  args = username_format=%n scheme=PLAIN /etc/dovecot/test.passwd
+}
+'''
+
+        # make sure that /etc/inetd.conf exists to avoid init script errors
+        self.created_inetdconf = False
+        if not os.path.exists('/etc/inetd.conf'):
+            open('/etc/inetd.conf', 'a')
+            self.created_inetdconf = True
+
+        # configure and restart dovecot
+        if not os.path.exists('/etc/dovecot/dovecot.conf.autotest'):
+            shutil.copyfile('/etc/dovecot/dovecot.conf', '/etc/dovecot/dovecot.conf.autotest')
+        cfgfile = open('/etc/dovecot/dovecot.conf', 'w')
+        cfgfile.write(config)
+        cfgfile.close()
+
+        file('/etc/dovecot/test.passwd','w').write('%s:{plain}%s\n' % (user.login, user.password) )
+
+        # restart will fail if dovecot is not already running
+        subprocess.call(['/etc/init.d/dovecot', 'stop'], stdout=subprocess.PIPE)
+        # systemd rate limit will kill it without a bit of sleep (max 5 in 10 sec)
+	time.sleep(3)
+        assert subprocess.call(['/etc/init.d/dovecot', 'start'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) == 0
+
+        # create test mailbox with one new and one old mail
+        self.mailbox = '/var/mail/' + user.login
+        self.orig_mbox = \
+'''From [e-mail] Fri Nov 17 02:21:08 2006
+Date: Thu, 16 Nov 2006 17:12:23 -0800
+From: Test User 1 <[e-mail]>
+To: Dovecot tester <[e-mail]>
+Subject: Test 1
+Status: N
+
+Some really important news.
+
+From [e-mail] Tue Nov 28 11:29:34 2006
+Date: Tue, 28 Nov 2006 11:29:34 +0100
+From: Test User 2 <[e-mail]>
+To: Dovecot tester <[e-mail]>
+Subject: Test 2
+Status: R
+
+More news.
+
+Get cracking!
+'''
+        open(self.mailbox, 'w').write(self.orig_mbox)
+        os.chown(self.mailbox, user.uid, grp.getgrnam('mail')[2])
+        os.chmod(self.mailbox, 0660)
+
+    def __del__(self):
+        # restore original configuration and restart dovecot
+        os.rename('/etc/dovecot/dovecot.conf.autotest', '/etc/dovecot/dovecot.conf')
+        # quiesce, default configuration has no protocols
+        subprocess.call(['/etc/init.d/dovecot', 'restart'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
+        if self.created_inetdconf:
+            os.unlink('/etc/inetd.conf')
+
+    def get_ssl_fingerprint(self):
+        pem = '/etc/ssl/certs/dovecot.pem'
+        if not os.path.exists(pem):
+            pem = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+        
+        sp = subprocess.Popen(['openssl','x509','-in',pem,'-noout','-md5','-fingerprint'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
+        return sp.communicate(None)[0].split('=',1)[1].strip()
+