Merge ~bryce/ubuntu/+source/dovecot:merge-v1E2.3.13Adfsg1-1-hirsute into ubuntu/+source/dovecot:debian/sid

[Bryce Harrington]

All changes for dovecot are now upstream in 2.3.13, so this can be a sync.
Just filing MP as doublecheck for review.

Usual tags pushed.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/dovecot-merge-v1..2.3.13+dfsg1-1

[Christian Ehrhardt  (paelzer)]

Slightly confusing as https://dovecot.org/doc/NEWS doesn't list CVE-2020-25275.
(It does for CVE-2020-24386).

CVE-2020-25275-1.patch is present in the new code mostly as-is

CVE-2020-25275-2.patch isn't but that just has evolved since then, unftionally it is present.

I agree, this can be a sync again - thanks!
I've run syncpackage on this - let us check how it works out when the archive opens again

review: Approve

[Bryce Harrington (bryce)]

Looks like this required a rebuild but otherwise has migrated successfully:

$ ubuntu-changes dovecot
dovecot (1:2.3.13+dfsg1-1build1) hirsute; urgency=high

  * No change rebuild against clucene-core

 -- Balint Reczey <email address hidden> Thu, 18 Feb 2021 18:19:47 +0100

diff --git a/debian/changelog b/debian/changelog
index 65e651b..b7ac744 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+dovecot (1:2.3.13+dfsg1-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+  * Dropped:
+    - SECURITY UPDATE: information disclosure via imap hibernation
+      + debian/patches/CVE-2020-24386-1.patch: escape tag when sending it to
+        imap-hibernate process in src/imap/imap-client-hibernate.c.
+      + debian/patches/CVE-2020-24386-2.patch: add unit test for
+        imap-client-hibernate in src/imap/Makefile.am,
+        src/imap/imap-client-hibernate.c, src/imap/imap-client.h,
+        src/imap/test-imap-client-hibernate.c.
+      + CVE-2020-24386
+      [Included in upstream 2.3.13]
+    - SECURITY UPDATE: remote DoS via large number of MIME parts
+      + debian/patches/CVE-2020-25275-1.patch: fix assert-crash when
+        enforcing MIME part limit in src/lib-mail/message-parser.c,
+        src/lib-mail/test-message-parser.c.
+      + debian/patches/CVE-2020-25275-2.patch: don't generate invalid
+        BODYSTRUCTURE when reaching MIME part limit in
+        src/lib-imap/imap-bodystructure.c.
+      + CVE-2020-25275
+      [Included in upstream 2.3.13]
+
+ -- Bryce Harrington <[e-mail]>  Thu, 18 Feb 2021 03:36:32 +0000
+
 dovecot (1:2.3.13+dfsg1-1) unstable; urgency=medium
 
   [ Christian Göttsche ]
@@ -22,6 +47,27 @@ dovecot (1:2.3.13+dfsg1-1) unstable; urgency=medium
 
  -- Noah Meyerhans <[e-mail]>  Mon, 25 Jan 2021 15:38:17 -0800
 
+dovecot (1:2.3.11.3+dfsg1-2ubuntu1) hirsute; urgency=medium
+
+  * SECURITY UPDATE: information disclosure via imap hibernation
+    - debian/patches/CVE-2020-24386-1.patch: escape tag when sending it to
+      imap-hibernate process in src/imap/imap-client-hibernate.c.
+    - debian/patches/CVE-2020-24386-2.patch: add unit test for
+      imap-client-hibernate in src/imap/Makefile.am,
+      src/imap/imap-client-hibernate.c, src/imap/imap-client.h,
+      src/imap/test-imap-client-hibernate.c.
+    - CVE-2020-24386
+  * SECURITY UPDATE: remote DoS via large number of MIME parts
+    - debian/patches/CVE-2020-25275-1.patch: fix assert-crash when
+      enforcing MIME part limit in src/lib-mail/message-parser.c,
+      src/lib-mail/test-message-parser.c.
+    - debian/patches/CVE-2020-25275-2.patch: don't generate invalid
+      BODYSTRUCTURE when reaching MIME part limit in
+      src/lib-imap/imap-bodystructure.c.
+    - CVE-2020-25275
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 28 Dec 2020 10:59:24 -0500
+
 dovecot (1:2.3.11.3+dfsg1-2) unstable; urgency=medium
 
   [ Christian Göttsche ]
diff --git a/debian/control b/debian/control
index 7db1c94..93b2117 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]>,
            Jelmer Vernooij <[e-mail]>,
            Apollon Oikonomopoulos <[e-mail]>,