On 2023/11/14 16:30, Tiemen Werkman wrote:
> This patch updates Dovecot to version 2.3.21 and adds gssapi
> authentication support.
pigeonhole will need a matching update too.
> GSSAPI is added as a flavor. I've been running dovecot with this patch
> for over two years now and it works very nicely.
>
> I've also removed the --without-vpopmail configure option as it is no
> longer a valid option.
did they remove anything else in this update?
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/Makefile,v
> retrieving revision 1.432
> diff -u -p -r1.432 Makefile
> --- Makefile 4 Sep 2023 13:27:54 -0000 1.432
> +++ Makefile 14 Nov 2023 14:11:10 -0000
> @@ -30,6 +30,7 @@
> SUBDIR += dkimproxy
> SUBDIR += dma
> SUBDIR += dovecot
> + SUBDIR += dovecot,gssapi
> SUBDIR += dovecot-fts-flatcurve
> SUBDIR += dovecot-fts-xapian
> SUBDIR += dovecot-pigeonhole
> Index: dovecot/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/dovecot/Makefile,v
> retrieving revision 1.316
> diff -u -p -r1.316 Makefile
> --- dovecot/Makefile 26 Sep 2023 12:28:11 -0000 1.316
> +++ dovecot/Makefile 14 Nov 2023 14:11:10 -0000
> @@ -9,7 +9,7 @@ COMMENT-postgresql= PostgreSQL authentic
> # (dovecot-fts-xapian, dovecot-fts-flatcurve, dovecot-pigeonhole if
> # not updated anyway)
> V_MAJOR= 2.3
> -V_DOVECOT= 2.3.20
> +V_DOVECOT= 2.3.21
> EPOCH= 0
>
> DISTNAME= dovecot-${V_DOVECOT}
> @@ -42,10 +42,16 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB-server= bz2 c crypto expat exttextcat-2.0 iconv icudata icui18n
> \
> icuuc lz4 lzma m pthread sodium sqlite3 ssl stemmer z zstd
> -WANTLIB-ldap= crypto iconv lber ldap sasl2 ssl lib/dovecot/dovecot
> +WANTLIB-ldap= pthread crypto iconv lber ldap sasl2 ssl
> lib/dovecot/dovecot
> WANTLIB-mysql= crypto m mariadb pthread ssl z
> WANTLIB-postgresql= crypto m pq 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
extra + here (not sure whether it's in your file or whether the diff is
slightly mangled?)
have you confirmed that the subpackages don't change depending on the
gssapi build option? (nm -s is probably a good way to check).
> +
> LIB_DEPENDS+= archivers/bzip2 \
> archivers/lz4 \
> archivers/xz \
> @@ -71,15 +77,23 @@ CONFIGURE_ARGS= --with-rundir=/var/dovec
> --without-nss \
> --without-pam \
> --without-shadow \
> - --with-solr \
> - --without-vpopmail
> + --with-solr
> 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+= ${MODHEIMDAL_LIB_DEPENDS}
> +WANTLIB-server+= ${MODHEIMDAL_WANTLIB} heimdal/lib/gssapi
> +WANTLIB-server+= heimdal/lib/heimntlm heimdal/lib/heimsqlite
> .endif
>
> MULTI_PACKAGES= -server -ldap -mysql -postgresql
> Index: dovecot/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/dovecot/distinfo,v
> retrieving revision 1.163
> diff -u -p -r1.163 distinfo
> --- dovecot/distinfo 30 Dec 2022 00:14:37 -0000 1.163
> +++ dovecot/distinfo 14 Nov 2023 14:11:10 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (dovecot-2.3.20.tar.gz) = yqgy65aBSKvfNe6dD1NLd5+nMsDOSpE9mrjDRpshhVI=
> -SIZE (dovecot-2.3.20.tar.gz) = 7805735
> +SHA256 (dovecot-2.3.21.tar.gz) = BbEQk6ccI3wu8wmtWHUQchzJO77mgoJRVJ/BWGw2UC0=
> +SIZE (dovecot-2.3.21.tar.gz) = 7837242
> 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 14 Nov 2023 14:11:10 -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.
> +
> +Flavor:
> + gssapi support for GSSAPI authentication in Dovecot
> Index: dovecot/pkg/PLIST-server
> ===================================================================
> RCS file: /cvs/ports/mail/dovecot/pkg/PLIST-server,v
> retrieving revision 1.88
> diff -u -p -r1.88 PLIST-server
> --- dovecot/pkg/PLIST-server 8 Nov 2022 11:14:49 -0000 1.88
> +++ dovecot/pkg/PLIST-server 14 Nov 2023 14:11:10 -0000
> @@ -469,6 +469,7 @@ include/dovecot/ostream-dot.h
> include/dovecot/ostream-encrypt.h
> include/dovecot/ostream-failure-at.h
> include/dovecot/ostream-file-private.h
> +include/dovecot/ostream-final-trickle.h
> include/dovecot/ostream-hash.h
> include/dovecot/ostream-metawrap.h
> include/dovecot/ostream-multiplex.h
>
