Attachment 167095 Details for Bug 205162 – mail/postfix: reroll ohauer's patch

[patch] mail/postfix: reroll ohauer's patch

postfix-dovecot.diff (text/plain), 2.22 KB, created by Nikolai Lifanov on 2016-02-16 20:55:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2016-02-16 20:55:48 UTC

Size: 2.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 409019)
>+++ Makefile	(working copy)
>@@ -45,9 +45,8 @@
> OPTIONS_DEFINE=	BDB CDB DOCS INST_BASE LDAP LDAP_SASL LMDB MYSQL \
> 		NIS PCRE PGSQL SASL SPF SQLITE TEST TLS VDA
> 
>-OPTIONS_RADIO=		RG1 RG2
>-OPTIONS_RADIO_RG1=	DOVECOT DOVECOT2
>-OPTIONS_RADIO_RG2=	SASLKRB5 SASLKMIT
>+OPTIONS_RADIO=		RG1
>+OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
> OPTIONS_DEFAULT=	PCRE TLS
> 
> BDB_USE=		BDB=yes
>@@ -72,10 +71,8 @@
> TEST_DESC=	SMTP/LMTP test server and generator
> VDA_DESC=	VDA (Virtual Delivery Agent)
> 
>-RG1_DESC=	Dovecot SASL authentication methods
>-DOVECOT_DESC=	Dovecot 1.x SASL authentication method
>-DOVECOT2_DESC=	Dovecot 2.x SASL authentication method
>-RG2_DESC=	Kerberos network authentication protocol type
>+SASL_DESC=	Cyrus SASL support (Dovecot SASL is always built in)
>+RG1_DESC=	Kerberos network authentication protocol type
> SASLKRB5_DESC=	If your SASL req. Kerberos5, select this
> SASLKMIT_DESC=	If your SASL req. MIT Kerberos5, select this
> 
>@@ -141,8 +138,12 @@
> 			-Wmissing-prototypes -Wformat -Wno-comment
> 
> # Default requirement for postfix rc script
>-_REQUIRE=		LOGIN cleanvar
>+_REQUIRE=		LOGIN cleanvar dovecot
> 
>+# Always build with Dovecot SASL support, Cyrus is optional
>+# see Postfix HISOTORY 20051222
>+POSTFIX_CCARGS+=       -DUSE_SASL_AUTH
>+
> .if ${PORT_OPTIONS:MPCRE}
> POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
> POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
>@@ -151,19 +152,11 @@
> .endif
> 
> .if ${PORT_OPTIONS:MSASL}
>-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
>+POSTFIX_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
> POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOVECOT} || ${PORT_OPTIONS:MDOVECOT2}
>-.if ${PORT_OPTIONS:MDOVECOT}
>-RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
> .else
>-RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot2
>+POSTFIX_CCARGS+=	-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
> .endif
>-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
>-_REQUIRE+=		dovecot
>-.endif
> 
> .if ${PORT_OPTIONS:MSASLKRB5}
> POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken

Actions: View | Diff

Attachments on bug 205162: 164021 | 164022 | 166408 | 166409 | 166994 | 167095