mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00
Code Issues Releases Activity

Instrument a facility for including wishlist patches if WITH_WISHLIST

Browse Source 
is defined.

Kick off with Exim 4 wish list item #163, which allows suppression of
the Received header if received_header_text is empty.

PR:		ports/53432
Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>
This commit is contained in:
Sheldon Hearn 2003-06-18 03:26:24 +00:00
parent c3693747c6
commit 9e94087155
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=83221
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mail/exim/Makefile
View File

@ -145,7 +145,10 @@ DB_LIB_VERSION?=1
#
# Disable support for the LMTP (RFC 2033 "SMTP over command pipe")
# transport.
#WITHOUT_LMTP
#WITHOUT_LMTP= yes
#
# Include the unsupported patches in ${PATCHDIR}/wishlist-*.patch
#WITH_WISHLIST= yes
# You should not need to fiddle with anything below this point.
@ -153,6 +156,10 @@ DB_LIB_VERSION?=1
RUN_DEPENDS= ${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor
.endif
.if defined(WITH_WISHLIST)
EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'`
.endif
.include <bsd.port.pre.mk>
PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \
@ -338,6 +345,15 @@ SEDLIST+= -e 's,^\# LOOKUP_NIS=,LOOKUP_NIS=,'
SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,'
.endif
pre-everything::
.if empty(.MAKEFLAGS:M-s) && defined(WITH_WISHLIST)
@${ECHO} ''
@${ECHO} 'Included extra patches:'
@${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \
-exec ${SED} -ne 's,^# , ,p' {} \;
@${ECHO} ''
.endif
post-patch:
.if defined(WITH_EXISCAN_ACL)
${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2 \

26
mail/exim/files/wishlist-suppress-received.patch Normal file
View File

@ -0,0 +1,26 @@
#
# (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,