Index: branches/2019Q2/www/apache24/Makefile =================================================================== --- branches/2019Q2/www/apache24/Makefile (revision 497943) +++ branches/2019Q2/www/apache24/Makefile (revision 497944) @@ -1,238 +1,240 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.38 +PORTVERSION= 2.4.39 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache24 MAINTAINER= apache@FreeBSD.org COMMENT= Version 2.4.x of Apache web server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 \ libapr-1.so:devel/apr1 \ libpcre.so:devel/pcre USES= apache:server,2.4 autoreconf cpe iconv libtool perl5 tar:bzip2 USE_PERL5= run USE_RC_SUBR= apache24 htcacheclean GNU_CONFIGURE= yes CPE_VENDOR= apache CPE_PRODUCT= http_server PORTDOCS= * SUB_FILES= pkg-install pkg-deinstall # Fallback MPM after switching from static to modular MPM SUB_LIST+= MPMF="000_mpm_prefork_fallback.conf" USERS= www GROUPS= www .include "${.CURDIR}/Makefile.options" .include "${.CURDIR}/Makefile.options.desc" OPTIONS_SUB= yes # 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} BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} \ --with-ssl=${OPENSSLBASE} HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 HTTP2_USES= ssl 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-ssl=${OPENSSLBASE} MD_LIB_DEPENDS= libcurl.so:ftp/curl \ libjansson.so:devel/jansson MD_USES= ssl PROXY_HTML_USE= GNOME=libxml2 +PROXY_HTML_USES= gnome 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 # Note: OpenSSL version (base/ports) depends how devel/apr1 was built # apu-1-config --(includes|ldflags) and apr_rules.mk SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} SSL_USES= ssl XML2ENC_USE= GNOME=libxml2 +XML2ENC_USES= gnome ETC_SUBDIRS= Includes envvars.d extra modules.d APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so 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 PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ --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}=shared .else CONFIGURE_ARGS+= --disable-${module:S/_/-/g:tl} .endif .endfor #===================================================== # 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 built 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 needs 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 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: # make sure the configure script contains our patches, preserve the original script for comparsion -${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream # make stage-qa script happy, it complains on empty dirs even 'PORTDOCS=*' is set # use RMDIR in case upstream ever place some files into this directories .for d in xsl/util xsl lang -${RMDIR} ${WRKSRC}/docs/manual/style/${d} .endfor post-patch: ${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' ${WRKSRC}/server/core.c ${REINPLACE_CMD} -e 's|logs/error_log|/var/log/httpd-error.log|' \ ${WRKSRC}/include/httpd.h ${REINPLACE_CMD} -e 's|perlbin=.*|perlbin=${PERL}|' \ ${WRKSRC}/configure.in ${RM} ${WRKSRC}/docs/docroot/*.bak ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual pre-configure:: # silence autotools -@${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac 2>/dev/null post-configure: @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$${FTPUSERS}," \ ${WRKSRC}/docs/conf/extra/httpd-userdir.conf ${REINPLACE_CMD} -e "/EXTRA_LDFLAGS/s|-L/usr/lib||g" ${WRKSRC}/build/config_vars.mk ${REINPLACE_CMD} -e "s,%%WWWOWN%%,${WWWOWN}," -e "s,%%WWWGRP%%,${WWWGRP}," \ ${WRKSRC}/docs/conf/httpd.conf ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ # place for 3rd party module configuration ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${ETCDIR}/modules.d/ # strip returns an error for non binary files, but we have a big mix -${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* 2>/dev/null -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache24/mod_*.so post-install-LOG_FORENSIC-on: ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin # maintainer only, check for new modules modlist: extract @${AWK} '/: checking whether to enable mod_/ \ {printf "%%%%%s%%%%libexec/apache24/%s.so\n", \ toupper($$8), $$8}' ${WRKSRC}/configure.upstream \ | ${TR} -d '"' \ | ${SORT} -u \ | ${GREP} -E -v '^%%MOD_(HTTP|ISAPI|LOG_CONFIG|PRIVILEGES|SO|UNIXD)%%' .include Index: branches/2019Q2/www/apache24/Makefile.options =================================================================== --- branches/2019Q2/www/apache24/Makefile.options (revision 497943) +++ branches/2019Q2/www/apache24/Makefile.options (revision 497944) @@ -1,100 +1,100 @@ # $FreeBSD$ # =========================================================== # Only the most important modules are enabled per default in # httpd.conf, therfore build all modules not depending on other # ports, marked as example or developer module. # # Required modules without OPTION: # UNIXD LOG_CONFIG # 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= # SESSION_CRYPTO need APR build with crypto (EVP support in APR) SESSION_ENABLED_MODULES= \ SESSION_COOKIE SESSION_CRYPTO SESSION_DBD SESSION_DISABLED_MODULES= EXAMPLE_MODULES= \ BUCKETEER CASE_FILTER CASE_FILTER_IN ECHO EXAMPLE_HOOKS EXAMPLE_IPC \ OPTIONAL_FN_EXPORT OPTIONAL_FN_IMPORT OPTIONAL_HOOK_EXPORT \ OPTIONAL_HOOK_IMPORT MOST_ENABLED_MODULES= \ ACCESS_COMPAT ACTIONS ALIAS ALLOWMETHODS ASIS \ AUTHN_ANON AUTHN_CORE AUTHN_DBD AUTHN_DBM AUTHN_FILE AUTHN_SOCACHE \ AUTHZ_CORE AUTHZ_DBD AUTHZ_DBM AUTHNZ_FCGI AUTHZ_GROUPFILE AUTHZ_HOST \ AUTHZ_OWNER AUTHZ_USER \ AUTH_BASIC AUTH_DIGEST AUTH_FORM AUTOINDEX \ BUFFER \ CACHE CACHE_DISK CACHE_SOCACHE CERN_META CGI CGID \ CHARSET_LITE \ DATA DAV DAV_FS DAV_LOCK DBD DEFLATE DIALUP DIR DUMPIO \ ENV EXPIRES EXT_FILTER \ FILE_CACHE FILTER \ HEADERS HEARTBEAT HEARTMONITOR HTTP2 \ IMAGEMAP INCLUDE INFO \ LBMETHOD_BYBUSYNESS LBMETHOD_BYREQUESTS LBMETHOD_BYTRAFFIC \ LBMETHOD_HEARTBEAT LOGIO LOG_DEBUG LOG_FORENSIC \ MACRO MIME MIME_MAGIC \ NEGOTIATION \ RATELIMIT REFLECTOR REMOTEIP REQTIMEOUT REQUEST REWRITE \ SED SETENVIF \ SLOTMEM_PLAIN SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB \ SPELING SSL STATUS SUBSTITUTE \ UNIQUE_ID USERDIR USERTRACK \ VERSION VHOST_ALIAS \ WATCHDOG XML2ENC MOST_DISABLED_MODULES= \ - AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SUEXEC + AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SOCACHE_REDIS SUEXEC # enable/disable additional PROXY/SESSION modules META_MODULES= PROXY SESSION ADDITIONAL_OPT= LUAJIT IPV4_MAPPED # =================================================================================== 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= \ DOCS \ ${MOST_ENABLED_MODULES} \ ${MOST_DISABLED_MODULES}\ ${ADDITIONAL_OPT} \ ${OPTIONS_MULTI} OPTIONS_DEFAULT= \ ${MOST_ENABLED_MODULES} \ ${OPTIONS_MULTI} \ ${SESSION_ENABLED_MODULES} \ ${PROXY_ENABLED_MODULES} \ MPM_SHARED \ MPM_PREFORK Index: branches/2019Q2/www/apache24/Makefile.options.desc =================================================================== --- branches/2019Q2/www/apache24/Makefile.options.desc (revision 497943) +++ branches/2019Q2/www/apache24/Makefile.options.desc (revision 497944) @@ -1,170 +1,171 @@ # $FreeBSD$ # vim: syntax=make ts=8 noet # ===================================== # OPTIONS HEADING PROXY_DESC= Build enabled PROXY modules SESSION_DESC= Build enabled SESSION modules DEFAULT_MPM_DESC= The default MPM module SHARED_MPM_DESC= Build all MPMs as shared Module EXAMPLE_DESC= Example and devel modules (do not use in prod) # ===================================== # MPMs MPM_SHARED_DESC= all MPMs as loadable module MPM_PREFORK_DESC= non-threaded, pre-forking web server MPM_WORKER_DESC= hybrid multi-threaded multi-process web server MPM_EVENT_DESC= MPM worker variant with the goal of consuming threads only for connections with active processing # ===================================== # additional (no modules) IPV4_MAPPED_DESC= Allow IPv6 sockets to handle IPv4 connections LUAJIT_DESC= LuaJit Support # ===================================== # modules # DESC from modules/*/config.m4 files ACCESS_COMPAT_DESC= mod_access compatibility ACTIONS_DESC= Action triggering on requests ALIAS_DESC= Mapping of requests to different filesystem parts ALLOWMETHODS_DESC= Restrict allowed HTTP methods ASIS_DESC= Sends files that contain their own HTTP headers AUTHNZ_FCGI_DESC= FastCGI authorizer-based authentication and authorization AUTHNZ_LDAP_DESC= LDAP based authentication AUTHN_ANON_DESC= Anonymous user authentication control AUTHN_CORE_DESC= Core authentication module AUTHN_DBD_DESC= SQL-based authentication control AUTHN_DBM_DESC= DBM-based authentication control AUTHN_FILE_DESC= File-based authentication control AUTHN_SOCACHE_DESC= Cached authentication control AUTHZ_CORE_DESC= Core authorization provider vector module AUTHZ_DBD_DESC= SQL based authorization and Login/Session support AUTHZ_DBM_DESC= DBM-based authorization control AUTHZ_GROUPFILE_DESC= "require group" authorization control AUTHZ_HOST_DESC= Host-based authorization control AUTHZ_OWNER_DESC= "require file-owner" authorization control AUTHZ_USER_DESC= "require user" authorization control AUTH_BASIC_DESC= Basic authentication AUTH_DIGEST_DESC= RFC2617 Digest authentication AUTH_FORM_DESC= Form authentication AUTOINDEX_DESC= Directory listing BROTLI_DESC= Brotli compression support BUCKETEER_DESC= (dev) buckets manipulation filter BUFFER_DESC= Filter Buffering CACHE_DESC= Dynamic file caching CACHE_DISK_DESC= Disk caching module CACHE_SOCACHE_DESC= Shared object cacheing module CASE_FILTER_DESC= (dev) example uppercase conversion filter CASE_FILTER_IN_DESC= (dev) example uppercase conversion input filter CERN_META_DESC= CERN-type meta files CGID_DESC= CGI scripts (threaded MPMs) CGI_DESC= CGI scripts (non-threaded MPMs) CHARSET_LITE_DESC= Character set translation. Enabled by default only on EBCDIC systems DATA_DESC= RFC2397 data encoder DAV_DESC= WebDAV protocol handling. --enable-dav also enables mod_dav_fs DAV_FS_DESC= DAV provider for the filesystem. --enable-dav also enables mod_dav_fs DAV_LOCK_DESC= DAV provider for generic locking DBD_DESC= Apache DBD Framework DEFLATE_DESC= Deflate transfer encoding support DIALUP_DESC= Rate limits static files to dialup modem speeds DIR_DESC= Directory request handling DUMPIO_DESC= I/O dump filter ECHO_DESC= (dev) example echo server ENV_DESC= Clearing/setting of ENV vars EXAMPLE_HOOKS_DESC= (dev) example hook callback handler module EXAMPLE_IPC_DESC= (dev) example of shared memory and mutex usage EXPIRES_DESC= Expires header control EXT_FILTER_DESC= External filter module FILE_CACHE_DESC= File cache FILTER_DESC= Smart Filtering HEADERS_DESC= HTTP header control HEARTBEAT_DESC= Generates Heartbeats HEARTMONITOR_DESC= Collects Heartbeats HTTP2_DESC= HTTP/2 (RFC 7540) support IDENT_DESC= RFC 1413 ident lookups IMAGEMAP_DESC= Server-side imagemaps INCLUDE_DESC= Server-side includes INFO_DESC= Server information LBMETHOD_BYBUSYNESS_DESC= Apache proxy Load balancing by busyness LBMETHOD_BYREQUESTS_DESC= Apache proxy Load balancing by request counting LBMETHOD_BYTRAFFIC_DESC= Apache proxy Load balancing by traffic counting LBMETHOD_HEARTBEAT_DESC= Apache proxy Load balancing from Heartbeats LDAP_DESC= LDAP caching and connection pooling services LOGIO_DESC= Input and output logging LOG_CONFIG_DESC= logging configuration LOG_DEBUG_DESC= Configurable debug logging 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 NEGOTIATION_DESC= Content negotiation OPTIONAL_FN_EXPORT_DESC= (dev) example optional function exporter OPTIONAL_FN_IMPORT_DESC= (dev) example optional function importer OPTIONAL_HOOK_EXPORT_DESC= (dev) example optional hook exporter OPTIONAL_HOOK_IMPORT_DESC= (dev) example optional hook importer #PRIVILEGES_DESC= Per-virtualhost Unix UserIDs and enhanced security for Solaris PROXY_AJP_DESC= AJP support module for mod_proxy PROXY_BALANCER_DESC= mod_proxy extension for load balancing PROXY_CONNECT_DESC= mod_proxy extension for CONNECT request handling PROXY_EXPRESS_DESC= Dynamic mass reverse proxy extension for mod_proxy PROXY_FCGI_DESC= FastCGI support module for mod_proxy PROXY_FDPASS_DESC= fdpass external process support module for mod_proxy PROXY_FTP_DESC= FTP support module for mod_proxy PROXY_HCHECK_DESC= Dynamic health check of Balancer members (workers) for mod_proxy 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 REFLECTOR_DESC= Reflect request through the output filter stack REMOTEIP_DESC= Translate header contents to an apparent client remote_ip REQTIMEOUT_DESC= Limit time waiting for request from client REQUEST_DESC= Request Body Filtering REWRITE_DESC= Rule based URL manipulation SED_DESC= Filter request and/or response bodies through sed SESSION_COOKIE_DESC= Session cookie module SESSION_CRYPTO_DESC= Session crypto module SESSION_DBD_DESC= Session dbd module SETENVIF_DESC= Modify ENV vars based on characteristics of the request SLOTMEM_PLAIN_DESC= Slotmem provider that uses plain memory SLOTMEM_SHM_DESC= Slotmem provider that uses shared memory SOCACHE_DBM_DESC= dbm small object cache provider SOCACHE_DC_DESC= distcache small object cache provider SOCACHE_MEMCACHE_DESC= memcache small object cache provider +SOCACHE_REDIS_DESC= Redis based shared object cache provider SOCACHE_SHMCB_DESC= shmcb small object cache provider SPELING_DESC= Correct common URL misspellings SSL_DESC= SSL/TLS support (mod_ssl) STATUS_DESC= Process/thread monitoring SUBSTITUTE_DESC= Response content rewrite-like filtering SUEXEC_DESC= Set uid and gid for spawned processes UNIQUE_ID_DESC= Per-request unique ids UNIXD_DESC= (required) security for Unix-family platforms USERDIR_DESC= Mapping of requests to user-specific directories USERTRACK_DESC= User-session tracking VERSION_DESC= Determining httpd version in config files VHOST_ALIAS_DESC= Mass virtual hosting WATCHDOG_DESC= Watchdog module XML2ENC_DESC= i18n support for markup filters Index: branches/2019Q2/www/apache24/distinfo =================================================================== --- branches/2019Q2/www/apache24/distinfo (revision 497943) +++ branches/2019Q2/www/apache24/distinfo (revision 497944) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548149918 -SHA256 (apache24/httpd-2.4.38.tar.bz2) = 7dc65857a994c98370dc4334b260101a7a04be60e6e74a5c57a6dee1bc8f394a -SIZE (apache24/httpd-2.4.38.tar.bz2) = 7035030 +TIMESTAMP = 1554189365 +SHA256 (apache24/httpd-2.4.39.tar.bz2) = b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 +SIZE (apache24/httpd-2.4.39.tar.bz2) = 7030539 Index: branches/2019Q2/www/apache24/pkg-plist =================================================================== --- branches/2019Q2/www/apache24/pkg-plist (revision 497943) +++ branches/2019Q2/www/apache24/pkg-plist (revision 497944) @@ -1,523 +1,524 @@ bin/ab bin/htdbm bin/htdigest bin/htpasswd bin/httxt2dbm bin/logresolve %%ETCDIR%%/Includes/no-accf.conf @sample %%ETCDIR%%/extra/httpd-autoindex.conf.sample @sample %%ETCDIR%%/extra/httpd-dav.conf.sample @sample %%ETCDIR%%/extra/httpd-default.conf.sample @sample %%ETCDIR%%/extra/httpd-info.conf.sample @sample %%ETCDIR%%/extra/httpd-languages.conf.sample @sample %%ETCDIR%%/extra/httpd-manual.conf.sample @sample %%ETCDIR%%/extra/httpd-mpm.conf.sample @sample %%ETCDIR%%/extra/httpd-multilang-errordoc.conf.sample @sample %%ETCDIR%%/extra/httpd-ssl.conf.sample @sample %%ETCDIR%%/extra/httpd-userdir.conf.sample @sample %%ETCDIR%%/extra/httpd-vhosts.conf.sample @sample %%ETCDIR%%/extra/proxy-html.conf.sample @sample %%ETCDIR%%/httpd.conf.sample @sample %%ETCDIR%%/magic.sample @sample %%ETCDIR%%/mime.types.sample %%ETCDIR%%/modules.d/README_modules.d include/apache24/ap_compat.h include/apache24/ap_config.h include/apache24/ap_config_auto.h include/apache24/ap_config_layout.h include/apache24/ap_expr.h include/apache24/ap_hooks.h include/apache24/ap_listen.h include/apache24/ap_mmn.h include/apache24/ap_mpm.h include/apache24/ap_provider.h include/apache24/ap_regex.h include/apache24/ap_regkey.h include/apache24/ap_release.h include/apache24/ap_slotmem.h include/apache24/ap_socache.h include/apache24/apache_noprobes.h include/apache24/cache_common.h include/apache24/heartbeat.h include/apache24/http_config.h include/apache24/http_connection.h include/apache24/http_core.h include/apache24/http_log.h include/apache24/http_main.h include/apache24/http_protocol.h include/apache24/http_request.h include/apache24/http_vhost.h include/apache24/httpd.h include/apache24/mod_auth.h include/apache24/mod_cache.h include/apache24/mod_cgi.h include/apache24/mod_core.h include/apache24/mod_dav.h include/apache24/mod_dbd.h include/apache24/mod_include.h include/apache24/mod_log_config.h include/apache24/mod_proxy.h include/apache24/mod_request.h include/apache24/mod_rewrite.h include/apache24/mod_session.h include/apache24/mod_so.h include/apache24/mod_ssl.h include/apache24/mod_ssl_openssl.h include/apache24/mod_status.h include/apache24/mod_unixd.h include/apache24/mod_watchdog.h include/apache24/mod_xml2enc.h include/apache24/mpm_common.h include/apache24/os.h include/apache24/scoreboard.h include/apache24/unixd.h include/apache24/util_cfgtree.h include/apache24/util_charset.h include/apache24/util_cookies.h include/apache24/util_ebcdic.h include/apache24/util_fcgi.h include/apache24/util_filter.h include/apache24/util_ldap.h include/apache24/util_md5.h include/apache24/util_mutex.h include/apache24/util_script.h include/apache24/util_time.h 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_REDIS%%libexec/apache24/mod_socache_redis.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 man/man1/htdbm.1.gz man/man1/htdigest.1.gz man/man1/htpasswd.1.gz man/man1/httxt2dbm.1.gz man/man1/logresolve.1.gz man/man8/apachectl.8.gz man/man8/fcgistarter.8.gz man/man8/htcacheclean.8.gz man/man8/httpd.8.gz man/man8/rotatelogs.8.gz man/man8/suexec.8.gz sbin/apachectl sbin/apxs %%LOG_FORENSIC%%sbin/check_forensic sbin/checkgid sbin/dbmmanage sbin/envvars sbin/fcgistarter sbin/htcacheclean sbin/httpd sbin/rotatelogs sbin/split-logfile %%SUEXEC%%@(,,4755) sbin/suexec %%DATADIR%%/build/config.nice %%DATADIR%%/build/config_vars.mk %%DATADIR%%/build/instdso.sh %%DATADIR%%/build/library.mk %%DATADIR%%/build/ltlib.mk %%DATADIR%%/build/mkdir.sh %%DATADIR%%/build/program.mk %%DATADIR%%/build/rules.mk %%DATADIR%%/build/special.mk @preunexec if cmp -s %D/%%WWWDIR%%/data/index.html %D/%%DATADIR%%/misc/index.html; then rm -f %D/%%WWWDIR%%/data/index.html; fi %%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 %%WWWDIR%%/error/HTTP_FORBIDDEN.html.var %%WWWDIR%%/error/HTTP_GONE.html.var %%WWWDIR%%/error/HTTP_INTERNAL_SERVER_ERROR.html.var %%WWWDIR%%/error/HTTP_LENGTH_REQUIRED.html.var %%WWWDIR%%/error/HTTP_METHOD_NOT_ALLOWED.html.var %%WWWDIR%%/error/HTTP_NOT_FOUND.html.var %%WWWDIR%%/error/HTTP_NOT_IMPLEMENTED.html.var %%WWWDIR%%/error/HTTP_PRECONDITION_FAILED.html.var %%WWWDIR%%/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var %%WWWDIR%%/error/HTTP_REQUEST_TIME_OUT.html.var %%WWWDIR%%/error/HTTP_REQUEST_URI_TOO_LARGE.html.var %%WWWDIR%%/error/HTTP_SERVICE_UNAVAILABLE.html.var %%WWWDIR%%/error/HTTP_UNAUTHORIZED.html.var %%WWWDIR%%/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var %%WWWDIR%%/error/HTTP_VARIANT_ALSO_VARIES.html.var %%WWWDIR%%/error/README %%WWWDIR%%/error/contact.html.var %%WWWDIR%%/error/include/bottom.html %%WWWDIR%%/error/include/spacer.html %%WWWDIR%%/error/include/top.html %%WWWDIR%%/icons/README %%WWWDIR%%/icons/README.html %%WWWDIR%%/icons/a.gif %%WWWDIR%%/icons/a.png %%WWWDIR%%/icons/alert.black.gif %%WWWDIR%%/icons/alert.black.png %%WWWDIR%%/icons/alert.red.gif %%WWWDIR%%/icons/alert.red.png %%WWWDIR%%/icons/apache_pb.gif %%WWWDIR%%/icons/apache_pb.png %%WWWDIR%%/icons/apache_pb.svg %%WWWDIR%%/icons/apache_pb2.gif %%WWWDIR%%/icons/apache_pb2.png %%WWWDIR%%/icons/back.gif %%WWWDIR%%/icons/back.png %%WWWDIR%%/icons/ball.gray.gif %%WWWDIR%%/icons/ball.gray.png %%WWWDIR%%/icons/ball.red.gif %%WWWDIR%%/icons/ball.red.png %%WWWDIR%%/icons/binary.gif %%WWWDIR%%/icons/binary.png %%WWWDIR%%/icons/binhex.gif %%WWWDIR%%/icons/binhex.png %%WWWDIR%%/icons/blank.gif %%WWWDIR%%/icons/blank.png %%WWWDIR%%/icons/bomb.gif %%WWWDIR%%/icons/bomb.png %%WWWDIR%%/icons/box1.gif %%WWWDIR%%/icons/box1.png %%WWWDIR%%/icons/box2.gif %%WWWDIR%%/icons/box2.png %%WWWDIR%%/icons/broken.gif %%WWWDIR%%/icons/broken.png %%WWWDIR%%/icons/burst.gif %%WWWDIR%%/icons/burst.png %%WWWDIR%%/icons/c.gif %%WWWDIR%%/icons/c.png %%WWWDIR%%/icons/comp.blue.gif %%WWWDIR%%/icons/comp.blue.png %%WWWDIR%%/icons/comp.gray.gif %%WWWDIR%%/icons/comp.gray.png %%WWWDIR%%/icons/compressed.gif %%WWWDIR%%/icons/compressed.png %%WWWDIR%%/icons/continued.gif %%WWWDIR%%/icons/continued.png %%WWWDIR%%/icons/dir.gif %%WWWDIR%%/icons/dir.png %%WWWDIR%%/icons/diskimg.gif %%WWWDIR%%/icons/diskimg.png %%WWWDIR%%/icons/down.gif %%WWWDIR%%/icons/down.png %%WWWDIR%%/icons/dvi.gif %%WWWDIR%%/icons/dvi.png %%WWWDIR%%/icons/f.gif %%WWWDIR%%/icons/f.png %%WWWDIR%%/icons/folder.gif %%WWWDIR%%/icons/folder.open.gif %%WWWDIR%%/icons/folder.open.png %%WWWDIR%%/icons/folder.png %%WWWDIR%%/icons/folder.sec.gif %%WWWDIR%%/icons/folder.sec.png %%WWWDIR%%/icons/forward.gif %%WWWDIR%%/icons/forward.png %%WWWDIR%%/icons/generic.gif %%WWWDIR%%/icons/generic.png %%WWWDIR%%/icons/generic.red.gif %%WWWDIR%%/icons/generic.red.png %%WWWDIR%%/icons/generic.sec.gif %%WWWDIR%%/icons/generic.sec.png %%WWWDIR%%/icons/hand.right.gif %%WWWDIR%%/icons/hand.right.png %%WWWDIR%%/icons/hand.up.gif %%WWWDIR%%/icons/hand.up.png %%WWWDIR%%/icons/icon.sheet.gif %%WWWDIR%%/icons/icon.sheet.png %%WWWDIR%%/icons/image1.gif %%WWWDIR%%/icons/image1.png %%WWWDIR%%/icons/image2.gif %%WWWDIR%%/icons/image2.png %%WWWDIR%%/icons/image3.gif %%WWWDIR%%/icons/image3.png %%WWWDIR%%/icons/index.gif %%WWWDIR%%/icons/index.png %%WWWDIR%%/icons/layout.gif %%WWWDIR%%/icons/layout.png %%WWWDIR%%/icons/left.gif %%WWWDIR%%/icons/left.png %%WWWDIR%%/icons/link.gif %%WWWDIR%%/icons/link.png %%WWWDIR%%/icons/movie.gif %%WWWDIR%%/icons/movie.png %%WWWDIR%%/icons/odf6odb.png %%WWWDIR%%/icons/odf6odc.png %%WWWDIR%%/icons/odf6odf.png %%WWWDIR%%/icons/odf6odg.png %%WWWDIR%%/icons/odf6odi.png %%WWWDIR%%/icons/odf6odm.png %%WWWDIR%%/icons/odf6odp.png %%WWWDIR%%/icons/odf6ods.png %%WWWDIR%%/icons/odf6odt.png %%WWWDIR%%/icons/odf6otc.png %%WWWDIR%%/icons/odf6otf.png %%WWWDIR%%/icons/odf6otg.png %%WWWDIR%%/icons/odf6oth.png %%WWWDIR%%/icons/odf6oti.png %%WWWDIR%%/icons/odf6otp.png %%WWWDIR%%/icons/odf6ots.png %%WWWDIR%%/icons/odf6ott.png %%WWWDIR%%/icons/p.gif %%WWWDIR%%/icons/p.png %%WWWDIR%%/icons/patch.gif %%WWWDIR%%/icons/patch.png %%WWWDIR%%/icons/pdf.gif %%WWWDIR%%/icons/pdf.png %%WWWDIR%%/icons/pie0.gif %%WWWDIR%%/icons/pie0.png %%WWWDIR%%/icons/pie1.gif %%WWWDIR%%/icons/pie1.png %%WWWDIR%%/icons/pie2.gif %%WWWDIR%%/icons/pie2.png %%WWWDIR%%/icons/pie3.gif %%WWWDIR%%/icons/pie3.png %%WWWDIR%%/icons/pie4.gif %%WWWDIR%%/icons/pie4.png %%WWWDIR%%/icons/pie5.gif %%WWWDIR%%/icons/pie5.png %%WWWDIR%%/icons/pie6.gif %%WWWDIR%%/icons/pie6.png %%WWWDIR%%/icons/pie7.gif %%WWWDIR%%/icons/pie7.png %%WWWDIR%%/icons/pie8.gif %%WWWDIR%%/icons/pie8.png %%WWWDIR%%/icons/portal.gif %%WWWDIR%%/icons/portal.png %%WWWDIR%%/icons/ps.gif %%WWWDIR%%/icons/ps.png %%WWWDIR%%/icons/quill.gif %%WWWDIR%%/icons/quill.png %%WWWDIR%%/icons/right.gif %%WWWDIR%%/icons/right.png %%WWWDIR%%/icons/screw1.gif %%WWWDIR%%/icons/screw1.png %%WWWDIR%%/icons/screw2.gif %%WWWDIR%%/icons/screw2.png %%WWWDIR%%/icons/script.gif %%WWWDIR%%/icons/script.png %%WWWDIR%%/icons/small/back.gif %%WWWDIR%%/icons/small/back.png %%WWWDIR%%/icons/small/binary.gif %%WWWDIR%%/icons/small/binary.png %%WWWDIR%%/icons/small/binhex.gif %%WWWDIR%%/icons/small/binhex.png %%WWWDIR%%/icons/small/blank.gif %%WWWDIR%%/icons/small/blank.png %%WWWDIR%%/icons/small/broken.gif %%WWWDIR%%/icons/small/broken.png %%WWWDIR%%/icons/small/burst.gif %%WWWDIR%%/icons/small/burst.png %%WWWDIR%%/icons/small/comp1.gif %%WWWDIR%%/icons/small/comp1.png %%WWWDIR%%/icons/small/comp2.gif %%WWWDIR%%/icons/small/comp2.png %%WWWDIR%%/icons/small/compressed.gif %%WWWDIR%%/icons/small/compressed.png %%WWWDIR%%/icons/small/continued.gif %%WWWDIR%%/icons/small/continued.png %%WWWDIR%%/icons/small/doc.gif %%WWWDIR%%/icons/small/doc.png %%WWWDIR%%/icons/small/folder.gif %%WWWDIR%%/icons/small/folder.png %%WWWDIR%%/icons/small/folder2.gif %%WWWDIR%%/icons/small/folder2.png %%WWWDIR%%/icons/small/forward.gif %%WWWDIR%%/icons/small/forward.png %%WWWDIR%%/icons/small/generic.gif %%WWWDIR%%/icons/small/generic.png %%WWWDIR%%/icons/small/generic2.gif %%WWWDIR%%/icons/small/generic2.png %%WWWDIR%%/icons/small/generic3.gif %%WWWDIR%%/icons/small/generic3.png %%WWWDIR%%/icons/small/image.gif %%WWWDIR%%/icons/small/image.png %%WWWDIR%%/icons/small/image2.gif %%WWWDIR%%/icons/small/image2.png %%WWWDIR%%/icons/small/index.gif %%WWWDIR%%/icons/small/index.png %%WWWDIR%%/icons/small/key.gif %%WWWDIR%%/icons/small/key.png %%WWWDIR%%/icons/small/movie.gif %%WWWDIR%%/icons/small/movie.png %%WWWDIR%%/icons/small/patch.gif %%WWWDIR%%/icons/small/patch.png %%WWWDIR%%/icons/small/ps.gif %%WWWDIR%%/icons/small/ps.png %%WWWDIR%%/icons/small/rainbow.gif %%WWWDIR%%/icons/small/rainbow.png %%WWWDIR%%/icons/small/sound.gif %%WWWDIR%%/icons/small/sound.png %%WWWDIR%%/icons/small/sound2.gif %%WWWDIR%%/icons/small/sound2.png %%WWWDIR%%/icons/small/tar.gif %%WWWDIR%%/icons/small/tar.png %%WWWDIR%%/icons/small/text.gif %%WWWDIR%%/icons/small/text.png %%WWWDIR%%/icons/small/transfer.gif %%WWWDIR%%/icons/small/transfer.png %%WWWDIR%%/icons/small/unknown.gif %%WWWDIR%%/icons/small/unknown.png %%WWWDIR%%/icons/small/uu.gif %%WWWDIR%%/icons/small/uu.png %%WWWDIR%%/icons/sound1.gif %%WWWDIR%%/icons/sound1.png %%WWWDIR%%/icons/sound2.gif %%WWWDIR%%/icons/sound2.png %%WWWDIR%%/icons/sphere1.gif %%WWWDIR%%/icons/sphere1.png %%WWWDIR%%/icons/sphere2.gif %%WWWDIR%%/icons/sphere2.png %%WWWDIR%%/icons/svg.png %%WWWDIR%%/icons/tar.gif %%WWWDIR%%/icons/tar.png %%WWWDIR%%/icons/tex.gif %%WWWDIR%%/icons/tex.png %%WWWDIR%%/icons/text.gif %%WWWDIR%%/icons/text.png %%WWWDIR%%/icons/transfer.gif %%WWWDIR%%/icons/transfer.png %%WWWDIR%%/icons/unknown.gif %%WWWDIR%%/icons/unknown.png %%WWWDIR%%/icons/up.gif %%WWWDIR%%/icons/up.png %%WWWDIR%%/icons/uu.gif %%WWWDIR%%/icons/uu.png %%WWWDIR%%/icons/uuencoded.gif %%WWWDIR%%/icons/uuencoded.png %%WWWDIR%%/icons/world1.gif %%WWWDIR%%/icons/world1.png %%WWWDIR%%/icons/world2.gif %%WWWDIR%%/icons/world2.png %%WWWDIR%%/icons/xml.png @preunexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true @dir %%ETCDIR%%/envvars.d @dir %%WWWDIR%%/data Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 497943) +++ branches/2019Q2 (revision 497944) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r497554