Index: head/www/apache24/Makefile =================================================================== --- head/www/apache24/Makefile (revision 399206) +++ head/www/apache24/Makefile (revision 399207) @@ -1,185 +1,192 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.16 -PORTREVISION= 1 +PORTVERSION= 2.4.17 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 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libapr-1.so:${PORTSDIR}/devel/apr1 \ libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS_INSTALL= caudium14-1.* \ apache-*-2.2.* apache22-* USE_APACHE= common24 USES= 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 +# XXX: before running makepatch please run the command +# `$SED -e 's/PATCH_PATH_SEPARATOR=/PATCH_PATH_SEPARATOR?=/' Mk/bsd.port.mk +PATCH_PATH_SEPARATOR= __ + # Fallback MPM after switching from static to modular MPM SUB_LIST+= MPMF="000_mpm_prefork_fallback.conf" USERS= www GROUPS= www # for slave ports .if !defined(MASTERDIR) APACHEDIR= ${.CURDIR} .else APACHEDIR= ${MASTERDIR} .endif WITH_HTTP_PORT?= 80 WITH_SSL_PORT?= 443 .include "${APACHEDIR}/Makefile.options" .include "${APACHEDIR}/Makefile.options.desc" AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap # http://httpd.apache.org/docs/2.4/bind.html IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped LDAP_CONFIGURE_ON= --enable-ldap=shared +HTTP2_LIB_DEPENDS= libnghttp2.so:${PORTSDIR}/www/nghttp2 LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit LUA_CONFIGURE_WITH= lua LUA_USES= lua SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE} SOCACHE_DC_LIB_DEPENDS= libdistcache.so:${PORTSDIR}/security/distcache # Note: # 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_USE= OPENSSL=yes .include 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 PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ --with-port=${WITH_HTTP_PORT} \ --with-sslport=${WITH_SSL_PORT} \ --with-expat=${LOCALBASE} \ --with-iconv=${ICONV_PREFIX} \ --enable-http \ --with-pcre=${LOCALBASE} \ --with-apr=${APR_CONFIG} \ --with-apr-util=${APU_CONFIG} -CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \ + CONFIG_SHELL="${SH}" MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" \ DATADIR=${DATADIR} #===================================================== # CONFIGURE_ARGS will be handled in Makefile.modules, # here we do only OPTIONS fixups .if ${PORT_OPTIONS:MLUA} CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" .endif .if ${PORT_OPTIONS:MPROXY_HTML} || ${PORT_OPTIONS:MXML2ENC} USE_GNOME= libxml2 .endif .include .include "${APACHEDIR}/Makefile.modules" -pre-configure:: - @${ECHO_MSG} "" - @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} "" - post-extract: # remove possible leftover .svn directories in the sources @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -rf # 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 # 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} -f ${WRKSRC}/docs/docroot/*.bak ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual + +pre-configure:: + @${ECHO_MSG} "" + @${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 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 "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 .if ${PORT_OPTIONS:MLOG_FORENSIC} ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin .endif # 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 \ | ${TR} -d '"' \ | ${SORT} -u \ | ${GREP} -E -v '^%%MOD_(HTTP|ISAPI|LOG_CONFIG|PRIVILEGES|SO|UNIXD)%%' .include Index: head/www/apache24/Makefile.options =================================================================== --- head/www/apache24/Makefile.options (revision 399206) +++ head/www/apache24/Makefile.options (revision 399207) @@ -1,103 +1,103 @@ # $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 PROXY_ENABLED_MODULES= \ PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \ PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL # mod_proxy_html depends on libxml2 PROXY_DISABLED_MODULES= \ PROXY_HTML # 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 \ 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 MOST_DISABLED_MODULES:= \ - AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC XML2ENC + AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC XML2ENC HTTP2 # XXX PROXY and SESSION are modules but also used to # 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= SHARED_MPM OPTIONS_RADIO_SHARED_MPM= MPM_SHARED OPTIONS_SINGLE= DEFAULT_MPM OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT # =================================================================================== OPTIONS_DEFINE:= \ ${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: head/www/apache24/Makefile.options.desc =================================================================== --- head/www/apache24/Makefile.options.desc (revision 399206) +++ head/www/apache24/Makefile.options.desc (revision 399207) @@ -1,178 +1,179 @@ # $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 # ===================================== # 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 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 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 (experimental) 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 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_HTML_DESC= Fix HTML Links in a Reverse Proxy PROXY_HTTP_DESC= HTTP support module for mod_proxy PROXY_SCGI_DESC= SCGI 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_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: head/www/apache24/distinfo =================================================================== --- head/www/apache24/distinfo (revision 399206) +++ head/www/apache24/distinfo (revision 399207) @@ -1,2 +1,2 @@ -SHA256 (apache24/httpd-2.4.16.tar.bz2) = ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 -SIZE (apache24/httpd-2.4.16.tar.bz2) = 5101005 +SHA256 (apache24/httpd-2.4.17.tar.bz2) = 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 +SIZE (apache24/httpd-2.4.17.tar.bz2) = 5157721 Index: head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c =================================================================== --- head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c (revision 399206) +++ head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c (nonexistent) @@ -1,18 +0,0 @@ -# libressl support -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196139 -# https://issues.apache.org/bugzilla/show_bug.cgi?id=57375 - ---- modules/ssl/ssl_util_ssl.c.orig 2015-01-12 13:31:16 UTC -+++ modules/ssl/ssl_util_ssl.c -@@ -473,7 +473,11 @@ EC_GROUP *ssl_ec_GetParamFromFile(const - * format, possibly followed by a sequence of CA certificates that - * should be sent to the peer in the SSL Certificate message. - */ -+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN - int SSL_CTX_use_certificate_chain( -+#else -+int _SSL_CTX_use_certificate_chain( -+#endif - SSL_CTX *ctx, char *file, int skipfirst, pem_password_cb *cb) - { - BIO *bio; Property changes on: head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.h =================================================================== --- head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.h (revision 399206) +++ head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.h (nonexistent) @@ -1,18 +0,0 @@ -# libressl support -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196139 -# https://issues.apache.org/bugzilla/show_bug.cgi?id=57375 - ---- modules/ssl/ssl_util_ssl.h.orig 2014-03-02 20:20:14 UTC -+++ modules/ssl/ssl_util_ssl.h -@@ -69,7 +69,11 @@ BOOL SSL_X509_getIDs(apr_pool_t * - BOOL SSL_X509_match_name(apr_pool_t *, X509 *, const char *, BOOL, server_rec *); - BOOL SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); - BOOL SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); -+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN - int SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *); -+#else -+int _SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *); -+#endif - char *SSL_SESSION_id2sz(unsigned char *, int, char *, int); - - #endif /* __SSL_UTIL_SSL_H__ */ Property changes on: head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/apache24/pkg-plist =================================================================== --- head/www/apache24/pkg-plist (revision 399206) +++ head/www/apache24/pkg-plist (revision 399207) @@ -1,514 +1,515 @@ 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_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 %%MOD_ACCESS_COMPAT%%libexec/apache24/mod_access_compat.so %%MOD_ACTIONS%%libexec/apache24/mod_actions.so %%MOD_ALIAS%%libexec/apache24/mod_alias.so %%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so %%MOD_ASIS%%libexec/apache24/mod_asis.so %%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so %%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so %%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so %%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so %%MOD_AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so %%MOD_AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so %%MOD_AUTHN_FILE%%libexec/apache24/mod_authn_file.so %%MOD_AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so %%MOD_AUTHZ_CORE%%libexec/apache24/mod_authz_core.so %%MOD_AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so %%MOD_AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so %%MOD_AUTHZ_GROUPFILE%%libexec/apache24/mod_authz_groupfile.so %%MOD_AUTHZ_HOST%%libexec/apache24/mod_authz_host.so %%MOD_AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so %%MOD_AUTHZ_USER%%libexec/apache24/mod_authz_user.so %%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so %%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so %%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so %%MOD_AUTOINDEX%%libexec/apache24/mod_autoindex.so %%MOD_BUCKETEER%%libexec/apache24/mod_bucketeer.so %%MOD_BUFFER%%libexec/apache24/mod_buffer.so %%MOD_CACHE%%libexec/apache24/mod_cache.so %%MOD_CACHE_DISK%%libexec/apache24/mod_cache_disk.so %%MOD_CACHE_SOCACHE%%libexec/apache24/mod_cache_socache.so %%MOD_CASE_FILTER%%libexec/apache24/mod_case_filter.so %%MOD_CASE_FILTER_IN%%libexec/apache24/mod_case_filter_in.so %%MOD_CERN_META%%libexec/apache24/mod_cern_meta.so %%MOD_CGI%%libexec/apache24/mod_cgi.so %%MOD_CGID%%libexec/apache24/mod_cgid.so %%MOD_CHARSET_LITE%%libexec/apache24/mod_charset_lite.so %%MOD_DATA%%libexec/apache24/mod_data.so %%MOD_DAV%%libexec/apache24/mod_dav.so %%MOD_DAV_FS%%libexec/apache24/mod_dav_fs.so %%MOD_DAV_LOCK%%libexec/apache24/mod_dav_lock.so %%MOD_DBD%%libexec/apache24/mod_dbd.so %%MOD_DEFLATE%%libexec/apache24/mod_deflate.so %%MOD_DIALUP%%libexec/apache24/mod_dialup.so %%MOD_DIR%%libexec/apache24/mod_dir.so %%MOD_DUMPIO%%libexec/apache24/mod_dumpio.so %%MOD_ECHO%%libexec/apache24/mod_echo.so %%MOD_ENV%%libexec/apache24/mod_env.so %%MOD_EXAMPLE_HOOKS%%libexec/apache24/mod_example_hooks.so %%MOD_EXAMPLE_IPC%%libexec/apache24/mod_example_ipc.so %%MOD_EXPIRES%%libexec/apache24/mod_expires.so %%MOD_EXT_FILTER%%libexec/apache24/mod_ext_filter.so %%MOD_FILE_CACHE%%libexec/apache24/mod_file_cache.so %%MOD_FILTER%%libexec/apache24/mod_filter.so %%MOD_HEADERS%%libexec/apache24/mod_headers.so %%MOD_HEARTBEAT%%libexec/apache24/mod_heartbeat.so %%MOD_HEARTMONITOR%%libexec/apache24/mod_heartmonitor.so +%%MOD_HTTP2%%libexec/apache24/mod_http2.so %%MOD_IDENT%%libexec/apache24/mod_ident.so %%MOD_IMAGEMAP%%libexec/apache24/mod_imagemap.so %%MOD_INCLUDE%%libexec/apache24/mod_include.so %%MOD_INFO%%libexec/apache24/mod_info.so %%MOD_LBMETHOD_BYBUSYNESS%%libexec/apache24/mod_lbmethod_bybusyness.so %%MOD_LBMETHOD_BYREQUESTS%%libexec/apache24/mod_lbmethod_byrequests.so %%MOD_LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so %%MOD_LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so %%MOD_LDAP%%libexec/apache24/mod_ldap.so %%MOD_LOGIO%%libexec/apache24/mod_logio.so libexec/apache24/mod_log_config.so %%MOD_LOG_DEBUG%%libexec/apache24/mod_log_debug.so %%MOD_LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so %%MOD_LUA%%libexec/apache24/mod_lua.so %%MOD_MACRO%%libexec/apache24/mod_macro.so %%MOD_MIME%%libexec/apache24/mod_mime.so %%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so %%MPM_SHARED%%libexec/apache24/mod_mpm_event.so %%MPM_SHARED%%libexec/apache24/mod_mpm_prefork.so %%MPM_SHARED%%libexec/apache24/mod_mpm_worker.so %%MOD_NEGOTIATION%%libexec/apache24/mod_negotiation.so %%MOD_OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so %%MOD_OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so %%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache24/mod_optional_hook_export.so %%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache24/mod_optional_hook_import.so %%MOD_PROXY%%libexec/apache24/mod_proxy.so %%MOD_PROXY_AJP%%libexec/apache24/mod_proxy_ajp.so %%MOD_PROXY_BALANCER%%libexec/apache24/mod_proxy_balancer.so %%MOD_PROXY_CONNECT%%libexec/apache24/mod_proxy_connect.so %%MOD_PROXY_EXPRESS%%libexec/apache24/mod_proxy_express.so %%MOD_PROXY_FCGI%%libexec/apache24/mod_proxy_fcgi.so %%MOD_PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so %%MOD_PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so %%MOD_PROXY_HTML%%libexec/apache24/mod_proxy_html.so %%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so %%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so %%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so %%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so %%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so %%MOD_REMOTEIP%%libexec/apache24/mod_remoteip.so %%MOD_REQTIMEOUT%%libexec/apache24/mod_reqtimeout.so %%MOD_REQUEST%%libexec/apache24/mod_request.so %%MOD_REWRITE%%libexec/apache24/mod_rewrite.so %%MOD_SED%%libexec/apache24/mod_sed.so %%MOD_SESSION%%libexec/apache24/mod_session.so %%MOD_SESSION_COOKIE%%libexec/apache24/mod_session_cookie.so %%MOD_SESSION_CRYPTO%%libexec/apache24/mod_session_crypto.so %%MOD_SESSION_DBD%%libexec/apache24/mod_session_dbd.so %%MOD_SETENVIF%%libexec/apache24/mod_setenvif.so %%MOD_SLOTMEM_PLAIN%%libexec/apache24/mod_slotmem_plain.so %%MOD_SLOTMEM_SHM%%libexec/apache24/mod_slotmem_shm.so %%MOD_SOCACHE_DBM%%libexec/apache24/mod_socache_dbm.so %%MOD_SOCACHE_DC%%libexec/apache24/mod_socache_dc.so %%MOD_SOCACHE_MEMCACHE%%libexec/apache24/mod_socache_memcache.so %%MOD_SOCACHE_SHMCB%%libexec/apache24/mod_socache_shmcb.so %%MOD_SPELING%%libexec/apache24/mod_speling.so %%MOD_SSL%%libexec/apache24/mod_ssl.so %%MOD_STATUS%%libexec/apache24/mod_status.so %%MOD_SUBSTITUTE%%libexec/apache24/mod_substitute.so %%MOD_SUEXEC%%libexec/apache24/mod_suexec.so %%MOD_UNIQUE_ID%%libexec/apache24/mod_unique_id.so libexec/apache24/mod_unixd.so %%MOD_USERDIR%%libexec/apache24/mod_userdir.so %%MOD_USERTRACK%%libexec/apache24/mod_usertrack.so %%MOD_VERSION%%libexec/apache24/mod_version.so %%MOD_VHOST_ALIAS%%libexec/apache24/mod_vhost_alias.so %%MOD_WATCHDOG%%libexec/apache24/mod_watchdog.so %%MOD_XML2ENC%%libexec/apache24/mod_xml2enc.so 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 %%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 @unexec 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 @exec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html @(,,0400) %%WWWDIR%%/cgi-bin/printenv @(,,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 @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true @dir %%ETCDIR%%/envvars.d @dir %%WWWDIR%%/data