On 2016/11/29 11:53, William Leuschner wrote:
> Hello Brad,
>
> I've written a patch for Dovecot that adds GSSAPI as a flavor. Could you
> take a look at it?
Your diff doesn't register the library dependencies properly. This one
is more complete but I have no way to test nor opinion on whether it
should be committed or not.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/Makefile,v
retrieving revision 1.351
diff -u -p -r1.351 Makefile
--- Makefile 2 Nov 2016 19:30:58 -0000 1.351
+++ Makefile 30 Nov 2016 12:15:02 -0000
@@ -33,6 +33,7 @@
SUBDIR += dkim-milter
SUBDIR += dkimproxy
SUBDIR += dovecot
+ SUBDIR += dovecot,gssapi
SUBDIR += dovecot-antispam
SUBDIR += dovecot-pigeonhole
SUBDIR += dspam
Index: dovecot/Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.247
diff -u -p -r1.247 Makefile
--- dovecot/Makefile 12 Nov 2016 15:37:32 -0000 1.247
+++ dovecot/Makefile 30 Nov 2016 12:15:02 -0000
@@ -7,9 +7,7 @@ COMMENT-postgresql= PostgreSQL authentic
V_MAJOR= 2.2
V_DOVECOT= 2.2.26.0
-REVISION= 0
-REVISION-server= 1
-REVISION-ldap= 1
+REVISION= 2
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
@@ -43,6 +41,12 @@ WANTLIB-ldap= crypto lber-2.4 ldap-2.4 s
WANTLIB-mysql= crypto m lib/mysql/mysqlclient pthread ssl stdc++ z
WANTLIB-postgresql= crypto pq>=4 ssl
+.for i in ${MULTI_PACKAGES:N-main}
+# subpackages aren't flavoured, so overwrite the default name/path
+FULLPKGNAME$i ?= dovecot$i-${V_DOVECOT}
+FULLPKGPATH$i ?= ${PKGPATH},$i
+.endfor
+
LIB_DEPENDS+= archivers/bzip2 \
archivers/lz4 \
archivers/xz \
@@ -70,10 +74,19 @@ CONFIGURE_ARGS= --with-rundir=/var/dovec
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+FLAVORS= gssapi
PSEUDO_FLAVORS= no_db no_ldap no_mysql no_postgresql
FLAVOR?=
.if ${FLAVOR:Mno_db}
FLAVOR+= no_ldap no_mysql no_postgresql
+.endif
+
+.if ${FLAVOR:Mgssapi}
+CONFIGURE_ARGS+= --with-gssapi=yes
+MODULES+= security/heimdal
+LIB_DEPENDS-server= ${MODHEIMDAL_LIB_DEPENDS}
+WANTLIB-server+= ${MODHEIMDAL_WANTLIB} com_err heimdal/lib/gssapi
+WANTLIB-server+= heimdal/lib/heimntlm heimdal/lib/heimsqlite
.endif
MULTI_PACKAGES= -server -ldap -mysql -postgresql
Index: dovecot/pkg/DESCR-server
===================================================================
RCS file: /cvs/ports/mail/dovecot/pkg/DESCR-server,v
retrieving revision 1.6
diff -u -p -r1.6 DESCR-server
--- dovecot/pkg/DESCR-server 28 May 2011 19:40:41 -0000 1.6
+++ dovecot/pkg/DESCR-server 30 Nov 2016 12:15:02 -0000
@@ -4,3 +4,6 @@ several coding techniques to avoid most
can work with standard mbox and maildir formats and it's fully compatible
with UW-IMAP and Courier IMAP servers as well as mail clients accessing
the mailboxes directly.
+
+Flavors:
+ gssapi: support for GSSAPI authentication in Dovecot
