Index: head/www/apache24/Makefile =================================================================== --- head/www/apache24/Makefile (revision 378214) +++ head/www/apache24/Makefile (revision 378215) @@ -1,180 +1,185 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.10 -PORTREVISION= 2 +PORTVERSION= 2.4.12 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_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= tar:bzip2 iconv perl5 libtool cpe USE_PERL5= run USE_AUTOTOOLS= autoconf USE_RC_SUBR= apache24 htcacheclean 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 # 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 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= CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" \ - EXAMPLESDIR=${EXAMPLESDIR} + 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' \) -delete + @${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 qa script happy, it complains on empty dirs even 'PORTDOCS=*' is set -# use RMDIR in case upstream ever place some files into this dirs +# 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 -# IPv4_mapping fix: https://issues.apache.org/bugzilla/show_bug.cgi?id=53824 - @${REINPLACE_CMD} -e 's|freebsd5|freebsd|' \ - -e 's|^perlbin=.*|perlbin=${PERL}|' \ - ${WRKSRC}/configure.in ${WRKSRC}/configure - @${RM} -f ${WRKSRC}/docs/docroot/*.bak + ${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 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 + ${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/ - @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d - ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${EXAMPLESDIR}/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.modules =================================================================== --- head/www/apache24/Makefile.modules (revision 378214) +++ head/www/apache24/Makefile.modules (revision 378215) @@ -1,127 +1,129 @@ # $FreeBSD$ # # Note by Clement Laforet: (to generate PLIST_SUB entries for modules) # gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp # mv tmp pkg-plist # # ============================================= # Maintainer note for OPTION handling: # To set additional option use # PORT_OPTIONS+= # To unset an OPTION, even the OPTION is set in OPTIONSFILE use # WITHOUT_MODULES+= # Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected # if the OPTION is enabled by the user, therefore we calculate # them in bsd.apache.mk with help of WITHOUT_MODULES # The other methode is to set IGNORE's and force the user to adjust OPTIONS .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 build with shared MPM the last module will be activated # see apache issue 53882 # XXX in case we use OPTIONS for MPM # we do not have a WITH_MPM variable .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 .if ${PORT_OPTIONS:MMPM_PREFORK} CONFIGURE_ARGS+= --with-mpm=prefork .elif ${PORT_OPTIONS:MMPM_WORKER} CONFIGURE_ARGS+= --with-mpm=worker .elif ${PORT_OPTIONS:MMPM_EVENT} CONFIGURE_ARGS+= --with-mpm=event .else IGNORE= Unknown MPM: .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 # watchdog modules .if ! ${PORT_OPTIONS:MWATCHDOG} || ! ${PORT_OPTIONS:MSTATUS} . if ${PORT_OPTIONS:MHEARTBEAT} IGNORE= HEARTBEAT requires WATCHDOG and STATUS . elif ${PORT_OPTIONS:MHEARTMONITOR} IGNORE= HEARTMONITOR requires WATCHDOG and STATUS . endif .endif .if ${PORT_OPTIONS:MLBMETHOD_HEARTBEAT} && ! ${PORT_OPTIONS:MHEARTMONITOR} IGNORE= LBMETHOD_HEARTBEAT requires WATCHDOG, STATUS and HEARTMONITOR .endif .if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} . if !${APACHE_MODULES:MAUTHN*} IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider . endif .endif . if ${PORT_OPTIONS:MAUTHN_DBD} && ! ${PORT_OPTIONS:MDBD} IGNORE= AUTHN_DBD requires DBD . endif .if ${PORT_OPTIONS:MAUTH_BASIC} . if !${APACHE_MODULES:MAUTHZ*} IGNORE= AUTH_BASIC need at least one AUTHZ provider . endif .endif .if ${PORT_OPTIONS:MXML2ENC} || ${PORT_OPTIONS:MPROXY_HTML} CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE}/include/libxml2 .else CONFIGURE_ARGS+= --without-libxml2 .endif .endif # _PREMKINCLUDED Index: head/www/apache24/Makefile.options =================================================================== --- head/www/apache24/Makefile.options (revision 378214) +++ head/www/apache24/Makefile.options (revision 378215) @@ -1,108 +1,103 @@ # $FreeBSD$ # =========================================================== -# The list of modules are no longer classified in CATEGORIES. -# We use for enabled/disabled now the resulting modules from -# configure --enable-modules=most +# 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_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL + PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL +# mod_proxy_html depends on libxml2 PROXY_DISABLED_MODULES= \ - PROXY_FDPASS PROXY_HTML + 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= -HEARTBEAT_MODULES= \ - HEARTBEAT HEARTMONITOR LBMETHOD_HEARTBEAT - EXAMPLE_MODULES= \ - CASE_FILTER CASE_FILTER_IN ECHO EXAMPLE_HOOKS EXAMPLE_IPC \ + BUCKETEER CASE_FILTER CASE_FILTER_IN ECHO EXAMPLE_HOOKS EXAMPLE_IPC \ OPTIONAL_FN_EXPORT OPTIONAL_FN_IMPORT OPTIONAL_HOOK_EXPORT \ OPTIONAL_HOOK_IMPORT -DEV_MODULES= BUCKETEER - 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 AUTHZ_GROUPFILE AUTHZ_HOST \ + 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 CGI CGID \ - DAV DAV_FS DBD DEFLATE DIR DUMPIO \ + 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 \ + HEADERS HEARTBEAT HEARTMONITOR \ IMAGEMAP INCLUDE INFO \ LBMETHOD_BYBUSYNESS LBMETHOD_BYREQUESTS LBMETHOD_BYTRAFFIC \ - LOGIO LOG_DEBUG \ + LBMETHOD_HEARTBEAT LOGIO LOG_DEBUG LOG_FORENSIC \ MACRO MIME MIME_MAGIC \ NEGOTIATION \ - RATELIMIT REMOTEIP REQTIMEOUT REQUEST REWRITE \ - SED SETENVIF SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB SPELING \ - SSL STATUS SUBSTITUTE \ - UNIQUE_ID USERDIR \ - VERSION VHOST_ALIAS + 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 AUTHNZ_FCGI LDAP CERN_META CHARSET_LITE DATA DAV_LOCK DIALUP IDENT \ - LOG_FORENSIC LUA REFLECTOR SLOTMEM_PLAIN SOCACHE_DC SUEXEC USERTRACK \ - XML2ENC WATCHDOG ${HEARTBEAT_MODULES} ${EXAMPLE_MODULES} ${DEV_MODULES} + AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC XML2ENC -#MULTI_MODULES:= ${OPTIONS_MULTI} - # 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 + META EXAMPLE -#STATIC= STATIC_AB STATIC_CHECKGID STATIC_FCGISTARTER STATIC_HTCACHECLEAN \ -# STATIC_HTDBM STATIC_HTDIGEST STATIC_HTPASSWD STATIC_HTTXT2DBM \ -# STATIC_LOGRESOLVE STATIC_ROTATELOGS STATIC_SUPPORT - ADDITIONAL_OPT= LUAJIT IPV4_MAPPED # =================================================================================== -NO_OPTIONS_SORT= yes +#NO_OPTIONS_SORT= yes -OPTIONS_MULTI= ${META_MODULES} +OPTIONS_MULTI:= ${META_MODULES} OPTIONS_MULTI_PROXY:= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES} OPTIONS_MULTI_SESSION:= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES} +OPTIONS_GROUP= EXAMPLE +OPTIONS_GROUP_EXAMPLE:= ${EXAMPLE_MODULES} + OPTIONS_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 378214) +++ head/www/apache24/Makefile.options.desc (revision 378215) @@ -1,177 +1,178 @@ # $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 +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 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 378214) +++ head/www/apache24/distinfo (revision 378215) @@ -1,2 +1,2 @@ -SHA256 (apache24/httpd-2.4.10.tar.bz2) = 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a -SIZE (apache24/httpd-2.4.10.tar.bz2) = 5031834 +SHA256 (apache24/httpd-2.4.12.tar.bz2) = ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 +SIZE (apache24/httpd-2.4.12.tar.bz2) = 5054838 Index: head/www/apache24/files/patch-r1611744-modules__lua__lua_request.c =================================================================== --- head/www/apache24/files/patch-r1611744-modules__lua__lua_request.c (revision 378214) +++ head/www/apache24/files/patch-r1611744-modules__lua__lua_request.c (nonexistent) @@ -1,22 +0,0 @@ -backport for mod_lua: Don't quote values in cookies; Make IE happy again [#56734] -http://svn.apache.org/viewvc?view=revision&revision=1611744 - - ---- ./modules/lua/lua_request.c.orig 2014-07-20 10:48:19.000000000 +0200 -+++ ./modules/lua/lua_request.c 2014-07-20 10:48:46.000000000 +0200 -@@ -2086,13 +2086,13 @@ - if (expires > 0) { - rv = apr_rfc822_date(cdate, apr_time_from_sec(expires)); - if (rv == APR_SUCCESS) { -- strexpires = apr_psprintf(r->pool, "Expires=\"%s\";", cdate); -+ strexpires = apr_psprintf(r->pool, "Expires=%s;", cdate); - } - } - - /* Create path segment */ - if (path != NULL && strlen(path) > 0) { -- strpath = apr_psprintf(r->pool, "Path=\"%s\";", path); -+ strpath = apr_psprintf(r->pool, "Path=%s;", path); - } - - /* Create domain segment */ Property changes on: head/www/apache24/files/patch-r1611744-modules__lua__lua_request.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-Makefile.in =================================================================== --- head/www/apache24/files/patch-Makefile.in (revision 378214) +++ head/www/apache24/files/patch-Makefile.in (revision 378215) @@ -1,107 +1,144 @@ ---- ./Makefile.in.orig 2012-12-17 12:50:41.000000000 +0100 -+++ ./Makefile.in 2014-07-08 06:27:38.000000000 +0200 -@@ -32,12 +32,10 @@ +--- Makefile.in.orig 2012-12-17 11:50:41 UTC ++++ Makefile.in +@@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk install-conf: @echo Installing configuration files @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra - @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra -+ @$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra @cd $(top_srcdir)/docs/conf; \ for i in mime.types magic; do \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ - fi; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/$${i}.sample; \ done; \ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ -@@ -78,15 +76,12 @@ +@@ -58,6 +55,16 @@ install-conf: -e 's#@@SSLPort@@#$(SSLPORT)#g' \ + -e 'p' \ < $$i; \ ++ if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \ ++ have_cgi="1"; \ ++ else \ ++ have_cgi="0"; \ ++ fi; \ ++ if echo " $(DSO_MODULES) "|$(EGREP) " cgid " > /dev/null ; then \ ++ have_cgid="1"; \ ++ else \ ++ have_cgid="0"; \ ++ fi; \ + for j in $(DSO_MODULES) "^EOL^"; do \ + if test $$j != "^EOL^"; then \ + if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \ +@@ -68,8 +75,18 @@ install-conf: + if test "$(LOAD_ALL_MODULES)" = "yes"; then \ + loading_disabled=""; \ + fi; \ +- echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ +- fi; \ ++ if test $$j = "cgid" -a "$$have_cgi" = "1"; then \ ++ echo ""; \ ++ echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ ++ echo ""; \ ++ elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \ ++ echo ""; \ ++ echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ ++ echo ""; \ ++ else \ ++ echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ ++ fi; \ ++ fi; \ + done; \ + sed -e '1,/@@LoadModule@@/d' \ + -e '/@@LoadModule@@/d' \ +@@ -78,15 +95,12 @@ install-conf: + -e 's#@@SSLPort@@#$(SSLPORT)#g' \ + < $$i; \ fi \ - ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ - chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ -+ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \ -+ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ ++ ) > $(DESTDIR)$(sysconfdir)/$${i}.sample; \ ++ chmod 0644 $(DESTDIR)$(sysconfdir)/$${i}.sample; \ file=$$i; \ if [ "$$i" = "httpd.conf" ]; then \ file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ fi; \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ - $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ - fi; \ fi; \ done ; \ done ; \ -@@ -137,48 +132,25 @@ +@@ -137,48 +151,25 @@ dox: doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: - -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ - echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ - else \ - echo Installing HTML documents ; \ + @echo Installing HTML documents ; \ $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ - if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ - $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ - else \ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ - cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi; \ - fi -+ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ -+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) || true ++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/misc ; \ ++ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(DATADIR)/misc) || true install-error: - -@if [ -d $(DESTDIR)$(errordir) ]; then \ - echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ - else \ - echo Installing error documents ; \ + @echo Installing error documents ; \ $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ - test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; install-icons: - -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ - echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ - else \ - echo Installing icons ; \ + @echo Installing icons ; \ $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ - test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; install-cgi: - -@if [ -d $(DESTDIR)$(cgidir) ];then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ - else \ - echo Installing CGIs ; \ + @echo Installing CGIs ; \ $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ - test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -231,12 +203,7 @@ +@@ -231,12 +222,7 @@ install-man: @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 - @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ - $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ - else \ - cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ - cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) install-suexec: @if test -f $(builddir)/support/suexec; then \ Index: head/www/apache24/files/patch-acinclude.m4 =================================================================== --- head/www/apache24/files/patch-acinclude.m4 (nonexistent) +++ head/www/apache24/files/patch-acinclude.m4 (revision 378215) @@ -0,0 +1,24 @@ +--- acinclude.m4.orig 2014-01-05 08:37:21 UTC ++++ acinclude.m4 +@@ -267,9 +267,10 @@ DISTCLEAN_TARGETS = modules.mk + static = + shared = $libname + EOF ++ dnl https://issues.apache.org/bugzilla/show_bug.cgi?id=53882 ++ DSO_MODULES="$DSO_MODULES mpm_$1" + # add default MPM to LoadModule list + if test $1 = $default_mpm; then +- DSO_MODULES="$DSO_MODULES mpm_$1" + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1" + fi + fi +@@ -576,7 +577,8 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[ + liberrors="" + AC_CHECK_HEADERS([openssl/engine.h]) + AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"]) +- AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines]) ++ dnl PR 196139, https://issues.apache.org/bugzilla/show_bug.cgi?id=57375 ++ AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines SSL_CTX_use_certificate_chain RAND_egd]) + if test "x$liberrors" != "x"; then + AC_MSG_WARN([OpenSSL libraries are unusable]) + fi Property changes on: head/www/apache24/files/patch-acinclude.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/files/patch-config.layout =================================================================== --- head/www/apache24/files/patch-config.layout (revision 378214) +++ head/www/apache24/files/patch-config.layout (revision 378215) @@ -1,26 +1,26 @@ ---- ./config.layout.orig 2012-04-17 16:01:41.000000000 +0200 -+++ ./config.layout 2013-03-22 18:55:53.000000000 +0100 +--- config.layout.orig 2012-04-17 14:01:41 UTC ++++ config.layout @@ -257,17 +257,17 @@ bindir: ${exec_prefix}/bin sbindir: ${exec_prefix}/sbin libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec/apache2 + libexecdir: ${exec_prefix}/libexec/apache24 mandir: ${prefix}/man - sysconfdir: ${prefix}/etc/apache2 - datadir: ${prefix}/www - installbuilddir: ${prefix}/share/apache2/build + sysconfdir: ${prefix}/etc/apache24 + datadir: ${prefix}/www/apache24 + installbuilddir: ${prefix}/share/apache24/build errordir: ${datadir}/error iconsdir: ${datadir}/icons htdocsdir: ${datadir}/data - manualdir: ${prefix}/share/doc/apache2 + manualdir: ${prefix}/share/doc/apache24 cgidir: ${datadir}/cgi-bin - includedir: ${prefix}/include/apache2 + includedir: ${prefix}/include/apache24 localstatedir: /var runtimedir: ${localstatedir}/run logfiledir: ${localstatedir}/log Index: head/www/apache24/files/patch-configure.in =================================================================== --- head/www/apache24/files/patch-configure.in (revision 378214) +++ head/www/apache24/files/patch-configure.in (revision 378215) @@ -1,35 +1,35 @@ ---- ./configure.in.orig 2013-01-09 17:39:05.000000000 +0100 -+++ ./configure.in 2013-03-22 18:55:53.000000000 +0100 -@@ -111,7 +111,7 @@ +--- configure.in.orig 2015-01-22 17:33:07 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 @@ +@@ -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" -@@ -822,8 +822,14 @@ +@@ -830,8 +830,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", [Location of the config file, relative to the Apache root directory]) +AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log", + [Location of error log file]) +AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status", + [Location of ScoreBoard file]) AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", [Location of the MIME types config file, relative to the Apache root directory]) +AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}", + [Location of document root]) perlbin=`$ac_aux_dir/PrintPath perl` if test "x$perlbin" = "x"; then Index: head/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in =================================================================== --- head/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in (revision 378214) +++ head/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in (revision 378215) @@ -1,9 +1,9 @@ ---- ./docs/conf/extra/httpd-autoindex.conf.in.orig 2010-06-15 13:05:13.000000000 +0200 -+++ ./docs/conf/extra/httpd-autoindex.conf.in 2013-03-22 18:55:53.000000000 +0100 -@@ -89,5 +89,5 @@ +--- docs/conf/extra/httpd-autoindex.conf.in.orig 2010-06-15 11:05:13 UTC ++++ docs/conf/extra/httpd-autoindex.conf.in +@@ -89,5 +89,5 @@ HeaderName HEADER.html # IndexIgnore is a set of filenames which directory indexing should ignore # and not include in the listing. Shell-style wildcarding is permitted. # -IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t *.bak *.orig Index: head/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in =================================================================== --- head/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in (revision 378214) +++ head/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in (revision 378215) @@ -1,22 +1,53 @@ ---- ./docs/conf/extra/httpd-ssl.conf.in.orig 2012-12-11 10:55:03.000000000 +0100 -+++ ./docs/conf/extra/httpd-ssl.conf.in 2013-03-22 18:55:53.000000000 +0100 -@@ -86,8 +86,8 @@ +--- docs/conf/extra/httpd-ssl.conf.in.orig 2015-01-31 12:20:34 UTC ++++ docs/conf/extra/httpd-ssl.conf.in +@@ -42,11 +42,30 @@ Listen @@SSLPort@@ + ## the main server and all SSL-enabled virtual hosts. + ## + ++## disable unsecure SSL protocols ++SSLProtocol ALL -SSLv2 -SSLv3 ++ + # SSL Cipher Suite: + # List the ciphers that the client is permitted to negotiate. + # See the mod_ssl documentation for a complete list. + SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5 + ++## The following entries can be used as suggestions, ++## for more information see: ++## - http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#sslciphersuite ++## - http://blog.ivanristic.com/2013/08/configuring-apache-nginx-and-openssl-for-forward-secrecy.html ++## ++## To test your SSL implementation use for example security/sslscan or for public reachable systems https://www.ssllabs.com/ ++ ++## sample for OpenSSL >= 1.0.x (with RC4) ++# SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS" ++ ++## sample for OpenSSL >= 1.0.x (keep support for IE8 on XP) ++# SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS +RC4 RC4" ++ ++## sample for OpenSSL >= 1.0.x (no RC4 support) ++# SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4" ++ + # Speed-optimized SSL Cipher configuration: + # If speed is your main concern (on busy HTTPS servers e.g.), + # you might want to force clients to specific, performance +@@ -105,8 +124,8 @@ SSLSessionCacheTimeout 300 DocumentRoot "@exp_htdocsdir@" ServerName www.example.com:@@SSLPort@@ ServerAdmin you@example.com -ErrorLog "@exp_logfiledir@/error_log" -TransferLog "@exp_logfiledir@/access_log" +ErrorLog "@exp_logfiledir@/httpd-error.log" +TransferLog "@exp_logfiledir@/httpd-access.log" # SSL Engine Switch: # Enable/Disable SSL for this virtual host. -@@ -246,7 +246,7 @@ +@@ -265,7 +284,7 @@ BrowserMatch "MSIE [2-5]" \ # Per-Server Logging: # The home of a custom SSL log file. Use this when you want a # compact non-error SSL logfile on a virtual host basis. -CustomLog "@exp_logfiledir@/ssl_request_log" \ +CustomLog "@exp_logfiledir@/httpd-ssl_request.log" \ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" Index: head/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in =================================================================== --- head/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in (revision 378214) +++ head/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in (revision 378215) @@ -1,11 +1,11 @@ ---- ./docs/conf/extra/httpd-userdir.conf.in.orig 2011-06-06 23:40:41.000000000 +0200 -+++ ./docs/conf/extra/httpd-userdir.conf.in 2013-03-22 18:55:53.000000000 +0100 +--- docs/conf/extra/httpd-userdir.conf.in.orig 2011-06-06 21:40:41 UTC ++++ docs/conf/extra/httpd-userdir.conf.in @@ -9,6 +9,8 @@ # UserDir public_html +UserDir disabled %%FTPUSERS%% + # # Control access to UserDir directories. The following is an example # for a site where these directories are restricted to read-only. Index: head/www/apache24/files/patch-docs__conf__httpd.conf.in =================================================================== --- head/www/apache24/files/patch-docs__conf__httpd.conf.in (revision 378214) +++ head/www/apache24/files/patch-docs__conf__httpd.conf.in (revision 378215) @@ -1,54 +1,54 @@ ---- ./docs/conf/httpd.conf.in.orig 2012-11-08 04:05:38.000000000 +0100 -+++ ./docs/conf/httpd.conf.in 2013-10-26 19:29:20.000000000 +0200 -@@ -65,6 +65,9 @@ +--- docs/conf/httpd.conf.in.orig 2012-11-08 03:05:38 UTC ++++ docs/conf/httpd.conf.in +@@ -65,6 +65,9 @@ Listen @@Port@@ # @@LoadModule@@ +# Third party modules +IncludeOptional @rel_sysconfdir@/modules.d/[0-9][0-9][0-9]_*.conf + # # If you wish httpd to run as a different user or group, you must run -@@ -74,8 +77,8 @@ +@@ -74,8 +77,8 @@ Listen @@Port@@ # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. # -User daemon -Group daemon +User %%WWWOWN%% +Group %%WWWGRP%% -@@ -181,7 +184,7 @@ +@@ -181,7 +184,7 @@ DocumentRoot "@exp_htdocsdir@" # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. # -ErrorLog "@rel_logfiledir@/error_log" +ErrorLog "@rel_logfiledir@/httpd-error.log" # # LogLevel: Control the number of messages logged to the error_log. -@@ -210,13 +213,13 @@ +@@ -210,13 +213,13 @@ LogLevel warn # define per- access logfiles, transactions will be # logged therein and *not* in this file. # - CustomLog "@rel_logfiledir@/access_log" common + CustomLog "@rel_logfiledir@/httpd-access.log" common # # If you prefer a logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # - #CustomLog "@rel_logfiledir@/access_log" combined + #CustomLog "@rel_logfiledir@/httpd-access.log" combined -@@ -418,3 +421,5 @@ +@@ -418,3 +421,5 @@ SSLRandomSeed connect builtin #RequestHeader unset DNT env=bad_DNT # +Include @rel_sysconfdir@/Includes/*.conf + Index: head/www/apache24/files/patch-include__ap_config_auto.h.in =================================================================== --- head/www/apache24/files/patch-include__ap_config_auto.h.in (nonexistent) +++ head/www/apache24/files/patch-include__ap_config_auto.h.in (revision 378215) @@ -0,0 +1,26 @@ +# libressl support +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196139 +# https://issues.apache.org/bugzilla/show_bug.cgi?id=57375 + +--- include/ap_config_auto.h.in.orig 2015-01-15 19:59:13 UTC ++++ include/ap_config_auto.h.in +@@ -130,6 +130,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_PWD_H + ++/* Define to 1 if you have the `RAND_egd' function. */ ++#undef HAVE_RAND_EGD ++ + /* Define to 1 if you have the `setsid' function. */ + #undef HAVE_SETSID + +@@ -139,6 +142,9 @@ + /* Define to 1 if you have the `SSL_CTX_new' function. */ + #undef HAVE_SSL_CTX_NEW + ++/* Define to 1 if you have the `SSL_CTX_use_certificate_chain' function. */ ++#undef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H + Property changes on: head/www/apache24/files/patch-include__ap_config_auto.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/files/patch-modules__ssl__ssl_engine_init.c =================================================================== --- head/www/apache24/files/patch-modules__ssl__ssl_engine_init.c (nonexistent) +++ head/www/apache24/files/patch-modules__ssl__ssl_engine_init.c (revision 378215) @@ -0,0 +1,31 @@ +# 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_engine_init.c.orig 2015-01-15 12:20:33 UTC ++++ modules/ssl/ssl_engine_init.c +@@ -353,9 +353,11 @@ apr_status_t ssl_init_Engine(server_rec + return ssl_die(s); + } + ++#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK + if (strEQ(mc->szCryptoDevice, "chil")) { + ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0); + } ++#endif + + if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889) +@@ -838,7 +840,11 @@ static apr_status_t ssl_init_ctx_cert_ch + } + } + +- n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx, ++#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN ++ n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx, ++#else ++ n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx, ++#endif + (char *)chain, + skip_first, NULL); + if (n < 0) { Property changes on: head/www/apache24/files/patch-modules__ssl__ssl_engine_init.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/files/patch-modules__ssl__ssl_engine_rand.c =================================================================== --- head/www/apache24/files/patch-modules__ssl__ssl_engine_rand.c (nonexistent) +++ head/www/apache24/files/patch-modules__ssl__ssl_engine_rand.c (revision 378215) @@ -0,0 +1,22 @@ +# 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_engine_rand.c.orig 2011-12-05 00:08:01 UTC ++++ modules/ssl/ssl_engine_rand.c +@@ -81,6 +81,7 @@ int ssl_rand_seed(server_rec *s, apr_poo + nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes); + ssl_util_ppclose(s, p, fp); + } ++#ifdef HAVE_RAND_EGD + else if (pRandSeed->nSrc == SSL_RSSRC_EGD) { + /* + * seed in contents provided by the external +@@ -90,6 +91,7 @@ int ssl_rand_seed(server_rec *s, apr_poo + continue; + nDone += n; + } ++#endif + else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) { + struct { + time_t t; Property changes on: head/www/apache24/files/patch-modules__ssl__ssl_engine_rand.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c =================================================================== --- head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c (nonexistent) +++ head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.c (revision 378215) @@ -0,0 +1,18 @@ +# 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +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 (nonexistent) +++ head/www/apache24/files/patch-modules__ssl__ssl_util_ssl.h (revision 378215) @@ -0,0 +1,18 @@ +# 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/files/patch-support__Makefile.in =================================================================== --- head/www/apache24/files/patch-support__Makefile.in (revision 378214) +++ head/www/apache24/files/patch-support__Makefile.in (revision 378215) @@ -1,28 +1,28 @@ ---- ./support/Makefile.in.orig 2012-12-11 11:37:25.000000000 +0100 -+++ ./support/Makefile.in 2013-10-26 19:29:20.000000000 +0200 -@@ -17,10 +17,10 @@ +--- support/Makefile.in.orig 2012-12-11 10:37:25 UTC ++++ support/Makefile.in +@@ -17,10 +17,10 @@ install: @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) - @for i in apxs dbmmanage; do \ + @for i in apxs dbmmanage split-logfile; do \ if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(DESTDIR)$(bindir); \ - chmod 755 $(DESTDIR)$(bindir)/$$i; \ + cp -p $$i $(DESTDIR)$(sbindir); \ + chmod 755 $(DESTDIR)$(sbindir)/$$i; \ fi ; \ done @for i in apachectl; do \ -@@ -30,10 +30,7 @@ +@@ -30,10 +30,7 @@ install: fi ; \ done @if test -f "$(builddir)/envvars-std"; then \ - cp -p envvars-std $(DESTDIR)$(sbindir); \ - if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ - cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ - fi ; \ + cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \ fi htpasswd.lo: passwd_common.h Index: head/www/apache24/files/patch-support__apachectl.in =================================================================== --- head/www/apache24/files/patch-support__apachectl.in (revision 378214) +++ head/www/apache24/files/patch-support__apachectl.in (revision 378215) @@ -1,52 +1,52 @@ ---- ./support/apachectl.in.orig 2012-02-01 04:47:28.000000000 +0100 -+++ ./support/apachectl.in 2013-03-22 18:55:53.000000000 +0100 -@@ -43,6 +43,7 @@ +--- support/apachectl.in.orig 2012-02-01 03:47:28 UTC ++++ support/apachectl.in +@@ -43,6 +43,7 @@ ARGV="$@" # # the path to your httpd binary, including options if necessary HTTPD='@exp_sbindir@/@progname@' +SERVICE='/usr/sbin/service apache24' # # pick up any necessary environment variables if test -f @exp_sbindir@/envvars; then -@@ -66,19 +67,21 @@ +@@ -66,19 +67,21 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@" # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| +eval `limits -e -C daemon` >/dev/null 2>&1 # Set the maximum number of file descriptors allowed per child process. if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then $ULIMIT_MAX_FILES fi ERROR=0 -if [ "x$ARGV" = "x" ] ; then - ARGV="-h" +if [ "x$ACMD" = "x" ] ; then + ACMD="-h" fi case $ACMD in -start|stop|restart|graceful|graceful-stop) - $HTTPD -k $ARGV +start|stop|restart|rcvar|reload|graceful|gracefulstop|graceful-stop) +# $HTTPD -k $ARGV + $SERVICE $( echo $ACMD | tr -d '-' ) ERROR=$? ;; startssl|sslstart|start-SSL) -@@ -88,11 +91,13 @@ +@@ -88,11 +91,13 @@ startssl|sslstart|start-SSL) ERROR=2 ;; configtest) - $HTTPD -t +# $HTTPD -t + $SERVICE $ACMD ERROR=$? ;; status) - $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' +# $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' + $SERVICE $ACMD ;; fullstatus) $LYNX $STATUSURL Index: head/www/apache24/files/patch-support__apxs.in =================================================================== --- head/www/apache24/files/patch-support__apxs.in (revision 378214) +++ head/www/apache24/files/patch-support__apxs.in (revision 378215) @@ -1,27 +1,27 @@ ---- ./support/apxs.in.orig 2012-07-25 13:42:40.000000000 +0200 -+++ ./support/apxs.in 2013-03-22 18:55:53.000000000 +0100 -@@ -636,7 +636,13 @@ +--- support/apxs.in.orig 2013-12-26 18:01:53 UTC ++++ support/apxs.in +@@ -636,7 +636,13 @@ if ($opt_i or $opt_e) { } } else { # replace already existing LoadModule line - $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s; + # Custom FreeBSD mod + if ($opt_A) { + $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s; + } + else { + $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s; + } } $lmd =~ m|LoadModule\s+(.+?)_module.*|; notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]"); -@@ -645,8 +651,7 @@ +@@ -645,8 +651,7 @@ if ($opt_i or $opt_e) { if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { print FP $content; close(FP); - system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " . - "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . + system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new"); } else { notice("unable to open configuration file"); Index: head/www/apache24/files/patch-support__envvars-std.in =================================================================== --- head/www/apache24/files/patch-support__envvars-std.in (revision 378214) +++ head/www/apache24/files/patch-support__envvars-std.in (revision 378215) @@ -1,13 +1,13 @@ ---- ./support/envvars-std.in.orig 2012-03-08 17:10:51.000000000 +0100 -+++ ./support/envvars-std.in 2013-03-22 18:55:53.000000000 +0100 -@@ -26,3 +26,10 @@ +--- support/envvars-std.in.orig 2012-03-08 16:10:51 UTC ++++ support/envvars-std.in +@@ -26,3 +26,10 @@ fi export @SHLIBPATH_VAR@ # @OS_SPECIFIC_VARS@ + +ENVVARS_DIR=%%PREFIX%%/etc/apache24/envvars.d + +for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null) +do + . ${envvars_file} +done Index: head/www/apache24/files/patch-support__log_server_status.in =================================================================== --- head/www/apache24/files/patch-support__log_server_status.in (revision 378214) +++ head/www/apache24/files/patch-support__log_server_status.in (revision 378215) @@ -1,20 +1,20 @@ ---- ./support/log_server_status.in.orig 2012-04-29 01:08:09.000000000 +0200 -+++ ./support/log_server_status.in 2013-03-22 18:55:53.000000000 +0100 -@@ -29,7 +29,7 @@ +--- support/log_server_status.in.orig 2012-04-28 23:08:09 UTC ++++ support/log_server_status.in +@@ -29,7 +29,7 @@ use IO::Socket; use strict; use warnings; -my $wherelog = "@exp_logfiledir@/"; # Logs will be like "@exp_logfiledir@/19960312" +my $wherelog = "@exp_logfiledir@/httpd-status-"; # Logs will be like "@exp_logfiledir@/httpd-status-19960312" my $server = "localhost"; # Name of server, could be "www.foo.com" my $port = "@PORT@"; # Port on server my $request = "/server-status/?auto"; # Request to send -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ my $time = . sprintf( "%02d", $ltime[1] ) . sprintf( "%02d", $ltime[0] ); -open(OUT,">>$wherelog$day"); +open(OUT,">>$wherelog$day.log"); my $socket = new IO::Socket::INET( PeerAddr => $server, Index: head/www/apache24/files/pkg-deinstall.in =================================================================== --- head/www/apache24/files/pkg-deinstall.in (nonexistent) +++ head/www/apache24/files/pkg-deinstall.in (revision 378215) @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +MPM_FALLBACK="%%ETCDIR%%/modules.d/%%MPMF%%" + +_cleanup(){ + if [ -f ${MPM_FALLBACK} ]; then + echo -n "remove fallback MPM : " + /bin/rm -vf ${MPM_FALLBACK} + fi +} + +# run only if build with modular MPM +if [ "x$2" = "xDEINSTALL" ]; then + %%MPM_FALLBACK_CHECK%%_cleanup +fi + Property changes on: head/www/apache24/files/pkg-deinstall.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/files/pkg-install.in =================================================================== --- head/www/apache24/files/pkg-install.in (nonexistent) +++ head/www/apache24/files/pkg-install.in (revision 378215) @@ -0,0 +1,65 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Note: +# We have to use grep or wc after awk, else +# there is no usable ret value that can be +# used for further processing + +HTTPD_CONF="%%ETCDIR%%/httpd.conf" +MPM_FALLBACK="%%ETCDIR%%/modules.d/%%MPMF%%" + +_log_msg(){ + /usr/bin/logger -p local0.notice -s -t apache24 "$1" +} + +_check_deprecated(){ +if [ -r ${HTTPD_CONF} ]; then + /usr/bin/awk '/^LoadModule[[:blank:]]+mpm_(event|prefork|worker)_module/ {print $2}' ${HTTPD_CONF} | /usr/bin/grep -q '^mpm_' + if [ $? -ne 0 ]; then + _log_msg "===================================================" + _log_msg "WARNING!" + _log_msg " No apache MPM module is activated in httpd.conf," + _log_msg " mpm_prefork will be activated as fall back" + _log_msg "" + _log_msg " Please follow the instructions in" + _log_msg " ${MPM_FALLBACK}" + _log_msg "===================================================" + +cat > ${MPM_FALLBACK} << _EOF +# ================================================================== +# Note: +# www/apache24 build changed from static MPM to modular MPM loading! +# +# This file was installed as fall back, since no activated MPM +# was detected in the existing httpd.conf. +# +# Please merge additions from httpd.conf.sample into your httpd.conf! +# +# After activating one of the mpm_modules in httpd.conf it is save +# to deactivate the "LoadModule" line in this file. +# +# In case mod_(php|perl|python|...) modules from the official FreeBSD +# package repo are installed please use the mpm_prefork module, else +# feel free to test mpm_event (preferred) or mpm_worker. +# +# For more information see: +# http://httpd.apache.org/docs/2.4/mod/ +# ================================================================== + +LoadModule mpm_prefork_module libexec/apache24/mod_mpm_prefork.so +_EOF + + fi # $? -ne 0 +else + echo ${HTTPD_CONF} not readable +fi +} + +# run only if build with modular MPM +if [ "$2" = "POST-INSTALL" ]; then + %%MPM_FALLBACK_CHECK%%_check_deprecated +fi + Property changes on: head/www/apache24/files/pkg-install.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apache24/pkg-help =================================================================== --- head/www/apache24/pkg-help (revision 378214) +++ head/www/apache24/pkg-help (revision 378215) @@ -1,25 +1,21 @@ Hints: -- only a subset from the selected modules are enabled by default in - httpd.conf. + - only a subset from the selected modules are activated by default in + httpd.conf. -- by default apache24 builds with static prefork MPM + - by default apache24 builds mpm_prefork, mpm_event and mpm_worker + as dynamically loadable module. Even mpm_event is the preferred + MPM, mpm_prefork will be activated to keep compatibility with + pre-build php/perl/python/... modules (used by apache22/apache24). -- if MPM_SHARED is selected then all MPM modules will be build, but - only the selected DEFAULT MPM module will be registered and enabled - in httpd.conf. For more information see: - https://issues.apache.org/bugzilla/show_bug.cgi?id=53882 Note: - Shared MPM loading is at the moment not supported by most additional - modules (php/perl/python) because they need to know the apache - threading model during build time To build the develop/example modules specify additional the parameter - -DIAMADEVELOPER (I am a developer) + -DIAMADEVELOPER (I am a developer) -For detailed module description visit - http://httpd.apache.org/docs/2.4/mod/ + For detailed module description visit + http://httpd.apache.org/docs/2.4/mod/ -and for the develop/example modules - http://httpd.apache.org/docs/2.2/programs/configure.html + and for the develop/example modules + http://httpd.apache.org/docs/2.2/programs/configure.html#developermodules Index: head/www/apache24/pkg-message =================================================================== --- head/www/apache24/pkg-message (revision 378214) +++ head/www/apache24/pkg-message (revision 378215) @@ -1,6 +1,23 @@ To run apache www server from startup, add apache24_enable="yes" in your /etc/rc.conf. Extra options can be found in startup script. Your hostname must be resolvable using at least 1 mechanism in /etc/nsswitch.conf typically DNS or /etc/hosts or apache might have issues starting depending on the modules you are using. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +- apache24 default build changed from static MPM to modular MPM +- more modules are now enabled per default in the port +- icons and error pages moved from WWWDIR to DATADIR + + If build with modular MPM and no MPM is activated in + httpd.conf, then mpm_prefork will be activated as default + MPM in etc/apache24/modules.d to keep compatibility with + existing php/perl/python modules! + +Please compare the existing httpd.conf with httpd.conf.sample +and merge missing modules/instructions into httpd.conf! + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Index: head/www/apache24/pkg-plist =================================================================== --- head/www/apache24/pkg-plist (revision 378214) +++ head/www/apache24/pkg-plist (revision 378215) @@ -1,550 +1,514 @@ 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_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%%sbin/suexec +%%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/%%ETCDIR%%/extra/httpd-autoindex.conf %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-autoindex.conf; fi -%%EXAMPLESDIR%%/extra/httpd-autoindex.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-autoindex.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf %D/%%ETCDIR%%/extra/httpd-autoindex.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-dav.conf %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-dav.conf; fi -%%EXAMPLESDIR%%/extra/httpd-dav.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-dav.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf %D/%%ETCDIR%%/extra/httpd-dav.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-default.conf %D/%%EXAMPLESDIR%%/extra/httpd-default.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-default.conf; fi -%%EXAMPLESDIR%%/extra/httpd-default.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-default.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-default.conf %D/%%ETCDIR%%/extra/httpd-default.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-info.conf %D/%%EXAMPLESDIR%%/extra/httpd-info.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-info.conf; fi -%%EXAMPLESDIR%%/extra/httpd-info.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-info.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-info.conf %D/%%ETCDIR%%/extra/httpd-info.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-languages.conf %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-languages.conf; fi -%%EXAMPLESDIR%%/extra/httpd-languages.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-languages.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf %D/%%ETCDIR%%/extra/httpd-languages.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-manual.conf %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-manual.conf; fi -%%EXAMPLESDIR%%/extra/httpd-manual.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-manual.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf %D/%%ETCDIR%%/extra/httpd-manual.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-mpm.conf %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-mpm.conf; fi -%%EXAMPLESDIR%%/extra/httpd-mpm.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-mpm.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf %D/%%ETCDIR%%/extra/httpd-mpm.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-multilang-errordoc.conf %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-multilang-errordoc.conf; fi -%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-multilang-errordoc.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf %D/%%ETCDIR%%/extra/httpd-multilang-errordoc.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-ssl.conf %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-ssl.conf; fi -%%EXAMPLESDIR%%/extra/httpd-ssl.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-ssl.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf %D/%%ETCDIR%%/extra/httpd-ssl.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-userdir.conf %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-userdir.conf; fi -%%EXAMPLESDIR%%/extra/httpd-userdir.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-userdir.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf %D/%%ETCDIR%%/extra/httpd-userdir.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/httpd-vhosts.conf %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf; then rm -f %D/%%ETCDIR%%/extra/httpd-vhosts.conf; fi -%%EXAMPLESDIR%%/extra/httpd-vhosts.conf -@exec [ -f %D/%%ETCDIR%%/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/%%ETCDIR%%/extra/httpd-vhosts.conf -@unexec if cmp -s %D/%%ETCDIR%%/extra/proxy-html.conf %D/%%EXAMPLESDIR%%/extra/proxy-html.conf; then rm -f %D/%%ETCDIR%%/extra/proxy-html.conf; fi -%%EXAMPLESDIR%%/extra/proxy-html.conf -@exec [ -f %D/%%ETCDIR%%/extra/proxy-html.conf ] || cp %D/%%EXAMPLESDIR%%/extra/proxy-html.conf %D/%%ETCDIR%%/extra/proxy-html.conf -@unexec if cmp %D/%%ETCDIR%%/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -vf %D/%%ETCDIR%%/httpd.conf; fi -%%EXAMPLESDIR%%/httpd.conf -@exec [ -f %D/%%ETCDIR%%/httpd.conf ] || cp -v %D/%%EXAMPLESDIR%%/httpd.conf %D/%%ETCDIR%%/httpd.conf -@unexec if cmp -s %D/%%WWWDIR%%/data/index.html %D/%%EXAMPLESDIR%%/index.html; then rm -f %D/%%WWWDIR%%/data/index.html; fi -%%EXAMPLESDIR%%/index.html -@exec [ -d %D/%%WWWDIR%%/data ] || mkdir -p %D/%%WWWDIR%%/data -@exec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%EXAMPLESDIR%%/index.html %D/%%WWWDIR%%/data/index.html -@unexec if cmp -s %D/%%ETCDIR%%/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/%%ETCDIR%%/magic; fi -%%EXAMPLESDIR%%/magic -@exec [ -f %D/%%ETCDIR%%/magic ] || cp %D/%%EXAMPLESDIR%%/magic %D/%%ETCDIR%%/magic -@unexec if cmp -s %D/%%ETCDIR%%/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/%%ETCDIR%%/mime.types; fi -%%EXAMPLESDIR%%/mime.types -@exec [ -f %D/%%ETCDIR%%/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/%%ETCDIR%%/mime.types -%%EXAMPLESDIR%%/modules.d/README_modules.d -%%WWWDIR%%/cgi-bin/printenv -%%WWWDIR%%/cgi-bin/printenv.vbs -%%WWWDIR%%/cgi-bin/printenv.wsf -%%WWWDIR%%/cgi-bin/test-cgi +@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%%/Includes @dir %%ETCDIR%%/envvars.d -@dir %%ETCDIR%%/extra @dir %%WWWDIR%%/data