From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sat, 20 Jun 2020 20:33:34 +0000 (-0400)
Subject: Merge branch 'debian'
X-Git-Tag: debian/4.92-8+deb10u4_hcoop1^0
X-Git-Url: https://git.hcoop.net/hcoop/debian/exim4.git/commitdiff_plain/f84d3f9f4fa61b9cc6cc2472bf7fc7f9be8347c3?hp=-c

Merge branch 'debian'
---

f84d3f9f4fa61b9cc6cc2472bf7fc7f9be8347c3
diff --combined debian/changelog
index 03898ae,42f11ec..b74e500
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- exim4 (4.92-8+deb10u3~hcoop1) unstable; urgency=medium
++exim4 (4.92-8+deb10u4~hcoop1) unstable; urgency=medium
 +
 +  * HCoop build
 +
-  -- Clinton Ebadi <clinton@unknownlamer.org>  Sat, 15 Feb 2020 23:26:01 -0500
++ -- Clinton Ebadi <clinton@unknownlamer.org>  Sat, 20 Jun 2020 16:32:29 -0400
++
+ exim4 (4.92-8+deb10u4) buster-security; urgency=high
+ 
+   * Fix authentication bypass in SPA authenticator due to out-of-bound buffer
+     read. https://bugs.exim.org/show_bug.cgi?id=2571 CVE-2020-12783
+ 
+  -- Andreas Metzler <ametzler@debian.org>  Wed, 13 May 2020 18:01:31 +0200
  
  exim4 (4.92-8+deb10u3) buster-security; urgency=high
  
@@@ -1361,30 -1362,6 +1368,30 @@@ exim4 (4.85~RC1+dfsg-1) experimental; u
  
   -- Andreas Metzler <ametzler@debian.org>  Tue, 18 Nov 2014 19:28:20 +0100
  
 +exim4 (4.84-8+hcoop4) unstable; urgency=medium
 +
 +  * Missed another chown that needs skipping
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 14 May 2015 01:35:09 -0400
 +
 +exim4 (4.84-8+hcoop3) unstable; urgency=medium
 +
 +  * Patch the right thing.
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 14 May 2015 00:34:14 -0400
 +
 +exim4 (4.84-8+hcoop2) unstable; urgency=medium
 +
 +  * Change message in chown failure for sanity check
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Wed, 13 May 2015 23:47:18 -0400
 +
 +exim4 (4.84-8+hcoop1) unstable; urgency=medium
 +
 +  * Relax chown requirement for delivery into afs
 +
 + -- Clinton Ebadi <clinton@unknownlamer.org>  Wed, 13 May 2015 23:26:54 -0400
 +
  exim4 (4.84-8) unstable; urgency=medium
  
    * Pull 83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch and
diff --combined debian/patches/series
index 1298983,d19d88e..d0f267d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -3,7 -3,6 +3,7 @@@
  33_eximon.binary.dpatch
  34_eximstatsmanpage.dpatch
  35_install.dpatch
 +50-relax-appendfile-chown-openafs.patch
  60_convert4r4.dpatch
  67_unnecessaryCopt.diff
  70_remove_exim-users_references.dpatch
@@@ -25,4 -24,6 +25,6 @@@
  77_Avoid-re-expansion-in-sort-CVE-2019-13917-OVE-201907.patch
  78_01-string.c-do-not-interpret-before-0-CVE-2019-15846.patch
  78_02-Fix-buffer-overflow-in-string_vformat.-Bug-2449.patch
+ 79_01-Fix-SPA-authenticator-checking-client-supplied-data-.patch
+ 79_02-Rework-SPA-fix-to-avoid-overflows.-Bug-2571.patch
  90_localscan_dlopen.dpatch