Page MenuHomeFreeBSD
Files F157930545

D56843.diff
No OneTemporary
Actions

D56843.diff
View Options

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,5 +1,6 @@
PORTNAME= apache24
PORTVERSION= 2.4.67
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
@@ -65,6 +66,7 @@
AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap
BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE}
BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli
+GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} \
--with-ssl=${OPENSSLBASE}
HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
@@ -92,7 +94,6 @@
# apu-1-config --(includes|ldflags) and apr_rules.mk
SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
SSL_USES= ssl
-TLS_BROKEN= Module removed upstream, replaced by security/mod_tls
SUEXEC_SYSLOG_CONFIGURE_ON= --without-suexec-logfile --with-suexec-syslog
XML2ENC_USE= GNOME=libxml2
XML2ENC_USES= gnome
@@ -143,11 +144,12 @@
. endif
. if ${PORT_OPTIONS:MSESSION_CRYPTO} && \
!(exists(${APU_CRYPTO_OPENSSL}) || exists(${APU_CRYPTO_NSS}))
-IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support built in.\
- Please rebuild APR with crypto openssl support
+IGNORE= SESSION_CRYPTO requires apr-util to have OpenSSL or NSS support built in.\
+ Please rebuild APR with OpenSSL or NSS support
. endif
-. if exists(${APU_GDBM})
- LIB_DEPENDS+=libgdbm.so:databases/gdbm
+. if ${PORT_OPTIONS:MGDBM} && !exists(${APU_GDBM})
+IGNORE= GDBM requires apr-util to have gdbm support built in.\
+ Please rebuild APR with gdbm support
. endif
.endif # exists APU_CONFIG
diff --git a/www/apache24/Makefile.options b/www/apache24/Makefile.options
--- a/www/apache24/Makefile.options
+++ b/www/apache24/Makefile.options
@@ -54,7 +54,7 @@
MOST_DISABLED_MODULES= \
AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SOCACHE_REDIS SUEXEC \
- SUEXEC_SYSLOG TLS
+ SUEXEC_SYSLOG
# enable/disable additional PROXY/SESSION modules
META_MODULES= PROXY SESSION
@@ -85,6 +85,7 @@
OPTIONS_DEFINE= \
DOCS \
+ GDBM \
${MOST_ENABLED_MODULES} \
${MOST_DISABLED_MODULES}\
${ADDITIONAL_OPT} \
@@ -95,5 +96,6 @@
${OPTIONS_MULTI} \
${SESSION_ENABLED_MODULES} \
${PROXY_ENABLED_MODULES} \
+ GDBM \
MPM_SHARED \
MPM_PREFORK
diff --git a/www/apache24/Makefile.options.desc b/www/apache24/Makefile.options.desc
--- a/www/apache24/Makefile.options.desc
+++ b/www/apache24/Makefile.options.desc
@@ -156,8 +156,6 @@
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 (Experimental)
-
UNIQUE_ID_DESC= Per-request unique ids
UNIXD_DESC= (required) security for Unix-family platforms
USERDIR_DESC= Mapping of requests to user-specific directories

File Metadata

Mime Type
text/plain
Expires
Wed, May 27, 2:20 PM (2 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33559768
Default Alt Text
D56843.diff (2 KB)

Event Timeline