dovecot24: SSL is not optional and has to be OpenSSL.

[Olaf Seibert (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Feb 3 19:21:31 2026 +0100
Changeset:	6e0c9d875511f98edf5fee72117bdb0f202ee008

Modified Files:
	dovecot24/Makefile.common
	dovecot24/TODO
	dovecot24/options.mk

Log Message:
dovecot24: SSL is not optional and has to be OpenSSL.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6e0c9d875511f98edf5fee72117bdb0f202ee008

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dovecot24/Makefile.common |  4 ++++
 dovecot24/TODO            |  8 ++++----
 dovecot24/options.mk      | 17 +++--------------
 3 files changed, 11 insertions(+), 18 deletions(-)

diffs:
diff --git a/dovecot24/Makefile.common b/dovecot24/Makefile.common
index da779560d9..b25a1e6521 100644
--- a/dovecot24/Makefile.common
+++ b/dovecot24/Makefile.common
@@ -46,6 +46,9 @@ CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}
 CONFIGURE_ARGS+=	--without-gssapi
 CONFIGURE_ARGS+=	--without-ldap
 
+CONFIGURE_ENV+=		SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
+CONFIGURE_ENV+=		SSL_LIBS="-lssl -lcrypto"
+
 # Leave pkgsrc to enable compiler security features as appropriate.
 CONFIGURE_ARGS+=	--disable-hardening
 
@@ -71,3 +74,4 @@ CFLAGS.SunOS+=   -D__EXTENSIONS__
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
diff --git a/dovecot24/TODO b/dovecot24/TODO
index 494f5f0f11..b295740567 100644
--- a/dovecot24/TODO
+++ b/dovecot24/TODO
@@ -1,5 +1,5 @@
-=> Checking for non-existent script interpreters in dovecot-2.4.2
-ERROR: [check-interpreter.mk] The interpreter "/usr/bin/env" of "/tmp/pkgsrc/wip/dovecot24/default/.destdir/usr/pkg/libexec/dovecot/settings-history.py" is not allowed.
-*** Error code 1
-
 --with-ssl seems to be an non-existing option for configure.
+It looks like dovecot-2.4.2/m4/ssl.m4 says ssl is not optional, and it has to
+be OpenSSL.
+
+--with-libwrap seems to be an non-existing option for configure.
diff --git a/dovecot24/options.mk b/dovecot24/options.mk
index 07351137f3..92a775ff3d 100644
--- a/dovecot24/options.mk
+++ b/dovecot24/options.mk
@@ -1,27 +1,16 @@
 # $NetBSD: options.mk,v 1.14 2021/11/09 12:04:43 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot24
-PKG_SUPPORTED_OPTIONS=	kqueue pam ssl tcpwrappers
-PKG_SUGGESTED_OPTIONS=	pam ssl tcpwrappers
+PKG_SUPPORTED_OPTIONS=	kqueue pam tcpwrappers
+PKG_SUGGESTED_OPTIONS=	pam tcpwrappers
 
 .if defined(OPSYS_HAS_KQUEUE)
 PKG_SUGGESTED_OPTIONS+=	kqueue
 .endif
-PLIST_VARS+=		ssl tcpwrappers
+PLIST_VARS+=		tcpwrappers
 
 .include "../../mk/bsd.options.mk"
 
-###
-### Build with OpenSSL as the underlying crypto library
-###
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=	--with-ssl=openssl
-CONFIGURE_ENV+=		SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
-CONFIGURE_ENV+=		SSL_LIBS="-lssl -lcrypto"
-.  include "../../security/openssl/buildlink3.mk"
-PLIST.ssl=		yes
-.endif
-
 ###
 ### PAM support
 ###