diff options
| author | Oliver Eikemeier <eik@FreeBSD.org> | 2004-05-26 10:46:37 +0000 |
|---|---|---|
| committer | Oliver Eikemeier <eik@FreeBSD.org> | 2004-05-26 10:46:37 +0000 |
| commit | c3d4f6d084c878dccb3168fde2af713064b50aa1 (patch) | |
| tree | 4d61d822022268c045bf402290cec21d28cde8f4 /mail/exim | |
| parent | 1bcb7bdcc61177d14400261725be715670dd8c25 (diff) | |
| download | ports-c3d4f6d084c878dccb3168fde2af713064b50aa1.tar.gz ports-c3d4f6d084c878dccb3168fde2af713064b50aa1.zip | |
Notes
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 14 | ||||
| -rw-r--r-- | mail/exim/distinfo | 4 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::EDITME | 2 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::daemon.c | 19 |
4 files changed, 35 insertions, 4 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index ba6a64c34e36..7e3bffb45527 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -25,7 +25,7 @@ MAINTAINER= eik@FreeBSD.org COMMENT?= High performance MTA for Unix systems on the Internet EXIM_VERSION= 4.34 -EXISCAN_VERSION=21 +EXISCAN_VERSION=22 .if !defined(EXIMON_ONLY) .if defined(PKGNAMESUFFIX) @@ -194,6 +194,10 @@ WITH_DEFAULT_CHARSET?= ISO-8859-1 # # Include the unsupported patches in ${PATCHDIR}/wishlist-*.patch #WITH_WISHLIST= yes +# +# Enable Sender Policy Framework (SPF) checking in exiscan-acl +# +#WITH_SPF= yes # You should not need to fiddle with anything below this point. @@ -391,6 +395,14 @@ SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,' SEDLIST+= -e 's,^ALT_CONFIG_PREFIX=,\# ALT_CONFIG_PREFIX=,' .endif +.if defined(WITH_SPF) && !defined(WITHOUT_EXISCAN) +LIB_DEPENDS+= spf_alt.1:${PORTSDIR}/mail/libspf-alt +CFLAGS+= -DSPF +SEDLIST+= -e 's,XX_SPF_LIBS_XX,-lspf_alt,' +.else +SEDLIST+= -e 's,XX_SPF_LIBS_XX,,' +.endif + .include <bsd.port.pre.mk> .if defined(EXIMON_ONLY) && ${MASTERDIR} == ${PKGDIR} diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 8a2004cb6851..20c85915fdaa 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,4 +1,4 @@ MD5 (exim/exim-4.34.tar.bz2) = bab611edc153867334b1c7cffd8fe3c0 SIZE (exim/exim-4.34.tar.bz2) = 1328742 -MD5 (exim/exiscan-acl-4.34-21.patch.bz2) = 2bcb93612e8def81758026bf47c5bb12 -SIZE (exim/exiscan-acl-4.34-21.patch.bz2) = 74294 +MD5 (exim/exiscan-acl-4.34-22.patch.bz2) = 74cf5b787c7344f3b4ef69b8ab54b0db +SIZE (exim/exiscan-acl-4.34-22.patch.bz2) = 76947 diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME index 31792a8495e1..0eec7df6cf76 100644 --- a/mail/exim/files/patch-src::EDITME +++ b/mail/exim/files/patch-src::EDITME @@ -116,7 +116,7 @@ # CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap -# -+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX ++EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_SPF_LIBS_XX + # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. diff --git a/mail/exim/files/patch-src::daemon.c b/mail/exim/files/patch-src::daemon.c new file mode 100644 index 000000000000..ab6f3c0f8e82 --- /dev/null +++ b/mail/exim/files/patch-src::daemon.c @@ -0,0 +1,19 @@ +# +# fix connection drop handling in a data-acl +# <http://www.exim.org/pipermail/exim-users/Week-of-Mon-20040510/071573.html> +# +--- src/daemon.c.orig Fri May 14 19:25:24 2004 ++++ src/daemon.c Fri May 14 19:26:52 2004 +@@ -452,7 +452,11 @@ + { + BOOL ok = receive_msg(FALSE); + search_tidyup(); /* Close cached databases */ +- if (!ok) _exit(EXIT_SUCCESS); /* Connection was dropped */ ++ if (!ok) ++ { ++ mac_smtp_fflush(); ++ _exit(EXIT_SUCCESS); /* Connection was dropped */ ++ } + if (message_id[0] == 0) continue; /* No message was accepted */ + } + else |