Attachment #191783 for bug #226647




# $FreeBSD$

PORTNAME=	apache24
PORTVERSION=	2.4.33
PORTREVISION=	2
CATEGORIES=	www ipv6
MASTER_SITES=	APACHE_HTTPD
DISTNAME=	httpd-${PORTVERSION}

		libapr-1.so:devel/apr1 \
		libpcre.so:devel/pcre

CONFLICTS_INSTALL=	apache22-*
			apache-*-2.2.* apache22-*

USES=		apache:server,2.4 autoreconf cpe iconv libtool perl5 tar:bzip2
USE_PERL5=	run

USERS=		www
GROUPS=		www

# for slave ports
.if !defined(MASTERDIR)
APACHEDIR=	${.CURDIR}
.else
APACHEDIR=	${MASTERDIR}
.endif

WITH_HTTP_PORT?=	80
WITH_SSL_PORT?=		443

.include "${.CURDIR}/Makefile.options"
.include "${.CURDIR}/Makefile.options.desc"
OPTIONS_SUB=	yes

.include "${APACHEDIR}/Makefile.options"
.include "${APACHEDIR}/Makefile.options.desc"

# IMPLIES
AUTHN_DBD_IMPLIES=		DBD
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

# 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
BROTLI_CONFIGURE_WITH=		brotli=${LOCALBASE}
# 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_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_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 built
# OpenSSL version (base/ports) depends how devel/apr1 was build
#  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} \

		--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}" \
		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

# 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:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
IGNORE=	AUTH_BASIC need at least one AUTHZ provider
.endif

# 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
.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


	@${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 2>/dev/null

post-configure:
	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\




# $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





# 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_UWSGI PROXY_WSTUNNEL

PROXY_DISABLED_MODULES=


	VERSION VHOST_ALIAS \
	WATCHDOG XML2ENC

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_GROUP=		EXAMPLE
OPTIONS_GROUP_EXAMPLE=	${EXAMPLE_MODULES}

OPTIONS_RADIO=		MPM_SHARED
OPTIONS_RADIO_MPM_SHARED=	MPM_SHARED

OPTIONS_SINGLE=			DEFAULT_MPM
OPTIONS_SINGLE_DEFAULT_MPM=	MPM_PREFORK MPM_WORKER MPM_EVENT


# ===================================================================================

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=		\
	${MOST_ENABLED_MODULES}	\
	${OPTIONS_MULTI}	\
	${SESSION_ENABLED_MODULES} \




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

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


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

Lines 1-3 Link Here

(-)www/apache24/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1508321657	1	TIMESTAMP = 1521377807
2	SHA256 (apache24/httpd-2.4.29.tar.bz2) = 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00	2	SHA256 (apache24/httpd-2.4.33.tar.bz2) = de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05
3	SIZE (apache24/httpd-2.4.29.tar.bz2) = 6567926	3	SIZE (apache24/httpd-2.4.33.tar.bz2) = 6934765




--- 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",

Line 0 Link Here

(-)www/apache24/files/patch-modules_md_md__crypt.c (+11 lines)
	1	--- modules/md/md_crypt.c.orig 2018-01-30 10:20:50 UTC
	2	+++ modules/md/md_crypt.c
	3	@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk
	4	}
	5	}
	6
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
	9
	10	#ifndef NID_tlsfeature
	11	#define NID_tlsfeature 1020

Line 0 Link Here

(-)www/apache24/files/patch-modules_ssl_ssl__private.h (+11 lines)
	1	--- modules/ssl/ssl_private.h.orig 2018-03-23 14:22:26 UTC
	2	+++ modules/ssl/ssl_private.h
	3	@@ -123,7 +123,7 @@
	4	#define MODSSL_SSL_METHOD_CONST
	5	#endif
	6
	7	-#if defined(LIBRESSL_VERSION_NUMBER)
	8	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
	9	/* Missing from LibreSSL */
	10	#if LIBRESSL_VERSION_NUMBER < 0x2060000f
	11	#define SSL_CTRL_SET_MIN_PROTO_VERSION 123




include/apache24/util_varbuf.h
include/apache24/util_xml.h
libexec/apache24/httpd.exp
%%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
%%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
%%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
%%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

%%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

Return to bug 226647

Lines 85-217 Link Here

(-)www/apache24/pkg-plist (-122 / +126 lines)
85	include/apache24/util_varbuf.h	85	include/apache24/util_varbuf.h
86	include/apache24/util_xml.h	86	include/apache24/util_xml.h
87	libexec/apache24/httpd.exp	87	libexec/apache24/httpd.exp
88	%%MOD_ACCESS_COMPAT%%libexec/apache24/mod_access_compat.so	88	%%ACCESS_COMPAT%%libexec/apache24/mod_access_compat.so
89	%%MOD_ACTIONS%%libexec/apache24/mod_actions.so	89	%%ACTIONS%%libexec/apache24/mod_actions.so
90	%%MOD_ALIAS%%libexec/apache24/mod_alias.so	90	%%ALIAS%%libexec/apache24/mod_alias.so
91	%%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so	91	%%ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so
92	%%MOD_ASIS%%libexec/apache24/mod_asis.so	92	%%ASIS%%libexec/apache24/mod_asis.so
93	%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so	93	%%AUTH_BASIC%%libexec/apache24/mod_auth_basic.so
94	%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so	94	%%AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so
95	%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so	95	%%AUTH_FORM%%libexec/apache24/mod_auth_form.so
96	%%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so	96	%%AUTHN_ANON%%libexec/apache24/mod_authn_anon.so
97	%%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so	97	%%AUTHN_CORE%%libexec/apache24/mod_authn_core.so
98	%%MOD_AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so	98	%%AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so
99	%%MOD_AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so	99	%%AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so
100	%%MOD_AUTHN_FILE%%libexec/apache24/mod_authn_file.so	100	%%AUTHN_FILE%%libexec/apache24/mod_authn_file.so
101	%%MOD_AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so	101	%%AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so
102	%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so	102	%%AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so
103	%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so	103	%%AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so
104	%%MOD_AUTHZ_CORE%%libexec/apache24/mod_authz_core.so	104	%%AUTHZ_CORE%%libexec/apache24/mod_authz_core.so
105	%%MOD_AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so	105	%%AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so
106	%%MOD_AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so	106	%%AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so
107	%%MOD_AUTHZ_GROUPFILE%%libexec/apache24/mod_authz_groupfile.so	107	%%AUTHZ_GROUPFILE%%libexec/apache24/mod_authz_groupfile.so
108	%%MOD_AUTHZ_HOST%%libexec/apache24/mod_authz_host.so	108	%%AUTHZ_HOST%%libexec/apache24/mod_authz_host.so
109	%%MOD_AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so	109	%%AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so
110	%%MOD_AUTHZ_USER%%libexec/apache24/mod_authz_user.so	110	%%AUTHZ_USER%%libexec/apache24/mod_authz_user.so
111	%%MOD_AUTOINDEX%%libexec/apache24/mod_autoindex.so	111	%%AUTOINDEX%%libexec/apache24/mod_autoindex.so
112	%%MOD_BROTLI%%libexec/apache24/mod_brotli.so	112	%%BROTLI%%libexec/apache24/mod_brotli.so
113	%%MOD_BUCKETEER%%libexec/apache24/mod_bucketeer.so	113	%%BUCKETEER%%libexec/apache24/mod_bucketeer.so
114	%%MOD_BUFFER%%libexec/apache24/mod_buffer.so	114	%%BUFFER%%libexec/apache24/mod_buffer.so
115	%%MOD_CACHE%%libexec/apache24/mod_cache.so	115	%%CACHE%%libexec/apache24/mod_cache.so
116	%%MOD_CACHE_DISK%%libexec/apache24/mod_cache_disk.so	116	%%CACHE_DISK%%libexec/apache24/mod_cache_disk.so
117	%%MOD_CACHE_SOCACHE%%libexec/apache24/mod_cache_socache.so	117	%%CACHE_SOCACHE%%libexec/apache24/mod_cache_socache.so
118	%%MOD_CASE_FILTER%%libexec/apache24/mod_case_filter.so	118	%%CASE_FILTER%%libexec/apache24/mod_case_filter.so
119	%%MOD_CASE_FILTER_IN%%libexec/apache24/mod_case_filter_in.so	119	%%CASE_FILTER_IN%%libexec/apache24/mod_case_filter_in.so
120	%%MOD_CERN_META%%libexec/apache24/mod_cern_meta.so	120	%%CERN_META%%libexec/apache24/mod_cern_meta.so
121	%%MOD_CGI%%libexec/apache24/mod_cgi.so	121	%%CGI%%libexec/apache24/mod_cgi.so
122	%%MOD_CGID%%libexec/apache24/mod_cgid.so	122	%%CGID%%libexec/apache24/mod_cgid.so
123	%%MOD_CHARSET_LITE%%libexec/apache24/mod_charset_lite.so	123	%%CHARSET_LITE%%libexec/apache24/mod_charset_lite.so
124	%%MOD_DATA%%libexec/apache24/mod_data.so	124	%%DATA%%libexec/apache24/mod_data.so
125	%%MOD_DAV%%libexec/apache24/mod_dav.so	125	%%DAV%%libexec/apache24/mod_dav.so
126	%%MOD_DAV_FS%%libexec/apache24/mod_dav_fs.so	126	%%DAV_FS%%libexec/apache24/mod_dav_fs.so
127	%%MOD_DAV_LOCK%%libexec/apache24/mod_dav_lock.so	127	%%DAV_LOCK%%libexec/apache24/mod_dav_lock.so
128	%%MOD_DBD%%libexec/apache24/mod_dbd.so	128	%%DBD%%libexec/apache24/mod_dbd.so
129	%%MOD_DEFLATE%%libexec/apache24/mod_deflate.so	129	%%DEFLATE%%libexec/apache24/mod_deflate.so
130	%%MOD_DIALUP%%libexec/apache24/mod_dialup.so	130	%%DIALUP%%libexec/apache24/mod_dialup.so
131	%%MOD_DIR%%libexec/apache24/mod_dir.so	131	%%DIR%%libexec/apache24/mod_dir.so
132	%%MOD_DUMPIO%%libexec/apache24/mod_dumpio.so	132	%%DUMPIO%%libexec/apache24/mod_dumpio.so
133	%%MOD_ECHO%%libexec/apache24/mod_echo.so	133	%%ECHO%%libexec/apache24/mod_echo.so
134	%%MOD_ENV%%libexec/apache24/mod_env.so	134	%%ENV%%libexec/apache24/mod_env.so
135	%%MOD_EXAMPLE_HOOKS%%libexec/apache24/mod_example_hooks.so	135	%%EXAMPLE_HOOKS%%libexec/apache24/mod_example_hooks.so
136	%%MOD_EXAMPLE_IPC%%libexec/apache24/mod_example_ipc.so	136	%%EXAMPLE_IPC%%libexec/apache24/mod_example_ipc.so
137	%%MOD_EXPIRES%%libexec/apache24/mod_expires.so	137	%%EXPIRES%%libexec/apache24/mod_expires.so
138	%%MOD_EXT_FILTER%%libexec/apache24/mod_ext_filter.so	138	%%EXT_FILTER%%libexec/apache24/mod_ext_filter.so
139	%%MOD_FILE_CACHE%%libexec/apache24/mod_file_cache.so	139	%%FILE_CACHE%%libexec/apache24/mod_file_cache.so
140	%%MOD_FILTER%%libexec/apache24/mod_filter.so	140	%%FILTER%%libexec/apache24/mod_filter.so
141	%%MOD_HEADERS%%libexec/apache24/mod_headers.so	141	%%HEADERS%%libexec/apache24/mod_headers.so
142	%%MOD_HEARTBEAT%%libexec/apache24/mod_heartbeat.so	142	%%HEARTBEAT%%libexec/apache24/mod_heartbeat.so
143	%%MOD_HEARTMONITOR%%libexec/apache24/mod_heartmonitor.so	143	%%HEARTMONITOR%%libexec/apache24/mod_heartmonitor.so
144	%%MOD_HTTP2%%libexec/apache24/mod_http2.so	144	%%HTTP2%%libexec/apache24/mod_http2.so
145	%%MOD_IDENT%%libexec/apache24/mod_ident.so	145	%%IDENT%%libexec/apache24/mod_ident.so
146	%%MOD_IMAGEMAP%%libexec/apache24/mod_imagemap.so	146	%%IMAGEMAP%%libexec/apache24/mod_imagemap.so
147	%%MOD_INCLUDE%%libexec/apache24/mod_include.so	147	%%INCLUDE%%libexec/apache24/mod_include.so
148	%%MOD_INFO%%libexec/apache24/mod_info.so	148	%%INFO%%libexec/apache24/mod_info.so
149	%%MOD_LBMETHOD_BYBUSYNESS%%libexec/apache24/mod_lbmethod_bybusyness.so	149	%%LBMETHOD_BYBUSYNESS%%libexec/apache24/mod_lbmethod_bybusyness.so
150	%%MOD_LBMETHOD_BYREQUESTS%%libexec/apache24/mod_lbmethod_byrequests.so	150	%%LBMETHOD_BYREQUESTS%%libexec/apache24/mod_lbmethod_byrequests.so
151	%%MOD_LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so	151	%%LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so
152	%%MOD_LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so	152	%%LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so
153	%%MOD_LDAP%%libexec/apache24/mod_ldap.so	153	%%LDAP%%libexec/apache24/mod_ldap.so
154	libexec/apache24/mod_log_config.so	154	libexec/apache24/mod_log_config.so
155	%%MOD_LOG_DEBUG%%libexec/apache24/mod_log_debug.so	155	%%LOG_DEBUG%%libexec/apache24/mod_log_debug.so
156	%%MOD_LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so	156	%%LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so
157	%%MOD_LOGIO%%libexec/apache24/mod_logio.so	157	%%LOGIO%%libexec/apache24/mod_logio.so
158	%%MOD_LUA%%libexec/apache24/mod_lua.so	158	%%LUA%%libexec/apache24/mod_lua.so
159	%%MOD_MACRO%%libexec/apache24/mod_macro.so	159	%%MACRO%%libexec/apache24/mod_macro.so
160	%%MOD_MIME%%libexec/apache24/mod_mime.so	160	%%MD%%libexec/apache24/mod_md.so
161	%%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so	161	%%MIME%%libexec/apache24/mod_mime.so
		162	%%MIME_MAGIC%%libexec/apache24/mod_mime_magic.so
162	%%MPM_SHARED%%libexec/apache24/mod_mpm_event.so	163	%%MPM_SHARED%%libexec/apache24/mod_mpm_event.so
163	%%MPM_SHARED%%libexec/apache24/mod_mpm_prefork.so	164	%%MPM_SHARED%%libexec/apache24/mod_mpm_prefork.so
164	%%MPM_SHARED%%libexec/apache24/mod_mpm_worker.so	165	%%MPM_SHARED%%libexec/apache24/mod_mpm_worker.so
165	%%MOD_NEGOTIATION%%libexec/apache24/mod_negotiation.so	166	%%NEGOTIATION%%libexec/apache24/mod_negotiation.so
166	%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so	167	%%OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so
167	%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so	168	%%OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so
168	%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache24/mod_optional_hook_export.so	169	%%OPTIONAL_HOOK_EXPORT%%libexec/apache24/mod_optional_hook_export.so
169	%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache24/mod_optional_hook_import.so	170	%%OPTIONAL_HOOK_IMPORT%%libexec/apache24/mod_optional_hook_import.so
170	%%MOD_PROXY%%libexec/apache24/mod_proxy.so	171	%%PROXY%%libexec/apache24/mod_proxy.so
171	%%MOD_PROXY_AJP%%libexec/apache24/mod_proxy_ajp.so	172	%%PROXY_AJP%%libexec/apache24/mod_proxy_ajp.so
172	%%MOD_PROXY_BALANCER%%libexec/apache24/mod_proxy_balancer.so	173	%%PROXY_BALANCER%%libexec/apache24/mod_proxy_balancer.so
173	%%MOD_PROXY_CONNECT%%libexec/apache24/mod_proxy_connect.so	174	%%PROXY_CONNECT%%libexec/apache24/mod_proxy_connect.so
174	%%MOD_PROXY_EXPRESS%%libexec/apache24/mod_proxy_express.so	175	%%PROXY_EXPRESS%%libexec/apache24/mod_proxy_express.so
175	%%MOD_PROXY_FCGI%%libexec/apache24/mod_proxy_fcgi.so	176	%%PROXY_FCGI%%libexec/apache24/mod_proxy_fcgi.so
176	%%MOD_PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so	177	%%PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so
177	%%MOD_PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so	178	%%PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so
178	%%MOD_PROXY_HTML%%libexec/apache24/mod_proxy_html.so	179	%%PROXY_HTML%%libexec/apache24/mod_proxy_html.so
179	%%MOD_PROXY_HCHECK%%libexec/apache24/mod_proxy_hcheck.so	180	%%PROXY_HCHECK%%libexec/apache24/mod_proxy_hcheck.so
180	%%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so	181	%%PROXY_HTTP%%libexec/apache24/mod_proxy_http.so
181	%%MOD_PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so	182	%%PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so
182	%%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so	183	%%PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so
183	%%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so	184	%%PROXY_UWSGI%%libexec/apache24/mod_proxy_uwsgi.so
184	%%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so	185	%%PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so
185	%%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so	186	%%RATELIMIT%%libexec/apache24/mod_ratelimit.so
186	%%MOD_REMOTEIP%%libexec/apache24/mod_remoteip.so	187	%%REFLECTOR%%libexec/apache24/mod_reflector.so
187	%%MOD_REQTIMEOUT%%libexec/apache24/mod_reqtimeout.so	188	%%REMOTEIP%%libexec/apache24/mod_remoteip.so
188	%%MOD_REQUEST%%libexec/apache24/mod_request.so	189	%%REQTIMEOUT%%libexec/apache24/mod_reqtimeout.so
189	%%MOD_REWRITE%%libexec/apache24/mod_rewrite.so	190	%%REQUEST%%libexec/apache24/mod_request.so
190	%%MOD_SED%%libexec/apache24/mod_sed.so	191	%%REWRITE%%libexec/apache24/mod_rewrite.so
191	%%MOD_SESSION%%libexec/apache24/mod_session.so	192	%%SED%%libexec/apache24/mod_sed.so
192	%%MOD_SESSION_COOKIE%%libexec/apache24/mod_session_cookie.so	193	%%SESSION%%libexec/apache24/mod_session.so
193	%%MOD_SESSION_CRYPTO%%libexec/apache24/mod_session_crypto.so	194	%%SESSION_COOKIE%%libexec/apache24/mod_session_cookie.so
194	%%MOD_SESSION_DBD%%libexec/apache24/mod_session_dbd.so	195	%%SESSION_CRYPTO%%libexec/apache24/mod_session_crypto.so
195	%%MOD_SETENVIF%%libexec/apache24/mod_setenvif.so	196	%%SESSION_DBD%%libexec/apache24/mod_session_dbd.so
196	%%MOD_SLOTMEM_PLAIN%%libexec/apache24/mod_slotmem_plain.so	197	%%SETENVIF%%libexec/apache24/mod_setenvif.so
197	%%MOD_SLOTMEM_SHM%%libexec/apache24/mod_slotmem_shm.so	198	%%SLOTMEM_PLAIN%%libexec/apache24/mod_slotmem_plain.so
198	%%MOD_SOCACHE_DBM%%libexec/apache24/mod_socache_dbm.so	199	%%SLOTMEM_SHM%%libexec/apache24/mod_slotmem_shm.so
199	%%MOD_SOCACHE_DC%%libexec/apache24/mod_socache_dc.so	200	%%SOCACHE_DBM%%libexec/apache24/mod_socache_dbm.so
200	%%MOD_SOCACHE_MEMCACHE%%libexec/apache24/mod_socache_memcache.so	201	%%SOCACHE_DC%%libexec/apache24/mod_socache_dc.so
201	%%MOD_SOCACHE_SHMCB%%libexec/apache24/mod_socache_shmcb.so	202	%%SOCACHE_MEMCACHE%%libexec/apache24/mod_socache_memcache.so
202	%%MOD_SPELING%%libexec/apache24/mod_speling.so	203	%%SOCACHE_SHMCB%%libexec/apache24/mod_socache_shmcb.so
203	%%MOD_SSL%%libexec/apache24/mod_ssl.so	204	%%SPELING%%libexec/apache24/mod_speling.so
204	%%MOD_STATUS%%libexec/apache24/mod_status.so	205	%%SSL%%libexec/apache24/mod_ssl.so
205	%%MOD_SUBSTITUTE%%libexec/apache24/mod_substitute.so	206	%%STATUS%%libexec/apache24/mod_status.so
206	%%MOD_SUEXEC%%libexec/apache24/mod_suexec.so	207	%%SUBSTITUTE%%libexec/apache24/mod_substitute.so
207	%%MOD_UNIQUE_ID%%libexec/apache24/mod_unique_id.so	208	%%SUEXEC%%libexec/apache24/mod_suexec.so
		209	%%UNIQUE_ID%%libexec/apache24/mod_unique_id.so
208	libexec/apache24/mod_unixd.so	210	libexec/apache24/mod_unixd.so
209	%%MOD_USERDIR%%libexec/apache24/mod_userdir.so	211	%%USERDIR%%libexec/apache24/mod_userdir.so
210	%%MOD_USERTRACK%%libexec/apache24/mod_usertrack.so	212	%%USERTRACK%%libexec/apache24/mod_usertrack.so
211	%%MOD_VERSION%%libexec/apache24/mod_version.so	213	%%VERSION%%libexec/apache24/mod_version.so
212	%%MOD_VHOST_ALIAS%%libexec/apache24/mod_vhost_alias.so	214	%%VHOST_ALIAS%%libexec/apache24/mod_vhost_alias.so
213	%%MOD_WATCHDOG%%libexec/apache24/mod_watchdog.so	215	%%WATCHDOG%%libexec/apache24/mod_watchdog.so
214	%%MOD_XML2ENC%%libexec/apache24/mod_xml2enc.so	216	%%XML2ENC%%libexec/apache24/mod_xml2enc.so
215	man/man1/ab.1.gz	217	man/man1/ab.1.gz
216	man/man1/apxs.1.gz	218	man/man1/apxs.1.gz
217	man/man1/dbmmanage.1.gz	219	man/man1/dbmmanage.1.gz
Lines 251-256 Link Here
251	%%DATADIR%%/misc/index.html	253	%%DATADIR%%/misc/index.html
252	@postexec [ -f %D/%%WWWDIR%%/data/index.html ] \|\| cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html	254	@postexec [ -f %D/%%WWWDIR%%/data/index.html ] \|\| cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html
253	@(,,0400) %%WWWDIR%%/cgi-bin/printenv	255	@(,,0400) %%WWWDIR%%/cgi-bin/printenv
		256	@comment %%WWWDIR%%/cgi-bin/printenv.vbs
		257	@comment %%WWWDIR%%/cgi-bin/printenv.wsf
254	@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi	258	@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi
255	%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var	259	%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var
256	%%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var	260	%%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var

Lines 1-8 Link Here

(-)www/apache24/Makefile (-51 / +91 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= apache24	3	PORTNAME= apache24
4	PORTVERSION= 2.4.29	4	PORTVERSION= 2.4.33
5	PORTREVISION= 2
6	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
7	MASTER_SITES= APACHE_HTTPD	6	MASTER_SITES= APACHE_HTTPD
8	DISTNAME= httpd-${PORTVERSION}	7	DISTNAME= httpd-${PORTVERSION}
Lines 18-25 Link Here
18	libapr-1.so:devel/apr1 \	17	libapr-1.so:devel/apr1 \
19	libpcre.so:devel/pcre	18	libpcre.so:devel/pcre
20		19
21	CONFLICTS_INSTALL= caudium14-1.* \	20	CONFLICTS_INSTALL= apache22-*
22	apache--2.2. apache22-*
23		21
24	USES= apache:server,2.4 autoreconf cpe iconv libtool perl5 tar:bzip2	22	USES= apache:server,2.4 autoreconf cpe iconv libtool perl5 tar:bzip2
25	USE_PERL5= run	23	USE_PERL5= run
Lines 42-64 Link Here
42	USERS= www	40	USERS= www
43	GROUPS= www	41	GROUPS= www
44		42
45	# for slave ports
46	.if !defined(MASTERDIR)
47	APACHEDIR= ${.CURDIR}
48	.else
49	APACHEDIR= ${MASTERDIR}
50	.endif
51
52	WITH_HTTP_PORT?= 80	43	WITH_HTTP_PORT?= 80
53	WITH_SSL_PORT?= 443	44	WITH_SSL_PORT?= 443
54		45
55	.if !defined(WITH_DEBUG)	46	.include "${.CURDIR}/Makefile.options"
56	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c	47	.include "${.CURDIR}/Makefile.options.desc"
57	.endif	48	OPTIONS_SUB= yes
58		49
59	.include "${APACHEDIR}/Makefile.options"
60	.include "${APACHEDIR}/Makefile.options.desc"
61
62	# IMPLIES	50	# IMPLIES
63	AUTHN_DBD_IMPLIES= DBD	51	AUTHN_DBD_IMPLIES= DBD
64	HEARTBEAT_IMPLIES= WATCHDOG STATUS	52	HEARTBEAT_IMPLIES= WATCHDOG STATUS
Lines 65-97 Link Here
65	HEARTMONITOR_IMPLIES= WATCHDOG STATUS	53	HEARTMONITOR_IMPLIES= WATCHDOG STATUS
66	LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR	54	LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR
67	PROXY_HCHECK_IMPLIES= WATCHDOG	55	PROXY_HCHECK_IMPLIES= WATCHDOG
		56	PROXY_HTTP2_IMPLIES= PROXY_BALANCER
		57	.for module in ${PROXY_ENABLED_MODULES:NPROXY} ${PROXY_DISABLED_MODULES}
		58	${module}_IMPLIES= PROXY
		59	.endfor
		60	.for module in ${SESSION_ENABLED_MODULES:NSESSION} ${SESSION_DISABLED_MODULES}
		61	${module}_IMPLIES= SESSION
		62	.endfor
68		63
69	# MPM	64	# Multi-Processing Modules options handling
70	MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork	65	MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork
71	MPM_WORKER_CONFIGURE_ON= --with-mpm=worker	66	MPM_WORKER_CONFIGURE_ON= --with-mpm=worker
72	MPM_EVENT_CONFIGURE_ON= --with-mpm=event	67	MPM_EVENT_CONFIGURE_ON= --with-mpm=event
		68	MPM_SHARED_CONFIGURE_ON= --enable-mpms-shared=all
		69	MPM_SHARED_SUB_LIST= MPM_FALLBACK_CHECK=""
		70	MPM_SHARED_SUB_LIST_OFF= MPM_FALLBACK_CHECK="\#"
73		71
74	AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap	72	AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap
75		73	BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE}
76	# http://httpd.apache.org/docs/2.4/bind.html
77	IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped
78
79	LDAP_CONFIGURE_ON= --enable-ldap=shared
80
81	BROTLI_CONFIGURE_ON= --with-brotli=${LOCALBASE}
82	BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli	74	BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli
83	HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}	75	HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}
84	HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2	76	HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
		77	IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped
		78	LDAP_CONFIGURE_ON= --enable-ldap=shared
85	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	79	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
86	LUA_CONFIGURE_WITH= lua	80	LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \
		81	LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
		82	LUA_CONFIGURE_WITH= lua=${LOCALBASE}
87	LUA_USES= lua	83	LUA_USES= lua
		84	MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \
		85	--with-jansson=${LOCALBASE} \
		86	--with-openssl=${OPENSSLBASE}
		87	MD_LIB_DEPENDS= libcurl.so:ftp/curl \
		88	libjansson.so:devel/jansson
		89	MD_USES= ssl
		90	PROXY_HTML_USE= GNOME=libxml2
88	PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}	91	PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}
89	PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2	92	PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
90	SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}	93	SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}
91	SOCACHE_DC_LIB_DEPENDS= libdistcache.so:security/distcache	94	SOCACHE_DC_LIB_DEPENDS= libdistcache.so:security/distcache
		95	XML2ENC_USE= GNOME=libxml2
92		96
93	# Note:	97	# Note: OpenSSL version (base/ports) depends how devel/apr1 was built
94	# OpenSSL version (base/ports) depends how devel/apr1 was build
95	# apu-1-config --(includes\|ldflags) and apr_rules.mk	98	# apu-1-config --(includes\|ldflags) and apr_rules.mk
96	SSL_CFLAGS= -I${OPENSSLINC}	99	SSL_CFLAGS= -I${OPENSSLINC}
97	SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}	100	SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
Lines 98-119 Link Here
98	SSL_LDFLAGS= -L${OPENSSLLIB}	101	SSL_LDFLAGS= -L${OPENSSLLIB}
99	SSL_USES= ssl	102	SSL_USES= ssl
100		103
101	.include <bsd.port.options.mk>
102	ETC_SUBDIRS= Includes envvars.d extra modules.d	104	ETC_SUBDIRS= Includes envvars.d extra modules.d
103		105
104	APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config	106	APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config
105	APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config	107	APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config
106
107	# APU modules used by AUTHN_DBD DBD
108	APU_DBD_MYSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_mysql.so
109	APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so
110	APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so
111	# APU module used by AUTHNZ_LDAP LDAP
112	APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so	108	APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so
113	# APU module used by SESSION_CRYPTO
114	APU_CRYPTO_OPENSSL?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_openssl.so	109	APU_CRYPTO_OPENSSL?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_openssl.so
115	APU_CRYPTO_NSS?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_nss.so	110	APU_CRYPTO_NSS?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_nss.so
116		111
		112	.include <bsd.port.pre.mk>
		113
117	PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}	114	PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
118		115
119	CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \	116	CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \
Lines 121-133 Link Here
121	--with-port=${WITH_HTTP_PORT} \	118	--with-port=${WITH_HTTP_PORT} \
122	--with-sslport=${WITH_SSL_PORT} \	119	--with-sslport=${WITH_SSL_PORT} \
123	--with-expat=${LOCALBASE} \	120	--with-expat=${LOCALBASE} \
124	--with-iconv=${ICONV_PREFIX} \
125	--enable-http \	121	--enable-http \
126	--with-pcre=${LOCALBASE} \	122	--with-pcre=${LOCALBASE} \
127	--with-apr=${APR_CONFIG} \	123	--with-apr=${APR_CONFIG} \
128	--with-apr-util=${APU_CONFIG}	124	--with-apr-util=${APU_CONFIG}
129		125
130	CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \	126	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" \
131	CONFIG_SHELL="${SH}"	127	CONFIG_SHELL="${SH}"
132		128
133	MAKE_ENV+= EXPR_COMPAT=yes \	129	MAKE_ENV+= EXPR_COMPAT=yes \
Lines 134-165 Link Here
134	INSTALL_MAN="${INSTALL_MAN}" \	130	INSTALL_MAN="${INSTALL_MAN}" \
135	DATADIR=${DATADIR}	131	DATADIR=${DATADIR}
136		132
		133	.for module in ${ALL_MODULES}
		134	.if ${PORT_OPTIONS:M${module}}
		135	CONFIGURE_ARGS+= --enable-${module:S/_/-/g:tl}
		136	.else
		137	CONFIGURE_ARGS+= --disable-${module:S/_/-/g:tl}
		138	.endif
		139	.endfor
		140
137	#=====================================================	141	#=====================================================
138	# CONFIGURE_ARGS will be handled in Makefile.modules,
139	# here we do only OPTIONS fixups	142	# here we do only OPTIONS fixups
140		143
141	.if ${PORT_OPTIONS:MLUA}	144	# Check for APR-util module exists
142	CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" \	145	.if exists(${APU_CONFIG})
143	LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"	146	. if (${PORT_OPTIONS:MLDAP} \|\| ${PORT_OPTIONS:MAUTHNZ_LDAP}) && !exists(${APU_LDAP})
		147	IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\
		148	Please rebuild APR with LDAP support
		149	. endif
		150	. if ${PORT_OPTIONS:MSESSION_CRYPTO} && \
		151	!(exists(${APU_CRYPTO_OPENSSL}) \|\| exists(${APU_CRYPTO_NSS}))
		152	IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support build in.\
		153	Please rebuild APR with crypto openssl support
		154	. endif
		155	.endif # exists APU_CONFIG
		156
		157	.if ( ${PORT_OPTIONS:MAUTH_BASIC} \|\| ${PORT_OPTIONS:MAUTH_DIGEST} ) && \
		158	empty(PORT_OPTIONS:MAUTHN*)
		159	IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider
144	.endif	160	.endif
145		161
146	.if ${PORT_OPTIONS:MPROXY_HTML} \|\| ${PORT_OPTIONS:MXML2ENC}	162	.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
147	USE_GNOME= libxml2	163	IGNORE= AUTH_BASIC need at least one AUTHZ provider
148	.endif	164	.endif
149		165
150	.include <bsd.port.pre.mk>	166	# Non options-NG option handling
151	.include "${APACHEDIR}/Makefile.modules"	167	.if ${PORT_OPTIONS:MXML2ENC} \|\| ${PORT_OPTIONS:MPROXY_HTML}
		168	CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE}/include/libxml2
		169	.else
		170	CONFIGURE_ARGS+= --without-libxml2
		171	.endif
152		172
		173	# WITH_STATIC_SUPPORT, WITH_DEBUG, WITH_EXCEPTION_HOOK
		174	# Only to be used for special builds
		175	.if defined(WITH_STATIC_SUPPORT)
		176	CONFIGURE_ARGS+= --enable-static-support
		177	.endif
		178	.if defined(WITH_DEBUG)
		179	# debug overrides CFLAGS
		180	DEBUG_FLAGS?= -O0 -g -ggdb3
		181	CFLAGS= ${DEBUG_FLAGS}
		182	CONFIGURE_ARGS+= --enable-maintainer-mode
		183	WITH_EXCEPTION_HOOK= yes
		184	.else
		185	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c
		186	.endif
		187	.if defined(WITH_EXCEPTION_HOOK)
		188	CONFIGURE_ARGS+= --enable-exception-hook
		189	.endif
		190
153	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 &&\	191	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 &&\
154	${PORT_OPTIONS:MHTTP2} && ${OPENSSLBASE} == /usr	192	${PORT_OPTIONS:MHTTP2} && ${OPENSSLBASE} == /usr
155	SUB_FILES+= pkg-message	193	SUB_FILES+= pkg-message
156	.endif	194	.endif
157		195
		196	pre-extract-SUEXEC-on:
		197	@${ECHO_CMD} ""
		198	@${ECHO_CMD} "suexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default,"
		199	@${ECHO_CMD} "use SUEXEC_DOCROOT and SUEXEC_USERDIR in /etc/make.conf to adjust."
		200	@${ECHO_CMD} ""
		201
158	post-extract:	202	post-extract:
159	# remove possible leftover .svn directories in the sources
160	@${FIND} ${WRKSRC} -type d -name .svn -print \| ${XARGS} ${RM} -r
161	# limit grep results ...
162	@${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
163	# make sure the configure script contains our patches, preserve the original script for comparsion	203	# make sure the configure script contains our patches, preserve the original script for comparsion
164	-${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream	204	-${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream
165		205
Lines 183-189 Link Here
183	@${ECHO_MSG} " You can check your modules configuration by using make show-modules"	223	@${ECHO_MSG} " You can check your modules configuration by using make show-modules"
184	@${ECHO_MSG} ""	224	@${ECHO_MSG} ""
185	# silence autotools	225	# silence autotools
186	-${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac	226	-@${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac 2>/dev/null
187		227
188	post-configure:	228	post-configure:
189	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers\| ${TR} -s "\n" " "` ;\	229	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers\| ${TR} -s "\n" " "` ;\

Lines 1-90 Link Here

(-)www/apache24/Makefile.modules (-90 lines)
1	# $FreeBSD$
2	#
3	# =============================================
4	# Maintainer note for OPTION handling:
5	# To set additional option use
6	# PORT_OPTIONS+=
7	# To set / unset an OPTION, even the OPTION is set / unset in OPTIONS_FILE use
8	# WITH="MODULE1 MODULE2 ..." or WITHOUT="MODULE1 MODULE2 ..."
9
10	.if defined(_PREMKINCLUDED)
11
12	# check if APR-util module exists
13	.if exists(${APU_CONFIG})
14	. if ${PORT_OPTIONS:MLDAP} \|\| ${PORT_OPTIONS:MAUTHNZ_LDAP}
15	. if !exists(${APU_LDAP})
16	IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\
17	Please rebuild APR with LDAP support
18	. endif
19	. endif
20
21	. if ${PORT_OPTIONS:MSESSION_CRYPTO}
22	. if !exists(${APU_CRYPTO_OPENSSL}) && !exists(${APU_CRYPTO_NSS})
23	IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support build in.\
24	Please rebuild APR with crypto openssl support
25	. endif
26	. endif
27
28	.endif # exists APU_CONFIG
29
30	# =============================================
31	.if ${PORT_OPTIONS:MMPM_SHARED}
32	SUB_LIST+= MPM_FALLBACK_CHECK=""
33	PLIST_SUB+= MPM_SHARED=""
34	CONFIGURE_ARGS+= --enable-mpms-shared=all
35	.else
36	SUB_LIST+= MPM_FALLBACK_CHECK="\#"
37	PLIST_SUB+= MPM_SHARED="@comment "
38	.endif
39
40	# =============================================
41	# build develop/example modules only with additional confirmation
42	.for DEVMOD in ${EXAMPLE_MODULES}
43	. if ${PORT_OPTIONS:M${DEVMOD}}
44	WITH_DEVMODS= yes
45	. endif
46	.endfor
47
48	.if defined(WITH_DEVMODS) && !defined(IAMADEVELOPER )
49	IGNORE= to build the develop/example modules specify -DIAMADEVELOPER on the command line.\
50	Do not use the this modules in production environment
51	.endif
52
53	# The next three params are not converted to an option,
54	# they should be used only for special builds.
55	.if defined(WITH_STATIC_SUPPORT)
56	CONFIGURE_ARGS+= --enable-static-support
57	.endif
58
59	# debug overrides CFLAGS
60	.if defined(WITH_DEBUG)
61	DEBUG_FLAGS?= -O0 -g -ggdb3
62	CFLAGS= ${DEBUG_FLAGS}
63	CONFIGURE_ARGS+= --enable-maintainer-mode
64	WITH_EXCEPTION_HOOK= yes
65	.endif
66
67	.if defined(WITH_EXCEPTION_HOOK)
68	CONFIGURE_ARGS+= --enable-exception-hook
69	.endif
70
71	.if ( ${PORT_OPTIONS:MAUTH_BASIC} \|\| ${PORT_OPTIONS:MAUTH_DIGEST} ) && \
72	empty(PORT_OPTIONS:MAUTHN*)
73	IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider
74	.endif
75
76	.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
77	IGNORE= AUTH_BASIC need at least one AUTHZ provider
78	.endif
79
80	.if ${PORT_OPTIONS:MXML2ENC} \|\| ${PORT_OPTIONS:MPROXY_HTML}
81	CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE}/include/libxml2
82	.else
83	CONFIGURE_ARGS+= --without-libxml2
84	.endif
85
86	.if ${PORT_OPTIONS:MPROXY_HTTP2} && !${PORT_OPTIONS:MPROXY_BALANCER}
87	IGNORE= PROXY_HTTP2 requires PROXY_BALANCER
88	.endif
89
90	.endif # _PREMKINCLUDED

Lines 11-18 Link Here

(-)www/apache24/Makefile.options (-19 / +18 lines)
11		11
12	# mod_proxy_html and xml2enc depending on libxml2	12	# mod_proxy_html and xml2enc depending on libxml2
13	PROXY_ENABLED_MODULES= \	13	PROXY_ENABLED_MODULES= \
14	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI PROXY_HTTP2 \	14	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
15	PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL	15	PROXY_HTTP2 PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP \
		16	PROXY_SCGI PROXY_UWSGI PROXY_WSTUNNEL
16		17
17	PROXY_DISABLED_MODULES=	18	PROXY_DISABLED_MODULES=
18		19
Lines 53-84 Link Here
53	VERSION VHOST_ALIAS \	54	VERSION VHOST_ALIAS \
54	WATCHDOG XML2ENC	55	WATCHDOG XML2ENC
55		56
56	MOST_DISABLED_MODULES:= \	57	MOST_DISABLED_MODULES= \
57	AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SUEXEC	58	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SUEXEC
58		59
59	# enable/disable additional PROXY/SESSION modules	60	# enable/disable additional PROXY/SESSION modules
60	META_MODULES= PROXY SESSION	61	META_MODULES= PROXY SESSION
61		62
62	ALL_MODULES_CATEGORIES= \
63	MOST_ENABLED MOST_DISABLED MULTI \
64	PROXY_ENABLED PROXY_DISABLED \
65	SESSION_ENABLED SESSION_DISABLED \
66	META EXAMPLE
67
68	ADDITIONAL_OPT= LUAJIT IPV4_MAPPED	63	ADDITIONAL_OPT= LUAJIT IPV4_MAPPED
69		64
70	# ===================================================================================	65	# ===================================================================================
71	#NO_OPTIONS_SORT= yes
72		66
73	OPTIONS_MULTI:= ${META_MODULES}	67	OPTIONS_MULTI= ${META_MODULES}
74	OPTIONS_MULTI_PROXY:= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}	68	OPTIONS_MULTI_PROXY= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
75	OPTIONS_MULTI_SESSION:= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}	69	OPTIONS_MULTI_SESSION= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}
76		70
77	OPTIONS_GROUP= EXAMPLE	71	OPTIONS_GROUP= EXAMPLE
78	OPTIONS_GROUP_EXAMPLE:= ${EXAMPLE_MODULES}	72	OPTIONS_GROUP_EXAMPLE= ${EXAMPLE_MODULES}
79		73
80	OPTIONS_RADIO= SHARED_MPM	74	OPTIONS_RADIO= MPM_SHARED
81	OPTIONS_RADIO_SHARED_MPM= MPM_SHARED	75	OPTIONS_RADIO_MPM_SHARED= MPM_SHARED
82		76
83	OPTIONS_SINGLE= DEFAULT_MPM	77	OPTIONS_SINGLE= DEFAULT_MPM
84	OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT	78	OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT
Lines 85-97 Link Here
85		79
86	# ===================================================================================	80	# ===================================================================================
87		81
88	OPTIONS_DEFINE:= \	82	ALL_MODULES= ${MOST_ENABLED_MODULES} ${MOST_DISABLED_MODULES} \
		83	${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES} \
		84	${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES} \
		85	${EXAMPLE_MODULES} ${META_MODULES}
		86
		87	OPTIONS_DEFINE= \
89	${MOST_ENABLED_MODULES} \	88	${MOST_ENABLED_MODULES} \
90	${MOST_DISABLED_MODULES}\	89	${MOST_DISABLED_MODULES}\
91	${ADDITIONAL_OPT} \	90	${ADDITIONAL_OPT} \
92	${OPTIONS_MULTI}	91	${OPTIONS_MULTI}
93		92
94	OPTIONS_DEFAULT:= \	93	OPTIONS_DEFAULT= \
95	${MOST_ENABLED_MODULES} \	94	${MOST_ENABLED_MODULES} \
96	${OPTIONS_MULTI} \	95	${OPTIONS_MULTI} \
97	${SESSION_ENABLED_MODULES} \	96	${SESSION_ENABLED_MODULES} \

Lines 22-41 Link Here

(-)www/apache24/Makefile.options.desc (-14 / +2 lines)
22	LUAJIT_DESC= LuaJit Support	22	LUAJIT_DESC= LuaJit Support
23		23
24	# =====================================	24	# =====================================
25	# static support (tbd)
26	STATIC_AB_DESC= static linked ab
27	STATIC_CHECKGID_DESC= static linked checkgid
28	STATIC_FCGISTARTER_DESC= static linked fcgistarter
29	STATIC_HTCACHECLEAN_DESC= static linked htcacheclean
30	STATIC_HTDBM_DESC= static linked htdbm
31	STATIC_HTDIGEST_DESC= static linked htdigest
32	STATIC_HTPASSWD_DESC= static linked htpasswd
33	STATIC_HTTXT2DBM_DESC= static linked httxt2dbm
34	STATIC_LOGRESOLVE_DESC= static linked logresolve
35	STATIC_ROTATELOGS_DESC= static linked rotatelogs
36	STATIC_SUPPORT_DESC= static linked support binaries
37
38	# =====================================
39	# modules	25	# modules
40	# DESC from modules/*/config.m4 files	26	# DESC from modules/*/config.m4 files
41	ACCESS_COMPAT_DESC= mod_access compatibility	27	ACCESS_COMPAT_DESC= mod_access compatibility
Lines 119-124 Link Here
119	LUA_DESC= Apache Lua Framework	105	LUA_DESC= Apache Lua Framework
120		106
121	MACRO_DESC= Define and use macros in configuration files	107	MACRO_DESC= Define and use macros in configuration files
		108	MD_DESC= Managing domains across virtual hosts, certificate provisioning via the ACME protocol
122	MIME_DESC= Mapp file-ext. to MIME (recommended)	109	MIME_DESC= Mapp file-ext. to MIME (recommended)
123	MIME_MAGIC_DESC= Automagically determining MIME type	110	MIME_MAGIC_DESC= Automagically determining MIME type
124		111
Lines 142-147 Link Here
142	PROXY_HTTP_DESC= HTTP support module for mod_proxy	129	PROXY_HTTP_DESC= HTTP support module for mod_proxy
143	PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c	130	PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c
144	PROXY_SCGI_DESC= SCGI gateway module for mod_proxy	131	PROXY_SCGI_DESC= SCGI gateway module for mod_proxy
		132	PROXY_UWSGI_DESC= UWSGI gateway module for mod_proxy
145	PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy	133	PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy
146		134
147	RATELIMIT_DESC= Output Bandwidth Limiting	135	RATELIMIT_DESC= Output Bandwidth Limiting

Lines 1-23 Link Here

(-)www/apache24/files/patch-configure.in (-18 lines)
1	--- configure.in.orig 2016-12-02 11:36:06 UTC	1	--- configure.in.orig 2016-12-02 11:36:06 UTC
2	+++ configure.in	2	+++ configure.in
3	@@ -111,7 +111,7 @@ fi
4
5	if test "$apr_found" = "reconfig"; then
6	APR_SUBDIR_CONFIG(srclib/apr,
7	- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
8	+ [$apache_apr_flags --prefix=$prefix],
9	[--enable-layout=\|\'--enable-layout=])
10	dnl We must be the first to build and the last to be cleaned
11	AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
12	@@ -177,7 +177,7 @@ esac
13
14	if test "$apu_found" = "reconfig"; then
15	APR_SUBDIR_CONFIG(srclib/apr-util,
16	- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
17	+ [--with-apr=../apr --prefix=$prefix],
18	[--enable-layout=\|\'--enable-layout=])
19	dnl We must be the last to build and the first to be cleaned
20	AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
21	@@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre	3	@@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre
22	[Root directory of the Apache install area])	4	[Root directory of the Apache install area])
23	AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",	5	AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",