Subversion Repositories sa-exim

Compare Revisions

Ignore whitespace Rev 88 → Rev 89

/trunk/debian/changelog
1,3 → 1,11
sa-exim (4.2.1-17) unstable; urgency=medium
 
* remove-header-crs.patch (new): Strip out carriage returns from header
lines returned by spamd when the spool file is in wire format
(Probably closes: #879687; it's a bit unclear what the bug is about).
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 05 May 2019 23:47:33 +0200
 
sa-exim (4.2.1-16) unstable; urgency=low
 
* reproducible-build.patch: Make ACKNOWLEDGEMENTS always UTF-8 encoded
/trunk/debian/patches/remove-header-crs.patch
0,0 → 1,32
Description: Delete carriage returns from header lines.
When spamd gets a message with CRLF line endings, which it will when
the spool file is in wire format, it will return a message with CRLF
line endings, including the header. We will need to strip out the
CRs.
 
--- a/sa-exim.c
+++ b/sa-exim.c
@@ -406,6 +406,11 @@ int parsemlheader(char *buffer, FILE *re
if (buffer[strlen(buffer)-1] == '\n')
{
buffer[strlen(buffer)-1]=0;
+ /* and any carriage return */
+ if (buffer[strlen(buffer)-1] == '\r')
+ {
+ buffer[strlen(buffer)-1]=0;
+ }
}
if (SAEximDebug > 5)
{
@@ -1078,6 +1083,11 @@ int local_scan(volatile int fd, uschar *
if (buffer[strlen(buffer)-1] == '\n')
{
buffer[strlen(buffer)-1]=0;
+ /* and any carriage return */
+ if (buffer[strlen(buffer)-1] == '\r')
+ {
+ buffer[strlen(buffer)-1]=0;
+ }
}
restart:
if (SAEximDebug > 5)
/trunk/debian/patches/series
9,3 → 9,4
greylisting-ipv6.patch
greylist-lint.patch
delete-ext-html-references.patch
remove-header-crs.patch