From 646957842b043fab9a1c48863f9bc6c10cef4ac1 Mon Sep 17 00:00:00 2001
From: krion <krion@FreeBSD.org>
Date: Wed, 20 Apr 2005 18:24:08 +0000
Subject: Do not reject files like /etc/group etc as input files.
Submitted by: Jan-Peter Koopmann <Jan-Peter.Koopmann at seceidos.de>
Patched by: Philip Hazel <ph10 at cus dot cam.ac.uk>
---
mail/exim/Makefile | 2 +-
mail/exim/files/patch-src_smtp__in.c | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 mail/exim/files/patch-src_smtp__in.c
(limited to 'mail/exim')
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 47f5b23..1bf96df 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
MASTER_SITE_SUBDIR= exim4/:exim
diff --git a/mail/exim/files/patch-src_smtp__in.c b/mail/exim/files/patch-src_smtp__in.c
new file mode 100644
index 0000000..12c5e05
--- /dev/null
+++ b/mail/exim/files/patch-src_smtp__in.c
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- src/smtp_in.c.orig
++++ src/smtp_in.c
+@@ -1610,6 +1610,8 @@
+ &tzero) > 0)
+ {
+ int rc = read(fileno(smtp_in), smtp_inbuffer, in_buffer_size);
++ if (rc > 0)
++ {
+ if (rc > 150) rc = 150;
+ smtp_inbuffer[rc] = 0;
+ log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: "
+@@ -1618,6 +1620,7 @@
+ string_printing(smtp_inbuffer));
+ smtp_printf("554 SMTP synchronization error\r\n");
+ return FALSE;
++ }
+ }
+ }
+
--
cgit v1.1