From: Salvatore Bonaccorso <carnil@debian.org>
Date: Sat, 10 Feb 2018 08:26:05 +0000 (+0100)
Subject: Import Debian changes 4.89-2+deb9u3
X-Git-Tag: debian/4.89-2+deb9u3^0
X-Git-Url: http://git.hcoop.net/hcoop/debian/exim4.git/commitdiff_plain/6b3dccc69283fb49ac4649da40bd3e63bdc676ef

Import Debian changes 4.89-2+deb9u3

exim4 (4.89-2+deb9u3) stretch-security; urgency=high

  * Non-maintainer upload by the Security Team.
  * Fix base64d() buffer size (CVE-2018-6789) (Closes: #890000)
---

diff --git a/debian/changelog b/debian/changelog
index 5b9849b..5acbd18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-exim4 (4.89-2+deb9u3~bpo8+1) jessie-backports; urgency=medium
-
-  * Rebuild for jessie-backports.
-  * b-d on libmysqlclient-dev | libmysqlclient15-dev instead of
-    default-libmysqlclient-dev.
-
- -- Andreas Metzler <ametzler@debian.org>  Sun, 25 Feb 2018 15:26:27 +0100
-
 exim4 (4.89-2+deb9u3) stretch-security; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff --git a/debian/control b/debian/control
index 4623715..16c00d3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-exim4/exim4.git
 Build-Depends: debhelper (>= 9), po-debconf, docbook-xsl, xsltproc,
   lynx-cur | lynx, docbook-xml, libpcre3-dev, libldap2-dev, libpam0g-dev,
   libident-dev, libdb5.3-dev, libxmu-dev, libxt-dev, libxext-dev, libx11-dev,
-  libxaw7-dev, libpq-dev, libmysqlclient-dev | libmysqlclient15-dev,
+  libxaw7-dev, libpq-dev, default-libmysqlclient-dev,
   libsqlite3-dev, libperl-dev, libgnutls28-dev, libsasl2-dev
 
 Package: exim4-base