From nobody Sat Jul 06 18:20:21 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WGdwQ1B02z5PLjF; Sat, 06 Jul 2024 18:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGdwP74MPz53Wc; Sat, 6 Jul 2024 18:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720290022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFWKZ5PDkCrU27FwZnhx18jDPdDEHY2uk9ZRxWLQW4s=; b=aG1agSmZJAggCOD6ZuxtSQ/SnosrlaP4Qpkd3SBU/xicOO3uISPMRKoO7BN/qX9gABP4Dp IAL/SM42d1DE19JkL2Vw8hxI0xCZA2p5K9srWh0YjbWCD1l30+YUrYrdpyMfPnp/F4hd/8 LKbbTJzc78m8VroeAe9I2vY5b3vN/y30kcWjNsUYxTyMYSlsyp+sVZ8ez1HR638BzZo0pM zoEqTsNyp9Cy680NtFweCdE3Yz2ETko8tC2gKau9lRzLkg2Gddvaz6yXZmrElZh/7l1br6 GBRxLJLBLBIvXfCGNLRtTyQ3QN47vnuFUCRSnTYYTMlCjoQOqMsVQtmPD5294w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720290022; a=rsa-sha256; cv=none; b=JsU5+KmUWdF2zSAHV2k8vPzb3IRgLf7SWIFRXTmbs4+4bs3F13dBBR76sXbRX6lMoXi5kc 6rHQj3VRzINaBscdMRloivhsGEuZxB+Xu9VOuXWXNDrtISyHtSNLRfmLCYn/mkfY07Wie+ lDiUyJ9U6Ysbcqh2b9o5ylyh7VU/7/Oy47aUGPF2mYLgrOSeR9Xmn0UEAq9TINELZyAZ9f BqFH51xR7BFHMNCN8sLdTAQ+bftLxkaf8bcFv+J13IG6WUhhi4sKubvskYsWRSyqAbMjl4 6239tRjy3V6c59WPf6JK5raOdh3JLR5RZqaScLpU00c8Cxds2BEMucKhaSHvPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720290022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFWKZ5PDkCrU27FwZnhx18jDPdDEHY2uk9ZRxWLQW4s=; b=e9k6Vww0/H6tKIkBjknE+htNfNyPluG+Z6WDXOQ+11gnpS52H14QVdQzHjR4Qn+rQpY9WG ZXWTqt7wyBLYiD52/5cqZRXmFrOn+eAU27vekcEnT55/FmOv4TT3iHt0jUKIhhIbDVDhGr 28ZHPTZVoDCnXEGh0zDFYIw3H9a1YfIP45VReUK6FoRGxOx7FRYnDF/5/MMAvCR0kpp2vB FKHM0TdyCyi4c/t85vztlvNb13mHsnY+a7vnaFa0MooH4Dw/H2BLI2u/647X+Kqg/QivJs J0YEsUguYs7ABLGUfeHxKYD8JNH+aLoBCbgtvCO+7v+Zaw5Tob2KgzmgnfX9jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WGdwP26yczqcS; Sat, 6 Jul 2024 18:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 466IKL9e082161; Sat, 6 Jul 2024 18:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466IKLX4082158; Sat, 6 Jul 2024 18:20:21 GMT (envelope-from git) Date: Sat, 6 Jul 2024 18:20:21 GMT Message-Id: <202407061820.466IKLX4082158@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 1173f1779535 - main - www/apache24: Add option for mod_tls module List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1173f1779535e9219a3110dbaee6117e3995a905 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1173f1779535e9219a3110dbaee6117e3995a905 commit 1173f1779535e9219a3110dbaee6117e3995a905 Author: Bernard Spil AuthorDate: 2024-07-06 18:19:41 +0000 Commit: Bernard Spil 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