git: 1173f1779535 - main - www/apache24: Add option for mod_tls module

The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1173f1779535e9219a3110dbaee6117e3995a905

commit 1173f1779535e9219a3110dbaee6117e3995a905
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-07-06 18:19:41 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-07-06 18:19:41 +0000

    www/apache24: Add option for mod_tls module
    
     * Note: mod_tls is marked Expirimental.
---
 www/apache24/Makefile              | 3 +++
 www/apache24/Makefile.options      | 2 +-
 www/apache24/Makefile.options.desc | 2 ++
 www/apache24/pkg-plist             | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 9d8330696d8a..ef0e70f496d8 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	apache24
 PORTVERSION=	2.4.61
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}
@@ -92,6 +93,8 @@ SOCACHE_DC_LIB_DEPENDS=		libdistcache.so:security/distcache
 #  apu-1-config --(includes|ldflags) and apr_rules.mk
 SSL_CONFIGURE_ON=		--with-ssl=${OPENSSLBASE}
 SSL_USES=			ssl
+TLS_CONFIGURE_ON=		--with-rustls=${LOCALBASE}
+TLS_BUILD_DEPENDS=		${LOCALBASE}/lib/librustls.a:security/rustls-ffi
 SUEXEC_SYSLOG_CONFIGURE_ON=	--without-suexec-logfile --with-suexec-syslog
 XML2ENC_USE=			GNOME=libxml2
 XML2ENC_USES=			gnome
diff --git a/www/apache24/Makefile.options b/www/apache24/Makefile.options
index c0e6a60b8ca2..328507714b47 100644
--- a/www/apache24/Makefile.options
+++ b/www/apache24/Makefile.options
@@ -54,7 +54,7 @@ MOST_ENABLED_MODULES= \
 
 MOST_DISABLED_MODULES= \
 	AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SOCACHE_REDIS SUEXEC \
-	SUEXEC_SYSLOG
+	SUEXEC_SYSLOG TLS
 
 #     enable/disable additional PROXY/SESSION modules
 META_MODULES=	PROXY SESSION
diff --git a/www/apache24/Makefile.options.desc b/www/apache24/Makefile.options.desc
index 353658c36b6b..afd7eda58d88 100644
--- a/www/apache24/Makefile.options.desc
+++ b/www/apache24/Makefile.options.desc
@@ -156,6 +156,8 @@ SUBSTITUTE_DESC=		Response content rewrite-like filtering
 SUEXEC_DESC=			Set uid and gid for spawned processes
 SUEXEC_SYSLOG_DESC=		Enable syslog for suexec
 
+TLS_DESC=			TLS support via memory-safe rustls library (Exprimental)
+
 UNIQUE_ID_DESC=			Per-request unique ids
 UNIXD_DESC=			(required) security for Unix-family platforms
 USERDIR_DESC=			Mapping of requests to user-specific directories
diff --git a/www/apache24/pkg-plist b/www/apache24/pkg-plist
index 43774e51f601..3f6ff3ed9e99 100644
--- a/www/apache24/pkg-plist
+++ b/www/apache24/pkg-plist
@@ -209,6 +209,7 @@ libexec/apache24/mod_log_config.so
 %%STATUS%%libexec/apache24/mod_status.so
 %%SUBSTITUTE%%libexec/apache24/mod_substitute.so
 %%SUEXEC%%libexec/apache24/mod_suexec.so
+%%TLS%%libexec/apache24/mod_tls.so
 %%UNIQUE_ID%%libexec/apache24/mod_unique_id.so
 libexec/apache24/mod_unixd.so
 %%USERDIR%%libexec/apache24/mod_userdir.so