[packages/exim] - rel 10; update upstream git fixes
arekm
arekm at pld-linux.org
Fri Feb 5 13:50:28 CET 2016
commit a8268ce8118270ef4079f491383adec27a434e26
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Feb 5 13:50:15 2016 +0100
- rel 10; update upstream git fixes
exim-git.patch | 30 ++++++++++++++++++++++++++++++
exim.spec | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/exim.spec b/exim.spec
index e03c26c..a115a17 100644
--- a/exim.spec
+++ b/exim.spec
@@ -21,7 +21,7 @@ Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge
Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim
Name: exim
Version: 4.86
-Release: 9
+Release: 10
Epoch: 2
License: GPL
Group: Networking/Daemons/SMTP
diff --git a/exim-git.patch b/exim-git.patch
index 0699820..915f246 100644
--- a/exim-git.patch
+++ b/exim-git.patch
@@ -1362,3 +1362,33 @@ index 618364a..cc9ffb7 100644
nested_context.context =
context && context->context == MBC_ATTACHMENT
+
+commit 8d58e3501ce731c5d6d5efc9e76058832d4bc941
+Author: Jeremy Harris <jgh146exb at wizmail.org>
+Date: Thu Jan 21 15:37:08 2016 +0000
+
+ Cutthrough: Fix bug with dot-only line
+
+ (cherry picked from commit 1bc460a64a0de0766d21f4f8660c6597bc410cbc)
+
+diff --git a/src/src/receive.c b/src/src/receive.c
+index 64cf1ae..d1f81d3 100644
+--- a/src/src/receive.c
++++ b/src/src/receive.c
+@@ -835,7 +835,15 @@ while ((ch = (receive_getc)()) != EOF)
+ ch_state = 4;
+ continue;
+ }
+- ch_state = 1; /* The dot itself is removed */
++ /* The dot was removed at state 3. For a doubled dot, here, reinstate
++ it to cutthrough. The current ch, dot or not, is passed both to cutthrough
++ and to file below. */
++ if (ch == '.')
++ {
++ uschar c= ch;
++ (void) cutthrough_puts(&c, 1);
++ }
++ ch_state = 1;
+ break;
+
+ case 4: /* After [CR] LF . CR */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/a8268ce8118270ef4079f491383adec27a434e26
More information about the pld-cvs-commit
mailing list