aboutsummaryrefslogtreecommitdiff
path: root/www/apache24
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache24')
-rw-r--r--www/apache24/Makefile144
-rw-r--r--www/apache24/Makefile.modules90
-rw-r--r--www/apache24/Makefile.options37
-rw-r--r--www/apache24/Makefile.options.desc16
-rw-r--r--www/apache24/distinfo6
-rw-r--r--www/apache24/files/patch-configure.in18
-rw-r--r--www/apache24/files/patch-modules_md_md__crypt.c11
-rw-r--r--www/apache24/files/patch-modules_ssl_ssl__private.h11
-rw-r--r--www/apache24/pkg-plist248
9 files changed, 263 insertions, 318 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 9e6b6b97f8d4..7d136be5974a 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= apache24
-PORTVERSION= 2.4.29
-PORTREVISION= 2
+PORTVERSION= 2.4.33
CATEGORIES= www ipv6
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
@@ -18,8 +17,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libapr-1.so:devel/apr1 \
libpcre.so:devel/pcre
-CONFLICTS_INSTALL= caudium14-1.* \
- apache-*-2.2.* apache22-*
+CONFLICTS_INSTALL= apache22-*
USES= apache:server,2.4 autoreconf cpe iconv libtool perl5 tar:bzip2
USE_PERL5= run
@@ -42,22 +40,12 @@ SUB_LIST+= MPMF="000_mpm_prefork_fallback.conf"
USERS= www
GROUPS= www
-# for slave ports
-.if !defined(MASTERDIR)
-APACHEDIR= ${.CURDIR}
-.else
-APACHEDIR= ${MASTERDIR}
-.endif
-
WITH_HTTP_PORT?= 80
WITH_SSL_PORT?= 443
-.if !defined(WITH_DEBUG)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c
-.endif
-
-.include "${APACHEDIR}/Makefile.options"
-.include "${APACHEDIR}/Makefile.options.desc"
+.include "${.CURDIR}/Makefile.options"
+.include "${.CURDIR}/Makefile.options.desc"
+OPTIONS_SUB= yes
# IMPLIES
AUTHN_DBD_IMPLIES= DBD
@@ -65,55 +53,64 @@ HEARTBEAT_IMPLIES= WATCHDOG STATUS
HEARTMONITOR_IMPLIES= WATCHDOG STATUS
LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR
PROXY_HCHECK_IMPLIES= WATCHDOG
+PROXY_HTTP2_IMPLIES= PROXY_BALANCER
+.for module in ${PROXY_ENABLED_MODULES:NPROXY} ${PROXY_DISABLED_MODULES}
+${module}_IMPLIES= PROXY
+.endfor
+.for module in ${SESSION_ENABLED_MODULES:NSESSION} ${SESSION_DISABLED_MODULES}
+${module}_IMPLIES= SESSION
+.endfor
-# MPM
+# Multi-Processing Modules options handling
MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork
MPM_WORKER_CONFIGURE_ON= --with-mpm=worker
MPM_EVENT_CONFIGURE_ON= --with-mpm=event
+MPM_SHARED_CONFIGURE_ON= --enable-mpms-shared=all
+MPM_SHARED_SUB_LIST= MPM_FALLBACK_CHECK=""
+MPM_SHARED_SUB_LIST_OFF= MPM_FALLBACK_CHECK="\#"
AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap
-
-# http://httpd.apache.org/docs/2.4/bind.html
-IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped
-
-LDAP_CONFIGURE_ON= --enable-ldap=shared
-
-BROTLI_CONFIGURE_ON= --with-brotli=${LOCALBASE}
+BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE}
BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli
HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}
HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
+IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped
+LDAP_CONFIGURE_ON= --enable-ldap=shared
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
-LUA_CONFIGURE_WITH= lua
+LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \
+ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
+LUA_CONFIGURE_WITH= lua=${LOCALBASE}
LUA_USES= lua
+MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \
+ --with-jansson=${LOCALBASE} \
+ --with-openssl=${OPENSSLBASE}
+MD_LIB_DEPENDS= libcurl.so:ftp/curl \
+ libjansson.so:devel/jansson
+MD_USES= ssl
+PROXY_HTML_USE= GNOME=libxml2
PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}
PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}
SOCACHE_DC_LIB_DEPENDS= libdistcache.so:security/distcache
+XML2ENC_USE= GNOME=libxml2
-# Note:
-# OpenSSL version (base/ports) depends how devel/apr1 was build
+# Note: OpenSSL version (base/ports) depends how devel/apr1 was built
# apu-1-config --(includes|ldflags) and apr_rules.mk
SSL_CFLAGS= -I${OPENSSLINC}
SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
SSL_LDFLAGS= -L${OPENSSLLIB}
SSL_USES= ssl
-.include <bsd.port.options.mk>
ETC_SUBDIRS= Includes envvars.d extra modules.d
APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config
-
-# APU modules used by AUTHN_DBD DBD
-APU_DBD_MYSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_mysql.so
-APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so
-APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so
-# APU module used by AUTHNZ_LDAP LDAP
APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so
-# APU module used by SESSION_CRYPTO
APU_CRYPTO_OPENSSL?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_openssl.so
APU_CRYPTO_NSS?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_nss.so
+.include <bsd.port.pre.mk>
+
PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \
@@ -121,45 +118,88 @@ CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \
--with-port=${WITH_HTTP_PORT} \
--with-sslport=${WITH_SSL_PORT} \
--with-expat=${LOCALBASE} \
- --with-iconv=${ICONV_PREFIX} \
--enable-http \
--with-pcre=${LOCALBASE} \
--with-apr=${APR_CONFIG} \
--with-apr-util=${APU_CONFIG}
-CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \
+CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" \
CONFIG_SHELL="${SH}"
MAKE_ENV+= EXPR_COMPAT=yes \
INSTALL_MAN="${INSTALL_MAN}" \
DATADIR=${DATADIR}
+.for module in ${ALL_MODULES}
+.if ${PORT_OPTIONS:M${module}}
+CONFIGURE_ARGS+= --enable-${module:S/_/-/g:tl}
+.else
+CONFIGURE_ARGS+= --disable-${module:S/_/-/g:tl}
+.endif
+.endfor
+
#=====================================================
-# CONFIGURE_ARGS will be handled in Makefile.modules,
# here we do only OPTIONS fixups
-.if ${PORT_OPTIONS:MLUA}
-CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" \
- LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
+# Check for APR-util module exists
+.if exists(${APU_CONFIG})
+. if (${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP}) && !exists(${APU_LDAP})
+IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\
+ Please rebuild APR with LDAP support
+. 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 build in.\
+ Please rebuild APR with crypto openssl support
+. endif
+.endif # exists APU_CONFIG
+
+.if ( ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} ) && \
+ empty(PORT_OPTIONS:MAUTHN*)
+IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider
.endif
-.if ${PORT_OPTIONS:MPROXY_HTML} || ${PORT_OPTIONS:MXML2ENC}
-USE_GNOME= libxml2
+.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
+IGNORE= AUTH_BASIC need at least one AUTHZ provider
.endif
-.include <bsd.port.pre.mk>
-.include "${APACHEDIR}/Makefile.modules"
+# Non options-NG option handling
+.if ${PORT_OPTIONS:MXML2ENC} || ${PORT_OPTIONS:MPROXY_HTML}
+CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE}/include/libxml2
+.else
+CONFIGURE_ARGS+= --without-libxml2
+.endif
+
+# WITH_STATIC_SUPPORT, WITH_DEBUG, WITH_EXCEPTION_HOOK
+# Only to be used for special builds
+.if defined(WITH_STATIC_SUPPORT)
+CONFIGURE_ARGS+= --enable-static-support
+.endif
+.if defined(WITH_DEBUG)
+# debug overrides CFLAGS
+DEBUG_FLAGS?= -O0 -g -ggdb3
+CFLAGS= ${DEBUG_FLAGS}
+CONFIGURE_ARGS+= --enable-maintainer-mode
+WITH_EXCEPTION_HOOK= yes
+.else
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c
+.endif
+.if defined(WITH_EXCEPTION_HOOK)
+CONFIGURE_ARGS+= --enable-exception-hook
+.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 &&\
${PORT_OPTIONS:MHTTP2} && ${OPENSSLBASE} == /usr
-SUB_FILES+= pkg-message
+SUB_FILES+= pkg-message
.endif
+pre-extract-SUEXEC-on:
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "suexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default,"
+ @${ECHO_CMD} "use SUEXEC_DOCROOT and SUEXEC_USERDIR in /etc/make.conf to adjust."
+ @${ECHO_CMD} ""
+
post-extract:
-# remove possible leftover .svn directories in the sources
- @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r
-# limit grep results ...
- @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' -o -name '*.vbs' -o -name '*.wsf' \) -delete
# make sure the configure script contains our patches, preserve the original script for comparsion
-${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream
@@ -183,7 +223,7 @@ pre-configure::
@${ECHO_MSG} " You can check your modules configuration by using make show-modules"
@${ECHO_MSG} ""
# silence autotools
- -${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac
+ -@${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac 2>/dev/null
post-configure:
@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
diff --git a/www/apache24/Makefile.modules b/www/apache24/Makefile.modules
deleted file mode 100644
index 2e8ca8dd2151..000000000000
--- a/www/apache24/Makefile.modules
+++ /dev/null
@@ -1,90 +0,0 @@
-# $FreeBSD$
-#
-# =============================================
-# Maintainer note for OPTION handling:
-# To set additional option use
-# PORT_OPTIONS+=
-# To set / unset an OPTION, even the OPTION is set / unset in OPTIONS_FILE use
-# WITH="MODULE1 MODULE2 ..." or WITHOUT="MODULE1 MODULE2 ..."
-
-.if defined(_PREMKINCLUDED)
-
-# check if APR-util module exists
-.if exists(${APU_CONFIG})
-. if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP}
-. if !exists(${APU_LDAP})
-IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\
- Please rebuild APR with LDAP support
-. endif
-. endif
-
-. if ${PORT_OPTIONS:MSESSION_CRYPTO}
-. if !exists(${APU_CRYPTO_OPENSSL}) && !exists(${APU_CRYPTO_NSS})
-IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support build in.\
- Please rebuild APR with crypto openssl support
-. endif
-. endif
-
-.endif # exists APU_CONFIG
-
-# =============================================
-.if ${PORT_OPTIONS:MMPM_SHARED}
-SUB_LIST+= MPM_FALLBACK_CHECK=""
-PLIST_SUB+= MPM_SHARED=""
-CONFIGURE_ARGS+= --enable-mpms-shared=all
-.else
-SUB_LIST+= MPM_FALLBACK_CHECK="\#"
-PLIST_SUB+= MPM_SHARED="@comment "
-.endif
-
-# =============================================
-# build develop/example modules only with additional confirmation
-.for DEVMOD in ${EXAMPLE_MODULES}
-. if ${PORT_OPTIONS:M${DEVMOD}}
-WITH_DEVMODS= yes
-. endif
-.endfor
-
-.if defined(WITH_DEVMODS) && !defined(IAMADEVELOPER )
-IGNORE= to build the develop/example modules specify -DIAMADEVELOPER on the command line.\
- Do not use the this modules in production environment
-.endif
-
-# The next three params are not converted to an option,
-# they should be used only for special builds.
-.if defined(WITH_STATIC_SUPPORT)
-CONFIGURE_ARGS+= --enable-static-support
-.endif
-
-# debug overrides CFLAGS
-.if defined(WITH_DEBUG)
-DEBUG_FLAGS?= -O0 -g -ggdb3
-CFLAGS= ${DEBUG_FLAGS}
-CONFIGURE_ARGS+= --enable-maintainer-mode
-WITH_EXCEPTION_HOOK= yes
-.endif
-
-.if defined(WITH_EXCEPTION_HOOK)
-CONFIGURE_ARGS+= --enable-exception-hook
-.endif
-
-.if ( ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} ) && \
- empty(PORT_OPTIONS:MAUTHN*)
-IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider
-.endif
-
-.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
-IGNORE= AUTH_BASIC need at least one AUTHZ provider
-.endif
-
-.if ${PORT_OPTIONS:MXML2ENC} || ${PORT_OPTIONS:MPROXY_HTML}
-CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE}/include/libxml2
-.else
-CONFIGURE_ARGS+= --without-libxml2
-.endif
-
-.if ${PORT_OPTIONS:MPROXY_HTTP2} && !${PORT_OPTIONS:MPROXY_BALANCER}
-IGNORE= PROXY_HTTP2 requires PROXY_BALANCER
-.endif
-
-.endif # _PREMKINCLUDED
diff --git a/www/apache24/Makefile.options b/www/apache24/Makefile.options
index 2bf0235ee615..4980ae71e634 100644
--- a/www/apache24/Makefile.options
+++ b/www/apache24/Makefile.options
@@ -11,8 +11,9 @@
# mod_proxy_html and xml2enc depending on libxml2
PROXY_ENABLED_MODULES= \
- PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI PROXY_HTTP2 \
- PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL
+ PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
+ PROXY_HTTP2 PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP \
+ PROXY_SCGI PROXY_UWSGI PROXY_WSTUNNEL
PROXY_DISABLED_MODULES=
@@ -53,45 +54,43 @@ MOST_ENABLED_MODULES= \
VERSION VHOST_ALIAS \
WATCHDOG XML2ENC
-MOST_DISABLED_MODULES:= \
- AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SUEXEC
+MOST_DISABLED_MODULES= \
+ AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SUEXEC
# enable/disable additional PROXY/SESSION modules
META_MODULES= PROXY SESSION
-ALL_MODULES_CATEGORIES= \
- MOST_ENABLED MOST_DISABLED MULTI \
- PROXY_ENABLED PROXY_DISABLED \
- SESSION_ENABLED SESSION_DISABLED \
- META EXAMPLE
-
ADDITIONAL_OPT= LUAJIT IPV4_MAPPED
# ===================================================================================
-#NO_OPTIONS_SORT= yes
-OPTIONS_MULTI:= ${META_MODULES}
-OPTIONS_MULTI_PROXY:= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
-OPTIONS_MULTI_SESSION:= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}
+OPTIONS_MULTI= ${META_MODULES}
+OPTIONS_MULTI_PROXY= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
+OPTIONS_MULTI_SESSION= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}
OPTIONS_GROUP= EXAMPLE
-OPTIONS_GROUP_EXAMPLE:= ${EXAMPLE_MODULES}
+OPTIONS_GROUP_EXAMPLE= ${EXAMPLE_MODULES}
-OPTIONS_RADIO= SHARED_MPM
-OPTIONS_RADIO_SHARED_MPM= MPM_SHARED
+OPTIONS_RADIO= MPM_SHARED
+OPTIONS_RADIO_MPM_SHARED= MPM_SHARED
OPTIONS_SINGLE= DEFAULT_MPM
OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT
# ===================================================================================
-OPTIONS_DEFINE:= \
+ALL_MODULES= ${MOST_ENABLED_MODULES} ${MOST_DISABLED_MODULES} \
+ ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES} \
+ ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES} \
+ ${EXAMPLE_MODULES} ${META_MODULES}
+
+OPTIONS_DEFINE= \
${MOST_ENABLED_MODULES} \
${MOST_DISABLED_MODULES}\
${ADDITIONAL_OPT} \
${OPTIONS_MULTI}
-OPTIONS_DEFAULT:= \
+OPTIONS_DEFAULT= \
${MOST_ENABLED_MODULES} \
${OPTIONS_MULTI} \
${SESSION_ENABLED_MODULES} \
diff --git a/www/apache24/Makefile.options.desc b/www/apache24/Makefile.options.desc
index c7bd6f07aa5d..b3fdca2c213d 100644
--- a/www/apache24/Makefile.options.desc
+++ b/www/apache24/Makefile.options.desc
@@ -22,20 +22,6 @@ IPV4_MAPPED_DESC= Allow IPv6 sockets to handle IPv4 connections
LUAJIT_DESC= LuaJit Support
# =====================================
-# static support (tbd)
-STATIC_AB_DESC= static linked ab
-STATIC_CHECKGID_DESC= static linked checkgid
-STATIC_FCGISTARTER_DESC= static linked fcgistarter
-STATIC_HTCACHECLEAN_DESC= static linked htcacheclean
-STATIC_HTDBM_DESC= static linked htdbm
-STATIC_HTDIGEST_DESC= static linked htdigest
-STATIC_HTPASSWD_DESC= static linked htpasswd
-STATIC_HTTXT2DBM_DESC= static linked httxt2dbm
-STATIC_LOGRESOLVE_DESC= static linked logresolve
-STATIC_ROTATELOGS_DESC= static linked rotatelogs
-STATIC_SUPPORT_DESC= static linked support binaries
-
-# =====================================
# modules
# DESC from modules/*/config.m4 files
ACCESS_COMPAT_DESC= mod_access compatibility
@@ -119,6 +105,7 @@ LOG_FORENSIC_DESC= Forensic logging
LUA_DESC= Apache Lua Framework
MACRO_DESC= Define and use macros in configuration files
+MD_DESC= Managing domains across virtual hosts, certificate provisioning via the ACME protocol
MIME_DESC= Mapp file-ext. to MIME (recommended)
MIME_MAGIC_DESC= Automagically determining MIME type
@@ -142,6 +129,7 @@ PROXY_HTML_DESC= Fix HTML Links in a Reverse Proxy
PROXY_HTTP_DESC= HTTP support module for mod_proxy
PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c
PROXY_SCGI_DESC= SCGI gateway module for mod_proxy
+PROXY_UWSGI_DESC= UWSGI gateway module for mod_proxy
PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy
RATELIMIT_DESC= Output Bandwidth Limiting
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 4c939fdb50a8..0ed95db1b186 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508321657
-SHA256 (apache24/httpd-2.4.29.tar.bz2) = 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00
-SIZE (apache24/httpd-2.4.29.tar.bz2) = 6567926
+TIMESTAMP = 1521377807
+SHA256 (apache24/httpd-2.4.33.tar.bz2) = de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05
+SIZE (apache24/httpd-2.4.33.tar.bz2) = 6934765
diff --git a/www/apache24/files/patch-configure.in b/www/apache24/files/patch-configure.in
index c4ae71082ad9..9bf66c4915c2 100644
--- a/www/apache24/files/patch-configure.in
+++ b/www/apache24/files/patch-configure.in
@@ -1,23 +1,5 @@
--- configure.in.orig 2016-12-02 11:36:06 UTC
+++ configure.in
-@@ -111,7 +111,7 @@ fi
-
- if test "$apr_found" = "reconfig"; then
- APR_SUBDIR_CONFIG(srclib/apr,
-- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-+ [$apache_apr_flags --prefix=$prefix],
- [--enable-layout=*|\'--enable-layout=*])
- dnl We must be the first to build and the last to be cleaned
- AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
-@@ -177,7 +177,7 @@ esac
-
- if test "$apu_found" = "reconfig"; then
- APR_SUBDIR_CONFIG(srclib/apr-util,
-- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
-+ [--with-apr=../apr --prefix=$prefix],
- [--enable-layout=*|\'--enable-layout=*])
- dnl We must be the last to build and the first to be cleaned
- AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
@@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre
[Root directory of the Apache install area])
AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
diff --git a/www/apache24/files/patch-modules_md_md__crypt.c b/www/apache24/files/patch-modules_md_md__crypt.c
new file mode 100644
index 000000000000..9cc62c8cb750
--- /dev/null
+++ b/www/apache24/files/patch-modules_md_md__crypt.c
@@ -0,0 +1,11 @@
+--- modules/md/md_crypt.c.orig 2018-01-30 10:20:50 UTC
++++ modules/md/md_crypt.c
+@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk
+ }
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+
+ #ifndef NID_tlsfeature
+ #define NID_tlsfeature 1020
diff --git a/www/apache24/files/patch-modules_ssl_ssl__private.h b/www/apache24/files/patch-modules_ssl_ssl__private.h
new file mode 100644
index 000000000000..4b46f8c4fe87
--- /dev/null
+++ b/www/apache24/files/patch-modules_ssl_ssl__private.h
@@ -0,0 +1,11 @@
+--- modules/ssl/ssl_private.h.orig 2018-03-23 14:22:26 UTC
++++ modules/ssl/ssl_private.h
+@@ -123,7 +123,7 @@
+ #define MODSSL_SSL_METHOD_CONST
+ #endif
+
+-#if defined(LIBRESSL_VERSION_NUMBER)
++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
+ /* Missing from LibreSSL */
+ #if LIBRESSL_VERSION_NUMBER < 0x2060000f
+ #define SSL_CTRL_SET_MIN_PROTO_VERSION 123
diff --git a/www/apache24/pkg-plist b/www/apache24/pkg-plist
index c2b597fcea52..e953535cf1ad 100644
--- a/www/apache24/pkg-plist
+++ b/www/apache24/pkg-plist
@@ -85,133 +85,135 @@ include/apache24/util_time.h
include/apache24/util_varbuf.h
include/apache24/util_xml.h
libexec/apache24/httpd.exp
-%%MOD_ACCESS_COMPAT%%libexec/apache24/mod_access_compat.so
-%%MOD_ACTIONS%%libexec/apache24/mod_actions.so
-%%MOD_ALIAS%%libexec/apache24/mod_alias.so
-%%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so
-%%MOD_ASIS%%libexec/apache24/mod_asis.so
-%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so
-%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so
-%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so
-%%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so
-%%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so
-%%MOD_AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so
-%%MOD_AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so
-%%MOD_AUTHN_FILE%%libexec/apache24/mod_authn_file.so
-%%MOD_AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so
-%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so
-%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so
-%%MOD_AUTHZ_CORE%%libexec/apache24/mod_authz_core.so
-%%MOD_AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so
-%%MOD_AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so
-%%MOD_AUTHZ_GROUPFILE%%libexec/apache24/mod_authz_groupfile.so
-%%MOD_AUTHZ_HOST%%libexec/apache24/mod_authz_host.so
-%%MOD_AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so
-%%MOD_AUTHZ_USER%%libexec/apache24/mod_authz_user.so
-%%MOD_AUTOINDEX%%libexec/apache24/mod_autoindex.so
-%%MOD_BROTLI%%libexec/apache24/mod_brotli.so
-%%MOD_BUCKETEER%%libexec/apache24/mod_bucketeer.so
-%%MOD_BUFFER%%libexec/apache24/mod_buffer.so
-%%MOD_CACHE%%libexec/apache24/mod_cache.so
-%%MOD_CACHE_DISK%%libexec/apache24/mod_cache_disk.so
-%%MOD_CACHE_SOCACHE%%libexec/apache24/mod_cache_socache.so
-%%MOD_CASE_FILTER%%libexec/apache24/mod_case_filter.so
-%%MOD_CASE_FILTER_IN%%libexec/apache24/mod_case_filter_in.so
-%%MOD_CERN_META%%libexec/apache24/mod_cern_meta.so
-%%MOD_CGI%%libexec/apache24/mod_cgi.so
-%%MOD_CGID%%libexec/apache24/mod_cgid.so
-%%MOD_CHARSET_LITE%%libexec/apache24/mod_charset_lite.so
-%%MOD_DATA%%libexec/apache24/mod_data.so
-%%MOD_DAV%%libexec/apache24/mod_dav.so
-%%MOD_DAV_FS%%libexec/apache24/mod_dav_fs.so
-%%MOD_DAV_LOCK%%libexec/apache24/mod_dav_lock.so
-%%MOD_DBD%%libexec/apache24/mod_dbd.so
-%%MOD_DEFLATE%%libexec/apache24/mod_deflate.so
-%%MOD_DIALUP%%libexec/apache24/mod_dialup.so
-%%MOD_DIR%%libexec/apache24/mod_dir.so
-%%MOD_DUMPIO%%libexec/apache24/mod_dumpio.so
-%%MOD_ECHO%%libexec/apache24/mod_echo.so
-%%MOD_ENV%%libexec/apache24/mod_env.so
-%%MOD_EXAMPLE_HOOKS%%libexec/apache24/mod_example_hooks.so
-%%MOD_EXAMPLE_IPC%%libexec/apache24/mod_example_ipc.so
-%%MOD_EXPIRES%%libexec/apache24/mod_expires.so
-%%MOD_EXT_FILTER%%libexec/apache24/mod_ext_filter.so
-%%MOD_FILE_CACHE%%libexec/apache24/mod_file_cache.so
-%%MOD_FILTER%%libexec/apache24/mod_filter.so
-%%MOD_HEADERS%%libexec/apache24/mod_headers.so
-%%MOD_HEARTBEAT%%libexec/apache24/mod_heartbeat.so
-%%MOD_HEARTMONITOR%%libexec/apache24/mod_heartmonitor.so
-%%MOD_HTTP2%%libexec/apache24/mod_http2.so
-%%MOD_IDENT%%libexec/apache24/mod_ident.so
-%%MOD_IMAGEMAP%%libexec/apache24/mod_imagemap.so
-%%MOD_INCLUDE%%libexec/apache24/mod_include.so
-%%MOD_INFO%%libexec/apache24/mod_info.so
-%%MOD_LBMETHOD_BYBUSYNESS%%libexec/apache24/mod_lbmethod_bybusyness.so
-%%MOD_LBMETHOD_BYREQUESTS%%libexec/apache24/mod_lbmethod_byrequests.so
-%%MOD_LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so
-%%MOD_LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so
-%%MOD_LDAP%%libexec/apache24/mod_ldap.so
+%%ACCESS_COMPAT%%libexec/apache24/mod_access_compat.so
+%%ACTIONS%%libexec/apache24/mod_actions.so
+%%ALIAS%%libexec/apache24/mod_alias.so
+%%ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so
+%%ASIS%%libexec/apache24/mod_asis.so
+%%AUTH_BASIC%%libexec/apache24/mod_auth_basic.so
+%%AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so
+%%AUTH_FORM%%libexec/apache24/mod_auth_form.so
+%%AUTHN_ANON%%libexec/apache24/mod_authn_anon.so
+%%AUTHN_CORE%%libexec/apache24/mod_authn_core.so
+%%AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so
+%%AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so
+%%AUTHN_FILE%%libexec/apache24/mod_authn_file.so
+%%AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so
+%%AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so
+%%AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so
+%%AUTHZ_CORE%%libexec/apache24/mod_authz_core.so
+%%AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so
+%%AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so
+%%AUTHZ_GROUPFILE%%libexec/apache24/mod_authz_groupfile.so
+%%AUTHZ_HOST%%libexec/apache24/mod_authz_host.so
+%%AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so
+%%AUTHZ_USER%%libexec/apache24/mod_authz_user.so
+%%AUTOINDEX%%libexec/apache24/mod_autoindex.so
+%%BROTLI%%libexec/apache24/mod_brotli.so
+%%BUCKETEER%%libexec/apache24/mod_bucketeer.so
+%%BUFFER%%libexec/apache24/mod_buffer.so
+%%CACHE%%libexec/apache24/mod_cache.so
+%%CACHE_DISK%%libexec/apache24/mod_cache_disk.so
+%%CACHE_SOCACHE%%libexec/apache24/mod_cache_socache.so
+%%CASE_FILTER%%libexec/apache24/mod_case_filter.so
+%%CASE_FILTER_IN%%libexec/apache24/mod_case_filter_in.so
+%%CERN_META%%libexec/apache24/mod_cern_meta.so
+%%CGI%%libexec/apache24/mod_cgi.so
+%%CGID%%libexec/apache24/mod_cgid.so
+%%CHARSET_LITE%%libexec/apache24/mod_charset_lite.so
+%%DATA%%libexec/apache24/mod_data.so
+%%DAV%%libexec/apache24/mod_dav.so
+%%DAV_FS%%libexec/apache24/mod_dav_fs.so
+%%DAV_LOCK%%libexec/apache24/mod_dav_lock.so
+%%DBD%%libexec/apache24/mod_dbd.so
+%%DEFLATE%%libexec/apache24/mod_deflate.so
+%%DIALUP%%libexec/apache24/mod_dialup.so
+%%DIR%%libexec/apache24/mod_dir.so
+%%DUMPIO%%libexec/apache24/mod_dumpio.so
+%%ECHO%%libexec/apache24/mod_echo.so
+%%ENV%%libexec/apache24/mod_env.so
+%%EXAMPLE_HOOKS%%libexec/apache24/mod_example_hooks.so
+%%EXAMPLE_IPC%%libexec/apache24/mod_example_ipc.so
+%%EXPIRES%%libexec/apache24/mod_expires.so
+%%EXT_FILTER%%libexec/apache24/mod_ext_filter.so
+%%FILE_CACHE%%libexec/apache24/mod_file_cache.so
+%%FILTER%%libexec/apache24/mod_filter.so
+%%HEADERS%%libexec/apache24/mod_headers.so
+%%HEARTBEAT%%libexec/apache24/mod_heartbeat.so
+%%HEARTMONITOR%%libexec/apache24/mod_heartmonitor.so
+%%HTTP2%%libexec/apache24/mod_http2.so
+%%IDENT%%libexec/apache24/mod_ident.so
+%%IMAGEMAP%%libexec/apache24/mod_imagemap.so
+%%INCLUDE%%libexec/apache24/mod_include.so
+%%INFO%%libexec/apache24/mod_info.so
+%%LBMETHOD_BYBUSYNESS%%libexec/apache24/mod_lbmethod_bybusyness.so
+%%LBMETHOD_BYREQUESTS%%libexec/apache24/mod_lbmethod_byrequests.so
+%%LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so
+%%LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so
+%%LDAP%%libexec/apache24/mod_ldap.so
libexec/apache24/mod_log_config.so
-%%MOD_LOG_DEBUG%%libexec/apache24/mod_log_debug.so
-%%MOD_LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so
-%%MOD_LOGIO%%libexec/apache24/mod_logio.so
-%%MOD_LUA%%libexec/apache24/mod_lua.so
-%%MOD_MACRO%%libexec/apache24/mod_macro.so
-%%MOD_MIME%%libexec/apache24/mod_mime.so
-%%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so
+%%LOG_DEBUG%%libexec/apache24/mod_log_debug.so
+%%LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so
+%%LOGIO%%libexec/apache24/mod_logio.so
+%%LUA%%libexec/apache24/mod_lua.so
+%%MACRO%%libexec/apache24/mod_macro.so
+%%MD%%libexec/apache24/mod_md.so
+%%MIME%%libexec/apache24/mod_mime.so
+%%MIME_MAGIC%%libexec/apache24/mod_mime_magic.so
%%MPM_SHARED%%libexec/apache24/mod_mpm_event.so
%%MPM_SHARED%%libexec/apache24/mod_mpm_prefork.so
%%MPM_SHARED%%libexec/apache24/mod_mpm_worker.so
-%%MOD_NEGOTIATION%%libexec/apache24/mod_negotiation.so
-%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so
-%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so
-%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache24/mod_optional_hook_export.so
-%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache24/mod_optional_hook_import.so
-%%MOD_PROXY%%libexec/apache24/mod_proxy.so
-%%MOD_PROXY_AJP%%libexec/apache24/mod_proxy_ajp.so
-%%MOD_PROXY_BALANCER%%libexec/apache24/mod_proxy_balancer.so
-%%MOD_PROXY_CONNECT%%libexec/apache24/mod_proxy_connect.so
-%%MOD_PROXY_EXPRESS%%libexec/apache24/mod_proxy_express.so
-%%MOD_PROXY_FCGI%%libexec/apache24/mod_proxy_fcgi.so
-%%MOD_PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so
-%%MOD_PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so
-%%MOD_PROXY_HTML%%libexec/apache24/mod_proxy_html.so
-%%MOD_PROXY_HCHECK%%libexec/apache24/mod_proxy_hcheck.so
-%%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so
-%%MOD_PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so
-%%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so
-%%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so
-%%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so
-%%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so
-%%MOD_REMOTEIP%%libexec/apache24/mod_remoteip.so
-%%MOD_REQTIMEOUT%%libexec/apache24/mod_reqtimeout.so
-%%MOD_REQUEST%%libexec/apache24/mod_request.so
-%%MOD_REWRITE%%libexec/apache24/mod_rewrite.so
-%%MOD_SED%%libexec/apache24/mod_sed.so
-%%MOD_SESSION%%libexec/apache24/mod_session.so
-%%MOD_SESSION_COOKIE%%libexec/apache24/mod_session_cookie.so
-%%MOD_SESSION_CRYPTO%%libexec/apache24/mod_session_crypto.so
-%%MOD_SESSION_DBD%%libexec/apache24/mod_session_dbd.so
-%%MOD_SETENVIF%%libexec/apache24/mod_setenvif.so
-%%MOD_SLOTMEM_PLAIN%%libexec/apache24/mod_slotmem_plain.so
-%%MOD_SLOTMEM_SHM%%libexec/apache24/mod_slotmem_shm.so
-%%MOD_SOCACHE_DBM%%libexec/apache24/mod_socache_dbm.so
-%%MOD_SOCACHE_DC%%libexec/apache24/mod_socache_dc.so
-%%MOD_SOCACHE_MEMCACHE%%libexec/apache24/mod_socache_memcache.so
-%%MOD_SOCACHE_SHMCB%%libexec/apache24/mod_socache_shmcb.so
-%%MOD_SPELING%%libexec/apache24/mod_speling.so
-%%MOD_SSL%%libexec/apache24/mod_ssl.so
-%%MOD_STATUS%%libexec/apache24/mod_status.so
-%%MOD_SUBSTITUTE%%libexec/apache24/mod_substitute.so
-%%MOD_SUEXEC%%libexec/apache24/mod_suexec.so
-%%MOD_UNIQUE_ID%%libexec/apache24/mod_unique_id.so
+%%NEGOTIATION%%libexec/apache24/mod_negotiation.so
+%%OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so
+%%OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so
+%%OPTIONAL_HOOK_EXPORT%%libexec/apache24/mod_optional_hook_export.so
+%%OPTIONAL_HOOK_IMPORT%%libexec/apache24/mod_optional_hook_import.so
+%%PROXY%%libexec/apache24/mod_proxy.so
+%%PROXY_AJP%%libexec/apache24/mod_proxy_ajp.so
+%%PROXY_BALANCER%%libexec/apache24/mod_proxy_balancer.so
+%%PROXY_CONNECT%%libexec/apache24/mod_proxy_connect.so
+%%PROXY_EXPRESS%%libexec/apache24/mod_proxy_express.so
+%%PROXY_FCGI%%libexec/apache24/mod_proxy_fcgi.so
+%%PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so
+%%PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so
+%%PROXY_HTML%%libexec/apache24/mod_proxy_html.so
+%%PROXY_HCHECK%%libexec/apache24/mod_proxy_hcheck.so
+%%PROXY_HTTP%%libexec/apache24/mod_proxy_http.so
+%%PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so
+%%PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so
+%%PROXY_UWSGI%%libexec/apache24/mod_proxy_uwsgi.so
+%%PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so
+%%RATELIMIT%%libexec/apache24/mod_ratelimit.so
+%%REFLECTOR%%libexec/apache24/mod_reflector.so
+%%REMOTEIP%%libexec/apache24/mod_remoteip.so
+%%REQTIMEOUT%%libexec/apache24/mod_reqtimeout.so
+%%REQUEST%%libexec/apache24/mod_request.so
+%%REWRITE%%libexec/apache24/mod_rewrite.so
+%%SED%%libexec/apache24/mod_sed.so
+%%SESSION%%libexec/apache24/mod_session.so
+%%SESSION_COOKIE%%libexec/apache24/mod_session_cookie.so
+%%SESSION_CRYPTO%%libexec/apache24/mod_session_crypto.so
+%%SESSION_DBD%%libexec/apache24/mod_session_dbd.so
+%%SETENVIF%%libexec/apache24/mod_setenvif.so
+%%SLOTMEM_PLAIN%%libexec/apache24/mod_slotmem_plain.so
+%%SLOTMEM_SHM%%libexec/apache24/mod_slotmem_shm.so
+%%SOCACHE_DBM%%libexec/apache24/mod_socache_dbm.so
+%%SOCACHE_DC%%libexec/apache24/mod_socache_dc.so
+%%SOCACHE_MEMCACHE%%libexec/apache24/mod_socache_memcache.so
+%%SOCACHE_SHMCB%%libexec/apache24/mod_socache_shmcb.so
+%%SPELING%%libexec/apache24/mod_speling.so
+%%SSL%%libexec/apache24/mod_ssl.so
+%%STATUS%%libexec/apache24/mod_status.so
+%%SUBSTITUTE%%libexec/apache24/mod_substitute.so
+%%SUEXEC%%libexec/apache24/mod_suexec.so
+%%UNIQUE_ID%%libexec/apache24/mod_unique_id.so
libexec/apache24/mod_unixd.so
-%%MOD_USERDIR%%libexec/apache24/mod_userdir.so
-%%MOD_USERTRACK%%libexec/apache24/mod_usertrack.so
-%%MOD_VERSION%%libexec/apache24/mod_version.so
-%%MOD_VHOST_ALIAS%%libexec/apache24/mod_vhost_alias.so
-%%MOD_WATCHDOG%%libexec/apache24/mod_watchdog.so
-%%MOD_XML2ENC%%libexec/apache24/mod_xml2enc.so
+%%USERDIR%%libexec/apache24/mod_userdir.so
+%%USERTRACK%%libexec/apache24/mod_usertrack.so
+%%VERSION%%libexec/apache24/mod_version.so
+%%VHOST_ALIAS%%libexec/apache24/mod_vhost_alias.so
+%%WATCHDOG%%libexec/apache24/mod_watchdog.so
+%%XML2ENC%%libexec/apache24/mod_xml2enc.so
man/man1/ab.1.gz
man/man1/apxs.1.gz
man/man1/dbmmanage.1.gz
@@ -251,6 +253,8 @@ sbin/split-logfile
%%DATADIR%%/misc/index.html
@postexec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html
@(,,0400) %%WWWDIR%%/cgi-bin/printenv
+@comment %%WWWDIR%%/cgi-bin/printenv.vbs
+@comment %%WWWDIR%%/cgi-bin/printenv.wsf
@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi
%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var
%%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:00:54 +0000