[packages/exim] - rel 7; and one more fix (manual backport of upstream commit c14470c30aa0)

[arekm]

commit 036c5f09578dbb84557fe73ec60fd743360934d6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Dec 2 19:29:21 2015 +0100

    - rel 7; and one more fix (manual backport of upstream commit c14470c30aa0)

 exim-dkim.patch | 31 +++++++++++++++++++++++++++++++
 exim.spec       |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/exim.spec b/exim.spec
index 878bdcb..ad6928c 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:	6
+Release:	7
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons/SMTP
diff --git a/exim-dkim.patch b/exim-dkim.patch
index 0dcdbea..80dd59b 100644
--- a/exim-dkim.patch
+++ b/exim-dkim.patch
@@ -135,3 +135,34 @@ index 99948ff..94328f7 100644
        goto BAIL;
      }
 
+--- a/src/src/pdkim/pdkim.c~	2015-12-02 19:18:54.000000000 +0100
++++ a/src/src/pdkim/pdkim.c	2015-12-02 19:22:09.149625694 +0100
+@@ -1096,6 +1096,7 @@
+ int pdkim_bodyline_complete(pdkim_ctx *ctx) {
+   char *p = ctx->linebuf;
+   int   n = ctx->linebuf_offset;
++  pdkim_signature *sig = ctx->sig;       /*XXX assumes only one sig */
+ 
+   /* Ignore extra data if we've seen the end-of-data marker */
+   if (ctx->seen_eod) goto BAIL;
+@@ -1108,7 +1109,8 @@
+     if (memcmp(p,".\r\n",3) == 0) {
+       /* In simple body mode, if any empty lines were buffered,
+       replace with one. rfc 4871 3.4.3 */
+-      if (ctx->sig && ctx->sig->canon_body == PDKIM_CANON_SIMPLE
++      if (  sig && sig->canon_body == PDKIM_CANON_SIMPLE
++         && sig->signed_body_bytes == 0
+ 	 && ctx->num_buffered_crlf > 0)
+ 	pdkim_update_bodyhash(ctx,"\r\n",2);
+ 
+@@ -1128,8 +1130,8 @@
+     goto BAIL;
+   }
+ 
+-  if (  ctx->sig
+-     && ctx->sig->canon_body == PDKIM_CANON_RELAXED) {
++  if (  sig
++     && sig->canon_body == PDKIM_CANON_RELAXED) {
+     /* Lines with just spaces need to be buffered too */
+     char *check = p;
+     while(memcmp(check,"\r\n",2) != 0) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/036c5f09578dbb84557fe73ec60fd743360934d6