Attachment 143343 Details for Bug 190590 – patch fixes build with SPF and adds DMARC option

[patch] patch fixes build with SPF and adds DMARC option

exim.patch (text/plain), 1.67 KB, created by tacid on 2014-06-03 20:54:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tacid

Created: 2014-06-03 20:54:50 UTC

Size: 1.67 KB

patch

obsolete

>diff -ruN mail/exim.old/Makefile mail/exim/Makefile
>--- mail/exim.old/Makefile	2014-06-01 02:33:50.000000000 +0300
>+++ mail/exim/Makefile	2014-06-03 23:43:03.462272918 +0300
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	exim
> PORTVERSION?=	${EXIM_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
> MASTER_SITE_SUBDIR=	exim4/:exim
>@@ -425,10 +426,19 @@
> SEDLIST+=	-e 's,^(ALT_CONFIG_PREFIX=),\# \1,'
> .endif
> 
>+.if ${PORT_OPTIONS:MDMARC}
>+.if !make(config) && ( empty(PORT_OPTIONS:MSPF) || empty(PORT_OPTIONS:MDKIM) )
>+.error DMARC requires DKIM and SPF to be also set
>+.endif
>+LIB_DEPENDS+=	opendmarc.1:${PORTSDIR}/mail/opendmarc
>+LDFLAGS+= 	-lopendmarc
>+SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DMARC=),\1,'
>+.endif
>+
> .if ${PORT_OPTIONS:MSPF}
> LIB_DEPENDS+=	spf2.3:${PORTSDIR}/mail/libspf2
> SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,-DSPF,' \
>-		-e 's,XX_SPF_LIBS_XX,-lspf2 ${PTHREAD_LIBS:S/,/\\,/g},' \
>+		-e 's,XX_SPF_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lspf2 ${PTHREAD_LIBS:S/,/\\,/g},' \
> 		-e 's,^\# (EXPERIMENTAL_SPF=),\1,'
> .else
> SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,,' \
>diff -ruN mail/exim.old/options mail/exim/options
>--- mail/exim.old/options	2014-01-24 02:14:07.000000000 +0200
>+++ mail/exim/options	2014-06-03 21:10:46.000000000 +0300
>@@ -37,6 +37,7 @@
> 			SA_EXIM \
> 			SO_1024 \
> 			SPF \
>+			DMARC \
> 			SQLITE \
> 			SRS \
> 			SRS_ALT \
>@@ -109,6 +110,7 @@
> SA_EXIM_DESC=		SA-Exim support
> SO_1024_DESC=		Build with Spamooborona-1024 local scan
> SPF_DESC=		Enable Sender Policy Framework checking
>+DMARC_DESC=		Enable support for DMARC (req. DKIM and SPF)
> SQLITE_DESC=		Enable SQLite lookups
> SRS_DESC=		Enable Sender Rewriting Scheme
> SRS_ALT_DESC=		Enable alternative SRS library

Actions: View | Diff

Attachments on bug 190590: 143343