Attachment #32300 for bug #53432

View | Details | Raw Unified | Return to bug 53432
Collapse All | Expand All

Lines 145-151 Link Here

(-)mail/exim/Makefile (-1 / +16 lines)
145	#	145	#
146	# Disable support for the LMTP (RFC 2033 "SMTP over command pipe")	146	# Disable support for the LMTP (RFC 2033 "SMTP over command pipe")
147	# transport.	147	# transport.
148	#WITHOUT_LMTP	148	#WITHOUT_LMTP= yes
		149	#
		150	# Include the unsupported patches in ${PATCHDIR}/wishlist-*.patch
		151	#WITH_WISHLIST= yes
149		152
150	# You should not need to fiddle with anything below this point.	153	# You should not need to fiddle with anything below this point.
151		154
Lines 153-158 Link Here
153	RUN_DEPENDS= ${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor	156	RUN_DEPENDS= ${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor
154	.endif	157	.endif
155		158
		159	.if defined(WITH_WISHLIST)
		160	EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'`
		161	.endif
		162
156	.include <bsd.port.pre.mk>	163	.include <bsd.port.pre.mk>
157		164
158	PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \	165	PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \
Lines 336-341 Link Here
336		343
337	.if !defined(WITHOUT_LMTP)	344	.if !defined(WITHOUT_LMTP)
338	SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,'	345	SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,'
		346	.endif
		347
		348	pre-everything::
		349	.if empty(.MAKEFLAGS:M-s) && defined(WITH_WISHLIST)
		350	@${ECHO} ''
		351	@${ECHO} 'Included extra patches:'
		352	@${FIND} ${PATCHDIR} -name 'wishlist-*.patch' -exec ${SED} -ne 's,^# , ,p' {} \;
		353	@${ECHO} ''
339	.endif	354	.endif
340		355
341	post-patch:	356	post-patch:




#
# (Exim 4 wish list #163) suppress the "Received:" header if received_header_text is empty
#
--- src/receive.c.orig	Mon May 12 15:39:21 2003
+++ src/receive.c	Fri Jun 13 03:17:26 2003
@@ -1915,9 +1915,17 @@
 /* The first element on the header chain is reserved for the Received
 header, so all we have to do is fill in the text pointer. */
 
-header_list->text = string_sprintf("%s; %s\n", received, timestamp);
+if (received[0] == 0)
+  {
+  header_list->text = string_sprintf("Received: ; %s\n", timestamp);
+  header_list->type = htype_old;
+  }
+else
+  {
+  header_list->text = string_sprintf("%s; %s\n", received, timestamp);
+  header_list->type = htype_received;
+  }
 header_list->slen = Ustrlen(header_list->text);
-header_list->type = htype_received;
 
 
 /* If there is no From: header, generate one. If there is no sender address,

Return to bug 53432

Line 0 Link Here

(-)mail/exim/files/wishlist-suppress-received.patch (+25 lines)
	1	#
	2	# (Exim 4 wish list #163) suppress the "Received:" header if received_header_text is empty
	3	#
	4	--- src/receive.c.orig Mon May 12 15:39:21 2003
	5	+++ src/receive.c Fri Jun 13 03:17:26 2003
	6	@@ -1915,9 +1915,17 @@
	7	/* The first element on the header chain is reserved for the Received
	8	header, so all we have to do is fill in the text pointer. */
	9
	10	-header_list->text = string_sprintf("%s; %s\n", received, timestamp);
	11	+if (received[0] == 0)
	12	+ {
	13	+ header_list->text = string_sprintf("Received: ; %s\n", timestamp);
	14	+ header_list->type = htype_old;
	15	+ }
	16	+else
	17	+ {
	18	+ header_list->text = string_sprintf("%s; %s\n", received, timestamp);
	19	+ header_list->type = htype_received;
	20	+ }
	21	header_list->slen = Ustrlen(header_list->text);
	22	-header_list->type = htype_received;
	23
	24
	25	/* If there is no From: header, generate one. If there is no sender address,