Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -26,6 +26,7 @@ SUBDIR += apache-mode.el SUBDIR += apache22 SUBDIR += apache24 + SUBDIR += apache25-devel SUBDIR += apercu SUBDIR += aria2 SUBDIR += aria2fe Index: www/apache25-devel/Makefile =================================================================== --- www/apache25-devel/Makefile +++ www/apache25-devel/Makefile @@ -1,15 +1,15 @@ # $FreeBSD$ -PORTNAME= apache24 -PORTVERSION= 2.4.27 -PORTREVISION= 1 +PORTNAME= apache25 +PORTVERSION= 2.5.0 +DISTVERSIONSUFFIX= -alpha +MASTER_SITES= https://dist.apache.org/repos/dist/dev/httpd/ CATEGORIES= www ipv6 -MASTER_SITES= APACHE_HTTPD -DISTNAME= httpd-${PORTVERSION} -DIST_SUBDIR= apache24 +DISTNAME= httpd-${PORTVERSION}${DISTVERSIONSUFFIX} +PKGNAMESUFFIX= -devel MAINTAINER= apache@FreeBSD.org -COMMENT= Version 2.4.x of Apache web server +COMMENT= Version 2.5.x of Apache web server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -18,13 +18,11 @@ libapr-1.so:devel/apr1 \ libpcre.so:devel/pcre -CONFLICTS_INSTALL= caudium14-1.* \ - apache-*-2.2.* apache22-* +CONFLICTS_INSTALL= caudium14-* apache22-2* apache24-2* -USE_APACHE= common24 -USES= autoreconf cpe iconv libtool perl5 tar:bzip2 +USES= apache:server,2.5 autoreconf cpe gmake iconv libtool perl5 tar:bzip2 USE_PERL5= run -USE_RC_SUBR= apache24 htcacheclean +USE_RC_SUBR= apache25 htcacheclean GNU_CONFIGURE= yes CPE_VENDOR= apache @@ -33,82 +31,72 @@ 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 .if !defined(WITH_DEBUG) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c +#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c .endif -.include "${APACHEDIR}/Makefile.options" -.include "${APACHEDIR}/Makefile.options.desc" - -# IMPLIES -AUTHN_DBD_IMPLIES= DBD -HEARTBEAT_IMPLIES= WATCHDOG STATUS -HEARTMONITOR_IMPLIES= WATCHDOG STATUS -LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR -PROXY_HCHECK_IMPLIES= WATCHDOG - -# MPM -MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork -MPM_WORKER_CONFIGURE_ON= --with-mpm=worker -MPM_EVENT_CONFIGURE_ON= --with-mpm=event +.include "./Makefile.options" +.include "./Makefile.options.desc" +OPTIONS_SUB= yes -AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap +SERF_BROKEN= mod_serf requires serf-0 where we have serf-1 # http://httpd.apache.org/docs/2.4/bind.html IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped -LDAP_CONFIGURE_ON= --enable-ldap=shared - -BROTLI_CONFIGURE_ON= --with-brotli=${LOCALBASE} +BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE} +AUTHNZ_LDAP_CONFIGURE_ENABLE= authnz-ldap +AUTHNZ_LDAP_USE= openldap=yes BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli -HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} +HTTP2_CONFIGURE_WITH= nghttp2=${LOCALBASE} HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 +LDAP_CONFIGURE_ENABLE= ldap=shared +LDAP_USE= openldap=yes LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUA_CONFIGURE_WITH= lua +LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \ + LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" +LUA_CONFIGURE_WITH= lua=${PREFIX} LUA_USES= lua -PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} -PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 -SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE} +MD_CONFIGURE_WITH= jansson=${LOCALBASE} +MD_LIB_DEPENDS= libcurl.so:ftp/curl \ + libjansson.so:devel/jansson +.for mod in event motorz prefork simple worker +MPM_${mod:tu}_CONFIGURE_ON= --with-mpm=${mod} +.endfor +MPM_SHARED_CONFIGURE_ON= --enable-mpms-shared=all +PROXY_HTML_USE= gnome=libxml2 +PROXY_HTML_CONFIGURE_WITH= libxml2=${LOCALBASE}/include/libxml2 +PROXY_HTTP2_CONFIGURE_WITH= ${HTTP2_CONFIGURE_WITH} +PROXY_HTTP2_LIB_DEPENDS= ${HTTP2_LIB_DEPENDS} +SERF_CONFIGURE_WITH= serf=${LOCALBASE} +SERF_LIB_DEPENDS= libserf-1.so:www/serf +SOCACHE_DC_CONFIGURE_WITH= distcache=${LOCALBASE} SOCACHE_DC_LIB_DEPENDS= libdistcache.so: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_CONFIGURE_WITH= ssl=${OPENSSLBASE} SSL_USES= ssl +SSL_CT_USES= shebangfix python +SHEBANG_FILES= support/ctlogconfig support/ctauditscts +SHEBANG_LANG= python +python_OLD_CMD= "/usr/bin/env python" +XML2ENC_USE= ${PROXY_HTML_USE} +XML2ENC_CONFIGURE_WITH= ${PROXY_HTML_CONFIGURE_WITH} +.for mod in ${EXAMPLE_DISABLED_MODULES} +${mod}_VARS= with-devmods=yes +.endfor -.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 @@ -128,7 +116,7 @@ --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 \ @@ -139,17 +127,8 @@ # 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" +.include "./Makefile.modules" .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 &&\ ${PORT_OPTIONS:MHTTP2} && ${OPENSSLBASE} == /usr @@ -157,18 +136,9 @@ .endif post-extract: -# remove possible leftover .svn directories in the sources - @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r -# limit grep results ... - @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' -o -name '*.vbs' -o -name '*.wsf' \) -delete # make sure the configure script contains our patches, preserve the original script for comparsion -${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream - -# 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 + ${CP} ${PATCHDIR}/config.sub ${WRKSRC}/build/ post-patch: ${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' ${WRKSRC}/server/core.c @@ -176,7 +146,7 @@ ${WRKSRC}/include/httpd.h ${REINPLACE_CMD} -e 's|perlbin=.*|perlbin=${PERL}|' \ ${WRKSRC}/configure.in - ${RM} ${WRKSRC}/docs/docroot/*.bak + ${REINPLACE_CMD} -e 's|/original\(.*\)|\1.sample|' ${WRKSRC}/httpd.spec ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual pre-configure:: @@ -195,18 +165,26 @@ ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std post-install: + @${RM} -rv ${STAGEDIR}/${WWWDIR}/cgi-bin/printenv.vbs \ + ${STAGEDIR}/${WWWDIR}/cgi-bin/printenv.wsf \ + ${STAGEDIR}${DOCSDIR}/style/lang ${STAGEDIR}${DOCSDIR}/style/xsl @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} + ${MV} ${STAGEDIR}${WWWDIR}/data ${STAGEDIR}${DATADIR}/misc + ${MKDIR} ${STAGEDIR}${WWWDIR}/data ${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 + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache25/mod_*.so post-install-LOG_FORENSIC-on: ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin +post-install-SSL_CT-off: + ${RM} ${STAGEDIR}${PREFIX}/sbin/ctlogconfig + # maintainer only, check for new modules modlist: extract @${AWK} '/: checking whether to enable mod_/ \ Index: www/apache25-devel/Makefile.modules =================================================================== --- www/apache25-devel/Makefile.modules +++ www/apache25-devel/Makefile.modules @@ -1,12 +1,5 @@ # $FreeBSD$ # -# ============================================= -# Maintainer note for OPTION handling: -# To set additional option use -# PORT_OPTIONS+= -# To set / unset an OPTION, even the OPTION is set / unset in OPTIONS_FILE use -# WITH="MODULE1 MODULE2 ..." or WITHOUT="MODULE1 MODULE2 ..." - .if defined(_PREMKINCLUDED) # check if APR-util module exists @@ -20,32 +13,14 @@ . 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 +IGNORE= SESSION_CRYPTO requires APR-util to have crypto support built in.\ + Please rebuild APR with crypto support . endif . endif .endif # exists APU_CONFIG -# ============================================= -.if ${PORT_OPTIONS:MMPM_SHARED} -SUB_LIST+= MPM_FALLBACK_CHECK="" -PLIST_SUB+= MPM_SHARED="" -CONFIGURE_ARGS+= --enable-mpms-shared=all -.else -SUB_LIST+= MPM_FALLBACK_CHECK="\#" -PLIST_SUB+= MPM_SHARED="@comment " -.endif - -# ============================================= -# build develop/example modules only with additional confirmation -.for DEVMOD in ${EXAMPLE_MODULES} -. if ${PORT_OPTIONS:M${DEVMOD}} -WITH_DEVMODS= yes -. endif -.endfor - -.if defined(WITH_DEVMODS) && !defined(IAMADEVELOPER ) +.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 @@ -68,26 +43,4 @@ CONFIGURE_ARGS+= --enable-exception-hook .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: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 - -.if ${PORT_OPTIONS:MPROXY_HTTP2} && !${PORT_OPTIONS:MPROXY_BALANCER} -IGNORE= PROXY_HTTP2 needs PROXY_BALANCER -.endif - .endif # _PREMKINCLUDED Index: www/apache25-devel/Makefile.options =================================================================== --- www/apache25-devel/Makefile.options +++ www/apache25-devel/Makefile.options @@ -9,92 +9,97 @@ # UNIXD LOG_CONFIG -# mod_proxy_html and xml2enc depending on libxml2 -PROXY_ENABLED_MODULES= \ - PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI PROXY_HTTP2 \ - PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL +AUTH_ENABLED_MODULES= \ + ACCESS_COMPAT ALLOWHANDLERS ALLOWMETHODS AUTHN_ANON AUTHN_CORE AUTHN_DBD \ + AUTHN_DBM AUTHN_FILE AUTHN_SOCACHE AUTHNZ_FCGI AUTHZ_CORE AUTHZ_DBD AUTHZ_DBM \ + AUTHZ_HOST AUTHZ_GROUPFILE AUTHZ_USER AUTHZ_OWNER AUTH_BASIC AUTH_FORM AUTH_DIGEST +AUTH_DISABLED_MODULES= \ + AUTHNZ_LDAP + +CACHEGR_ENABLED_MODULES= \ + CACHE CACHE_DISK CACHE_SOCACHE FILE_CACHE SOCACHE_DBM SOCACHE_SHMCB +CACHEGR_DISABLED_MODULES= \ + SOCACHE_DC SOCACHE_MEMCACHE SOCACHE_REDIS -PROXY_DISABLED_MODULES= - -# SESSION_CRYPTO need APR build with crypto (EVP support in APR) -SESSION_ENABLED_MODULES= \ - SESSION_COOKIE SESSION_CRYPTO SESSION_DBD - -SESSION_DISABLED_MODULES= - -EXAMPLE_MODULES= \ +EXAMPLE_DISABLED_MODULES= \ BUCKETEER CASE_FILTER CASE_FILTER_IN ECHO EXAMPLE_HOOKS EXAMPLE_IPC \ OPTIONAL_FN_EXPORT OPTIONAL_FN_IMPORT OPTIONAL_HOOK_EXPORT \ OPTIONAL_HOOK_IMPORT -MOST_ENABLED_MODULES= \ - ACCESS_COMPAT ACTIONS ALIAS ALLOWMETHODS ASIS \ - AUTHN_ANON AUTHN_CORE AUTHN_DBD AUTHN_DBM AUTHN_FILE AUTHN_SOCACHE \ - AUTHZ_CORE AUTHZ_DBD AUTHZ_DBM AUTHNZ_FCGI AUTHZ_GROUPFILE AUTHZ_HOST \ - AUTHZ_OWNER AUTHZ_USER \ - AUTH_BASIC AUTH_DIGEST AUTH_FORM AUTOINDEX \ - BUFFER \ - CACHE CACHE_DISK CACHE_SOCACHE CERN_META CGI CGID \ - CHARSET_LITE \ - DATA DAV DAV_FS DAV_LOCK DBD DEFLATE DIALUP DIR DUMPIO \ - ENV EXPIRES EXT_FILTER \ - FILE_CACHE FILTER \ - HEADERS HEARTBEAT HEARTMONITOR HTTP2 \ - IMAGEMAP INCLUDE INFO \ - LBMETHOD_BYBUSYNESS LBMETHOD_BYREQUESTS LBMETHOD_BYTRAFFIC \ - LBMETHOD_HEARTBEAT LOGIO LOG_DEBUG LOG_FORENSIC \ - MACRO MIME MIME_MAGIC \ - NEGOTIATION \ - RATELIMIT REFLECTOR REMOTEIP REQTIMEOUT REQUEST REWRITE \ - SED SETENVIF \ - SLOTMEM_PLAIN SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB \ - SPELING SSL STATUS SUBSTITUTE \ - UNIQUE_ID USERDIR USERTRACK \ - VERSION VHOST_ALIAS \ - WATCHDOG XML2ENC - -MOST_DISABLED_MODULES:= \ - AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SUEXEC - -# enable/disable additional PROXY/SESSION modules -META_MODULES= PROXY SESSION - -ALL_MODULES_CATEGORIES= \ - MOST_ENABLED MOST_DISABLED MULTI \ - PROXY_ENABLED PROXY_DISABLED \ - SESSION_ENABLED SESSION_DISABLED \ - META EXAMPLE +FILTERS_ENABLED_MODULES = \ + BUFFER CHARSET_LITE RATELIMIT REQTIMEOUT EXT_FILTER REQUEST INCLUDE FILTER \ + SUBSTITUTE SED DEFLATE XML2ENC +FILTERS_DISABLED_MODULES= \ + BROTLI + +GENERATORS_ENABLED_MODULES =\ + AUTOINDEX CGI CGID INFO STATUS + +LOG_ENABLED_MODULES= \ + DUMPIO LOGIO LOG_CONFIG LOG_DEBUG LOG_FORENSIC SYSLOG USERTRACK +LOG_DISABLED_MODULES= \ + IDENT FIREHOSE + +MAPPERS_ENABLED_MODULES = \ + ACTIONS ALIAS DIR NEGOTIATION REWRITE SPELING USERDIR VHOST_ALIAS + +METADATA_ENABLED_MODULES= \ + CERN_META ENV EXPIRES HEADERS MIME MIME_MAGIC UNIQUE_ID SETENVIF VERSION REMOTEIP + +PROXYGR_ENABLED_MODULES= \ + LBMETHOD_BYBUSYNESS LBMETHOD_BYREQUESTS LBMETHOD_BYTRAFFIC LBMETHOD_HEARTBEAT \ + HEARTBEAT HEARTMONITOR PROXY PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS \ + PROXY_FCGI PROXY_HTTP2 PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML \ + PROXY_HTTP PROXY_SCGI PROXY_UWSGI PROXY_WSTUNNEL SERF + +SECURITY_ENABLED_MODULES= \ + WATCHDOG STATUS MD POLICY SSL +SECURITY_DISABLED_MODULES= \ + CRYPTO SSL_CT SUEXEC + +SESSIONGR_ENABLED_MODULES= \ + SESSION SESSION_COOKIE SESSION_CRYPTO SESSION_DBD + +NOCAT_ENABLED_MODULES= \ + ASIS DAV DAV_FS DAV_LOCK DATA DBD DIALUP HTTP2 IMAGEMAP MACRO REFLECTOR \ + SLOTMEM_PLAIN SLOTMEM_SHM WATCHDOG -ADDITIONAL_OPT= LUAJIT IPV4_MAPPED +NOCAT_DISABLED_MODULES= \ + APREQ LDAP LUA # =================================================================================== -#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_GROUP= AUTH CACHEGR EXAMPLE FILTERS GENERATORS LOG METADATA MAPPERS \ + SECURITY SESSIONGR PROXYGR NOCAT +.for _grp in ${OPTIONS_GROUP} +AVAILABLE_MODULES+= ${${_grp}_ENABLED_MODULES} ${${_grp}_DISABLED_MODULES} +OPTIONS_GROUP_${_grp}= ${${_grp}_ENABLED_MODULES} ${${_grp}_DISABLED_MODULES} +OPTIONS_DEFAULT+= ${${_grp}_ENABLED_MODULES} +.endfor OPTIONS_SINGLE= DEFAULT_MPM -OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT +OPTIONS_SINGLE_DEFAULT_MPM= MPM_EVENT MPM_MOTORZ MPM_PREFORK MPM_SIMPLE MPM_WORKER # =================================================================================== -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 +OPTIONS_DEFINE= IPV4_MAPPED LUAJIT MPM_SHARED +OPTIONS_DEFAULT+= MPM_SHARED MPM_EVENT + +# Generate IMPLIES +.for mod in COOKIE CRYPTO DBD +SESSION_${mod}_IMPLIES= SESSION +.endfor +.for mod in AJP BALANCER CONNECT EXPRESS FCGI FDPASS FTP HTTP2 SCGI WSTUNNEL +PROXY_${mod}_IMPLIES= PROXY +.endfor +.for mod in BYREQUEST BYTRAFFIC BYBUSINESS HEARTBEAT +PROXY_BALANCER_${mod}_IMPLIES= PROXY_BALANCER +.endfor +AUTHN_DBD_IMPLIES= DBD +AUTH_BASIC_IMPLIES= AUTHN_CORE AUTHZ_CORE +AUTH_DIGEST_IMPLIES= AUTHN_CORE +HEARTBEAT_IMPLIES= WATCHDOG STATUS +HEARTMONITOR_IMPLIES= ${HEARTBEAT_IMPLIES} +LBMETHOD_HEARTBEAT_IMPLIES= ${HEARTBEAT_IMPLIES} HEARTMONITOR +PROXY_HCHECK_IMPLIES+= WATCHDOG +PROXY_HTTP2_IMPLIES+= PROXY_BALANCER Index: www/apache25-devel/Makefile.options.desc =================================================================== --- www/apache25-devel/Makefile.options.desc +++ www/apache25-devel/Makefile.options.desc @@ -2,24 +2,34 @@ # 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 +# GROUP HEADING +AUTH_DESC= Authentication and Authorization modules +CACHEGR_DESC= Cache modules (imply mod_cache) EXAMPLE_DESC= Example and devel modules (do not use in prod) +FILTERS_DESC= Filter modules +GENERATORS_DESC= Modules generating content +LOG_DESC= Logging and debugging modules +METADATA_DESC= Modules operating on metadata +MAPPERS_DESC= Mapping modules (transform) +NOCAT_DESC= Uncatgegorized modules +PROXYGR_DESC= Proxy modules (imply mod_proxy) and options +SECURITY_DESC= Security related modules +SESSIONGR_DESC= Session modules (imply mod_session) # ===================================== # MPMs MPM_SHARED_DESC= all MPMs as loadable module +MPM_EVENT_DESC= worker variant with the goal of consuming threads only for connections with active processing MPM_PREFORK_DESC= non-threaded, pre-forking web server +MPM_SIMPLE_DESC= "simple" MPM 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 +MPM_MOTORZ_DESC= Experimental APR based module (Prefork+Simple) # ===================================== # additional (no modules) IPV4_MAPPED_DESC= Allow IPv6 sockets to handle IPv4 connections LUAJIT_DESC= LuaJit Support +DEFAULT_MPM_DESC= The default MPM module # ===================================== # static support (tbd) @@ -38,10 +48,12 @@ # ===================================== # modules # DESC from modules/*/config.m4 files -ACCESS_COMPAT_DESC= mod_access compatibility +ACCESS_COMPAT_DESC= httpd 2.2 mod_access compatibility ACTIONS_DESC= Action triggering on requests ALIAS_DESC= Mapping of requests to different filesystem parts +ALLOWHANDLERS_DESC= Restrict what HTTP handlers can be used ALLOWMETHODS_DESC= Restrict allowed HTTP methods +APREQ_DESC= libapreq 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 @@ -76,6 +88,7 @@ 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 +CRYPTO_DESC= Support for symmetrical encryption and decryption DATA_DESC= RFC2397 data encoder DAV_DESC= WebDAV protocol handling. --enable-dav also enables mod_dav_fs @@ -96,6 +109,7 @@ FILE_CACHE_DESC= File cache FILTER_DESC= Smart Filtering +FIREHOSE_DESC= Multiplex all I/O to a given file or pipe HEADERS_DESC= HTTP header control HEARTBEAT_DESC= Generates Heartbeats @@ -119,6 +133,7 @@ LUA_DESC= Apache Lua Framework MACRO_DESC= Define and use macros in configuration files +MD_DESC= Manage domains (includes LetsEncrypt auto-provision) MIME_DESC= Mapp file-ext. to MIME (recommended) MIME_MAGIC_DESC= Automagically determining MIME type @@ -129,7 +144,8 @@ 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 +POLICY_DESC= HTTP protocol compliance enforcement +PROXY_DESC= Multi-protocol proxy/gateway server 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 @@ -142,6 +158,7 @@ PROXY_HTTP_DESC= HTTP support module for mod_proxy PROXY_HTTP2_DESC= Experimental http2 proxy module for h2 and h2c PROXY_SCGI_DESC= SCGI gateway module for mod_proxy +PROXY_UWSGI_DESC= UWSGI gateway module for mod_proxy PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy RATELIMIT_DESC= Output Bandwidth Limiting @@ -152,18 +169,22 @@ 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 +SERF_DESC= Serf gossip support for mod_proxy +SESSION_DESC= Session support module +SESSION_COOKIE_DESC= Cookie based session support +SESSION_CRYPTO_DESC= Session encryption support +SESSION_DBD_DESC= DBD/SQL based session support 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 +SLOTMEM_PLAIN_DESC= Slot-based plain memory provider +SLOTMEM_SHM_DESC= Slot-based shared memory provider. SOCACHE_DBM_DESC= dbm small object cache provider SOCACHE_DC_DESC= distcache small object cache provider SOCACHE_MEMCACHE_DESC= memcache small object cache provider +SOCACHE_REDIS_DESC= redis 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) +SSL_CT_DESC= Certificate Transparency (RFC 6962) STATUS_DESC= Process/thread monitoring SUBSTITUTE_DESC= Response content rewrite-like filtering SUEXEC_DESC= Set uid and gid for spawned processes Index: www/apache25-devel/distinfo =================================================================== --- www/apache25-devel/distinfo +++ www/apache25-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499686775 -SHA256 (apache24/httpd-2.4.27.tar.bz2) = 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a -SIZE (apache24/httpd-2.4.27.tar.bz2) = 6527394 +TIMESTAMP = 1510561564 +SHA256 (httpd-2.5.0-alpha.tar.bz2) = ea3a152d6fea7150b4aba20ac1f5e0297c216d3e1ba77419f013d9ec8e92fc33 +SIZE (httpd-2.5.0-alpha.tar.bz2) = 7174818 Index: www/apache25-devel/files/apache25.in =================================================================== --- www/apache25-devel/files/apache25.in +++ www/apache25-devel/files/apache25.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: head/www/apache24/files/apache24.in 406607 2016-01-18 19:44:47Z ohauer $ +# $FreeBSD: head/www/apache26/files/apache24.in 406607 2016-01-18 19:44:47Z ohauer $ # PROVIDE: apache24 # REQUIRE: LOGIN cleanvar sshd Index: www/apache25-devel/files/config.sub =================================================================== --- /dev/null +++ www/apache25-devel/files/config.sub @@ -0,0 +1,1835 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2017 Free Software Foundation, Inc. + +timestamp='2017-11-04' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + +Canonicalize a configuration name. + +Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2017 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2*) + basic_machine=m68k-bull + os=-sysv3 + ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + wasm32) + basic_machine=wasm32-unknown + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + x64) + basic_machine=x86_64-pc + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases that might get confused + # with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -ios) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + pru-*) + os=-elf + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-functions 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: Index: www/apache25-devel/files/patch-Makefile.in =================================================================== --- www/apache25-devel/files/patch-Makefile.in +++ www/apache25-devel/files/patch-Makefile.in @@ -1,106 +1,28 @@ ---- Makefile.in.orig 2016-03-20 15:51:49 UTC +--- Makefile.in.orig 2017-07-12 00:13:55 UTC +++ Makefile.in -@@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk +@@ -37,7 +37,6 @@ include $(top_srcdir)/build/program.mk install-conf: @echo Installing configuration files @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra - @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/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)$(sysconfdir)/$${i}.sample; \ - done; \ - for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ - cd $$j ; \ -@@ -98,15 +95,12 @@ install-conf: + if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ +@@ -113,14 +112,14 @@ install-conf: -e 's#@@SSLPort@@#$(SSLPORT)#g' \ < $$i; \ fi \ - ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ - chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ -+ ) > $(DESTDIR)$(sysconfdir)/$${i}.sample; \ -+ chmod 0644 $(DESTDIR)$(sysconfdir)/$${i}.sample; \ ++ ) > $(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 \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ - $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ -- fi; \ ++ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i.sample $(DESTDIR)$(sysconfdir)/$$file; \ + fi; \ fi; \ done ; \ - done ; \ -@@ -157,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)$(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) -@@ -252,12 +223,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: www/apache25-devel/files/patch-config.layout =================================================================== --- www/apache25-devel/files/patch-config.layout +++ www/apache25-devel/files/patch-config.layout @@ -1,26 +1,26 @@ ---- config.layout.orig 2012-04-17 14:01:41 UTC +--- config.layout.orig 2012-04-13 07:21:46 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 ++ libexecdir: ${exec_prefix}/libexec/apache25 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 ++ sysconfdir: ${prefix}/etc/apache25 ++ datadir: ${prefix}/www/apache25 ++ installbuilddir: ${prefix}/share/apache25/build errordir: ${datadir}/error iconsdir: ${datadir}/icons htdocsdir: ${datadir}/data - manualdir: ${prefix}/share/doc/apache2 -+ manualdir: ${prefix}/share/doc/apache24 ++ manualdir: ${prefix}/share/doc/apache25 cgidir: ${datadir}/cgi-bin - includedir: ${prefix}/include/apache2 -+ includedir: ${prefix}/include/apache24 ++ includedir: ${prefix}/include/apache25 localstatedir: /var runtimedir: ${localstatedir}/run logfiledir: ${localstatedir}/log Index: www/apache25-devel/pkg-plist =================================================================== --- www/apache25-devel/pkg-plist +++ www/apache25-devel/pkg-plist @@ -1,4 +1,6 @@ +bin/a2md bin/ab +bin/firehose bin/htdbm bin/htdigest bin/htpasswd @@ -13,208 +15,230 @@ @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-policy.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%%/magic +%%ETCDIR%%/mime.types %%ETCDIR%%/modules.d/README_modules.d -include/apache24/ap_compat.h -include/apache24/ap_config.h -include/apache24/ap_config_auto.h -include/apache24/ap_config_layout.h -include/apache24/ap_expr.h -include/apache24/ap_hooks.h -include/apache24/ap_listen.h -include/apache24/ap_mmn.h -include/apache24/ap_mpm.h -include/apache24/ap_provider.h -include/apache24/ap_regex.h -include/apache24/ap_regkey.h -include/apache24/ap_release.h -include/apache24/ap_slotmem.h -include/apache24/ap_socache.h -include/apache24/apache_noprobes.h -include/apache24/cache_common.h -include/apache24/heartbeat.h -include/apache24/http_config.h -include/apache24/http_connection.h -include/apache24/http_core.h -include/apache24/http_log.h -include/apache24/http_main.h -include/apache24/http_protocol.h -include/apache24/http_request.h -include/apache24/http_vhost.h -include/apache24/httpd.h -include/apache24/mod_auth.h -include/apache24/mod_cache.h -include/apache24/mod_cgi.h -include/apache24/mod_core.h -include/apache24/mod_dav.h -include/apache24/mod_dbd.h -include/apache24/mod_include.h -include/apache24/mod_log_config.h -include/apache24/mod_proxy.h -include/apache24/mod_request.h -include/apache24/mod_rewrite.h -include/apache24/mod_session.h -include/apache24/mod_so.h -include/apache24/mod_ssl.h -include/apache24/mod_ssl_openssl.h -include/apache24/mod_status.h -include/apache24/mod_unixd.h -include/apache24/mod_watchdog.h -include/apache24/mod_xml2enc.h -include/apache24/mpm_common.h -include/apache24/os.h -include/apache24/scoreboard.h -include/apache24/unixd.h -include/apache24/util_cfgtree.h -include/apache24/util_charset.h -include/apache24/util_cookies.h -include/apache24/util_ebcdic.h -include/apache24/util_fcgi.h -include/apache24/util_filter.h -include/apache24/util_ldap.h -include/apache24/util_md5.h -include/apache24/util_mutex.h -include/apache24/util_script.h -include/apache24/util_time.h -include/apache24/util_varbuf.h -include/apache24/util_xml.h -libexec/apache24/httpd.exp -%%MOD_ACCESS_COMPAT%%libexec/apache24/mod_access_compat.so -%%MOD_ACTIONS%%libexec/apache24/mod_actions.so -%%MOD_ALIAS%%libexec/apache24/mod_alias.so -%%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so -%%MOD_ASIS%%libexec/apache24/mod_asis.so -%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so -%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so -%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so -%%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so -%%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so -%%MOD_AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so -%%MOD_AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so -%%MOD_AUTHN_FILE%%libexec/apache24/mod_authn_file.so -%%MOD_AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so -%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so -%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so -%%MOD_AUTHZ_CORE%%libexec/apache24/mod_authz_core.so -%%MOD_AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so -%%MOD_AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so -%%MOD_AUTHZ_GROUPFILE%%libexec/apache24/mod_authz_groupfile.so -%%MOD_AUTHZ_HOST%%libexec/apache24/mod_authz_host.so -%%MOD_AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so -%%MOD_AUTHZ_USER%%libexec/apache24/mod_authz_user.so -%%MOD_AUTOINDEX%%libexec/apache24/mod_autoindex.so -%%MOD_BROTLI%%libexec/apache24/mod_brotli.so -%%MOD_BUCKETEER%%libexec/apache24/mod_bucketeer.so -%%MOD_BUFFER%%libexec/apache24/mod_buffer.so -%%MOD_CACHE%%libexec/apache24/mod_cache.so -%%MOD_CACHE_DISK%%libexec/apache24/mod_cache_disk.so -%%MOD_CACHE_SOCACHE%%libexec/apache24/mod_cache_socache.so -%%MOD_CASE_FILTER%%libexec/apache24/mod_case_filter.so -%%MOD_CASE_FILTER_IN%%libexec/apache24/mod_case_filter_in.so -%%MOD_CERN_META%%libexec/apache24/mod_cern_meta.so -%%MOD_CGI%%libexec/apache24/mod_cgi.so -%%MOD_CGID%%libexec/apache24/mod_cgid.so -%%MOD_CHARSET_LITE%%libexec/apache24/mod_charset_lite.so -%%MOD_DATA%%libexec/apache24/mod_data.so -%%MOD_DAV%%libexec/apache24/mod_dav.so -%%MOD_DAV_FS%%libexec/apache24/mod_dav_fs.so -%%MOD_DAV_LOCK%%libexec/apache24/mod_dav_lock.so -%%MOD_DBD%%libexec/apache24/mod_dbd.so -%%MOD_DEFLATE%%libexec/apache24/mod_deflate.so -%%MOD_DIALUP%%libexec/apache24/mod_dialup.so -%%MOD_DIR%%libexec/apache24/mod_dir.so -%%MOD_DUMPIO%%libexec/apache24/mod_dumpio.so -%%MOD_ECHO%%libexec/apache24/mod_echo.so -%%MOD_ENV%%libexec/apache24/mod_env.so -%%MOD_EXAMPLE_HOOKS%%libexec/apache24/mod_example_hooks.so -%%MOD_EXAMPLE_IPC%%libexec/apache24/mod_example_ipc.so -%%MOD_EXPIRES%%libexec/apache24/mod_expires.so -%%MOD_EXT_FILTER%%libexec/apache24/mod_ext_filter.so -%%MOD_FILE_CACHE%%libexec/apache24/mod_file_cache.so -%%MOD_FILTER%%libexec/apache24/mod_filter.so -%%MOD_HEADERS%%libexec/apache24/mod_headers.so -%%MOD_HEARTBEAT%%libexec/apache24/mod_heartbeat.so -%%MOD_HEARTMONITOR%%libexec/apache24/mod_heartmonitor.so -%%MOD_HTTP2%%libexec/apache24/mod_http2.so -%%MOD_IDENT%%libexec/apache24/mod_ident.so -%%MOD_IMAGEMAP%%libexec/apache24/mod_imagemap.so -%%MOD_INCLUDE%%libexec/apache24/mod_include.so -%%MOD_INFO%%libexec/apache24/mod_info.so -%%MOD_LBMETHOD_BYBUSYNESS%%libexec/apache24/mod_lbmethod_bybusyness.so -%%MOD_LBMETHOD_BYREQUESTS%%libexec/apache24/mod_lbmethod_byrequests.so -%%MOD_LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so -%%MOD_LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so -%%MOD_LDAP%%libexec/apache24/mod_ldap.so -libexec/apache24/mod_log_config.so -%%MOD_LOG_DEBUG%%libexec/apache24/mod_log_debug.so -%%MOD_LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so -%%MOD_LOGIO%%libexec/apache24/mod_logio.so -%%MOD_LUA%%libexec/apache24/mod_lua.so -%%MOD_MACRO%%libexec/apache24/mod_macro.so -%%MOD_MIME%%libexec/apache24/mod_mime.so -%%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so -%%MPM_SHARED%%libexec/apache24/mod_mpm_event.so -%%MPM_SHARED%%libexec/apache24/mod_mpm_prefork.so -%%MPM_SHARED%%libexec/apache24/mod_mpm_worker.so -%%MOD_NEGOTIATION%%libexec/apache24/mod_negotiation.so -%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so -%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so -%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache24/mod_optional_hook_export.so -%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache24/mod_optional_hook_import.so -%%MOD_PROXY%%libexec/apache24/mod_proxy.so -%%MOD_PROXY_AJP%%libexec/apache24/mod_proxy_ajp.so -%%MOD_PROXY_BALANCER%%libexec/apache24/mod_proxy_balancer.so -%%MOD_PROXY_CONNECT%%libexec/apache24/mod_proxy_connect.so -%%MOD_PROXY_EXPRESS%%libexec/apache24/mod_proxy_express.so -%%MOD_PROXY_FCGI%%libexec/apache24/mod_proxy_fcgi.so -%%MOD_PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so -%%MOD_PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so -%%MOD_PROXY_HTML%%libexec/apache24/mod_proxy_html.so -%%MOD_PROXY_HCHECK%%libexec/apache24/mod_proxy_hcheck.so -%%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so -%%MOD_PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so -%%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so -%%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so -%%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so -%%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so -%%MOD_REMOTEIP%%libexec/apache24/mod_remoteip.so -%%MOD_REQTIMEOUT%%libexec/apache24/mod_reqtimeout.so -%%MOD_REQUEST%%libexec/apache24/mod_request.so -%%MOD_REWRITE%%libexec/apache24/mod_rewrite.so -%%MOD_SED%%libexec/apache24/mod_sed.so -%%MOD_SESSION%%libexec/apache24/mod_session.so -%%MOD_SESSION_COOKIE%%libexec/apache24/mod_session_cookie.so -%%MOD_SESSION_CRYPTO%%libexec/apache24/mod_session_crypto.so -%%MOD_SESSION_DBD%%libexec/apache24/mod_session_dbd.so -%%MOD_SETENVIF%%libexec/apache24/mod_setenvif.so -%%MOD_SLOTMEM_PLAIN%%libexec/apache24/mod_slotmem_plain.so -%%MOD_SLOTMEM_SHM%%libexec/apache24/mod_slotmem_shm.so -%%MOD_SOCACHE_DBM%%libexec/apache24/mod_socache_dbm.so -%%MOD_SOCACHE_DC%%libexec/apache24/mod_socache_dc.so -%%MOD_SOCACHE_MEMCACHE%%libexec/apache24/mod_socache_memcache.so -%%MOD_SOCACHE_SHMCB%%libexec/apache24/mod_socache_shmcb.so -%%MOD_SPELING%%libexec/apache24/mod_speling.so -%%MOD_SSL%%libexec/apache24/mod_ssl.so -%%MOD_STATUS%%libexec/apache24/mod_status.so -%%MOD_SUBSTITUTE%%libexec/apache24/mod_substitute.so -%%MOD_SUEXEC%%libexec/apache24/mod_suexec.so -%%MOD_UNIQUE_ID%%libexec/apache24/mod_unique_id.so -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 +include/apache25/ap_compat.h +include/apache25/ap_config.h +include/apache25/ap_config_auto.h +include/apache25/ap_config_layout.h +include/apache25/ap_expr.h +include/apache25/ap_hooks.h +include/apache25/ap_listen.h +include/apache25/ap_mmn.h +include/apache25/ap_mpm.h +include/apache25/ap_provider.h +include/apache25/ap_regex.h +include/apache25/ap_regkey.h +include/apache25/ap_release.h +include/apache25/ap_slotmem.h +include/apache25/ap_socache.h +include/apache25/apache_noprobes.h +include/apache25/apreq.h +include/apache25/apreq_cookie.h +include/apache25/apreq_error.h +include/apache25/apreq_module.h +include/apache25/apreq_param.h +include/apache25/apreq_parser.h +include/apache25/apreq_util.h +include/apache25/cache_common.h +include/apache25/heartbeat.h +include/apache25/http_config.h +include/apache25/http_connection.h +include/apache25/http_core.h +include/apache25/http_log.h +include/apache25/http_main.h +include/apache25/http_protocol.h +include/apache25/http_request.h +include/apache25/http_vhost.h +include/apache25/httpd.h +include/apache25/mod_auth.h +include/apache25/mod_cache.h +include/apache25/mod_cgi.h +include/apache25/mod_core.h +include/apache25/mod_dav.h +include/apache25/mod_dbd.h +include/apache25/mod_http2.h +include/apache25/mod_include.h +include/apache25/mod_log_config.h +include/apache25/mod_proxy.h +include/apache25/mod_request.h +include/apache25/mod_rewrite.h +include/apache25/mod_session.h +include/apache25/mod_serf.h +include/apache25/mod_so.h +include/apache25/mod_ssl.h +include/apache25/mod_ssl_openssl.h +include/apache25/mod_status.h +include/apache25/mod_unixd.h +include/apache25/mod_watchdog.h +include/apache25/mod_xml2enc.h +include/apache25/mpm_common.h +include/apache25/os.h +include/apache25/scoreboard.h +include/apache25/unixd.h +include/apache25/util_cfgtree.h +include/apache25/util_charset.h +include/apache25/util_cookies.h +include/apache25/util_ebcdic.h +include/apache25/util_fcgi.h +include/apache25/util_filter.h +include/apache25/util_ldap.h +include/apache25/util_md5.h +include/apache25/util_mutex.h +include/apache25/util_script.h +include/apache25/util_time.h +include/apache25/util_varbuf.h +include/apache25/util_xml.h +libexec/apache25/httpd.exp +%%ACCESS_COMPAT%%libexec/apache25/mod_access_compat.so +%%ACTIONS%%libexec/apache25/mod_actions.so +%%ALIAS%%libexec/apache25/mod_alias.so +%%ALLOWHANDLERS%%libexec/apache25/mod_allowhandlers.so +%%ALLOWMETHODS%%libexec/apache25/mod_allowmethods.so +%%APREQ%%libexec/apache25/mod_apreq.so +%%ASIS%%libexec/apache25/mod_asis.so +%%AUTH_BASIC%%libexec/apache25/mod_auth_basic.so +%%AUTH_DIGEST%%libexec/apache25/mod_auth_digest.so +%%AUTH_FORM%%libexec/apache25/mod_auth_form.so +%%AUTHN_ANON%%libexec/apache25/mod_authn_anon.so +%%AUTHN_CORE%%libexec/apache25/mod_authn_core.so +%%AUTHN_DBD%%libexec/apache25/mod_authn_dbd.so +%%AUTHN_DBM%%libexec/apache25/mod_authn_dbm.so +%%AUTHN_FILE%%libexec/apache25/mod_authn_file.so +%%AUTHN_SOCACHE%%libexec/apache25/mod_authn_socache.so +%%AUTHNZ_FCGI%%libexec/apache25/mod_authnz_fcgi.so +%%AUTHNZ_LDAP%%libexec/apache25/mod_authnz_ldap.so +%%AUTHZ_CORE%%libexec/apache25/mod_authz_core.so +%%AUTHZ_DBD%%libexec/apache25/mod_authz_dbd.so +%%AUTHZ_DBM%%libexec/apache25/mod_authz_dbm.so +%%AUTHZ_GROUPFILE%%libexec/apache25/mod_authz_groupfile.so +%%AUTHZ_HOST%%libexec/apache25/mod_authz_host.so +%%AUTHZ_OWNER%%libexec/apache25/mod_authz_owner.so +%%AUTHZ_USER%%libexec/apache25/mod_authz_user.so +%%AUTOINDEX%%libexec/apache25/mod_autoindex.so +%%BROTLI%%libexec/apache25/mod_brotli.so +%%BUCKETEER%%libexec/apache25/mod_bucketeer.so +%%BUFFER%%libexec/apache25/mod_buffer.so +%%CACHE%%libexec/apache25/mod_cache.so +%%CACHE_DISK%%libexec/apache25/mod_cache_disk.so +%%CACHE_SOCACHE%%libexec/apache25/mod_cache_socache.so +%%CASE_FILTER%%libexec/apache25/mod_case_filter.so +%%CASE_FILTER_IN%%libexec/apache25/mod_case_filter_in.so +%%CERN_META%%libexec/apache25/mod_cern_meta.so +%%CGI%%libexec/apache25/mod_cgi.so +%%CGID%%libexec/apache25/mod_cgid.so +%%CHARSET_LITE%%libexec/apache25/mod_charset_lite.so +%%CRYPTO%%libexec/apache25/mod_crypto.so +%%DATA%%libexec/apache25/mod_data.so +%%DAV%%libexec/apache25/mod_dav.so +%%DAV_FS%%libexec/apache25/mod_dav_fs.so +%%DAV_LOCK%%libexec/apache25/mod_dav_lock.so +%%DBD%%libexec/apache25/mod_dbd.so +%%DEFLATE%%libexec/apache25/mod_deflate.so +%%DIALUP%%libexec/apache25/mod_dialup.so +%%DIR%%libexec/apache25/mod_dir.so +%%DUMPIO%%libexec/apache25/mod_dumpio.so +%%ECHO%%libexec/apache25/mod_echo.so +%%ENV%%libexec/apache25/mod_env.so +%%EXAMPLE_HOOKS%%libexec/apache25/mod_example_hooks.so +%%EXAMPLE_IPC%%libexec/apache25/mod_example_ipc.so +%%EXPIRES%%libexec/apache25/mod_expires.so +%%EXT_FILTER%%libexec/apache25/mod_ext_filter.so +%%FILE_CACHE%%libexec/apache25/mod_file_cache.so +%%FILTER%%libexec/apache25/mod_filter.so +%%FIREHOSE%%libexec/apache25/mod_firehose.so +%%HEADERS%%libexec/apache25/mod_headers.so +%%HEARTBEAT%%libexec/apache25/mod_heartbeat.so +%%HEARTMONITOR%%libexec/apache25/mod_heartmonitor.so +%%HTTP2%%libexec/apache25/mod_http2.so +%%IDENT%%libexec/apache25/mod_ident.so +%%IMAGEMAP%%libexec/apache25/mod_imagemap.so +%%INCLUDE%%libexec/apache25/mod_include.so +%%INFO%%libexec/apache25/mod_info.so +%%LBMETHOD_BYBUSYNESS%%libexec/apache25/mod_lbmethod_bybusyness.so +%%LBMETHOD_BYREQUESTS%%libexec/apache25/mod_lbmethod_byrequests.so +%%LBMETHOD_BYTRAFFIC%%libexec/apache25/mod_lbmethod_bytraffic.so +%%LBMETHOD_HEARTBEAT%%libexec/apache25/mod_lbmethod_heartbeat.so +%%LDAP%%libexec/apache25/mod_ldap.so +%%LOG_CONFIG%%libexec/apache25/mod_log_config.so +%%LOG_DEBUG%%libexec/apache25/mod_log_debug.so +%%LOG_FORENSIC%%libexec/apache25/mod_log_forensic.so +%%LOGIO%%libexec/apache25/mod_logio.so +%%LUA%%libexec/apache25/mod_lua.so +%%MACRO%%libexec/apache25/mod_macro.so +%%MD%%libexec/apache25/mod_md.so +%%MIME%%libexec/apache25/mod_mime.so +%%MIME_MAGIC%%libexec/apache25/mod_mime_magic.so +%%MPM_SHARED%%libexec/apache25/mod_mpm_event.so +%%MPM_SHARED%%libexec/apache25/mod_mpm_motorz.so +%%MPM_SHARED%%libexec/apache25/mod_mpm_prefork.so +%%MPM_SHARED%%libexec/apache25/mod_mpm_simple.so +%%MPM_SHARED%%libexec/apache25/mod_mpm_worker.so +%%NEGOTIATION%%libexec/apache25/mod_negotiation.so +%%OPTIONAL_FN_EXPORT%%libexec/apache25/mod_optional_fn_export.so +%%OPTIONAL_FN_IMPORT%%libexec/apache25/mod_optional_fn_import.so +%%OPTIONAL_HOOK_EXPORT%%libexec/apache25/mod_optional_hook_export.so +%%OPTIONAL_HOOK_IMPORT%%libexec/apache25/mod_optional_hook_import.so +%%POLICY%%libexec/apache25/mod_policy.so +%%PROXY%%libexec/apache25/mod_proxy.so +%%PROXY_AJP%%libexec/apache25/mod_proxy_ajp.so +%%PROXY_BALANCER%%libexec/apache25/mod_proxy_balancer.so +%%PROXY_CONNECT%%libexec/apache25/mod_proxy_connect.so +%%PROXY_EXPRESS%%libexec/apache25/mod_proxy_express.so +%%PROXY_FCGI%%libexec/apache25/mod_proxy_fcgi.so +%%PROXY_FDPASS%%libexec/apache25/mod_proxy_fdpass.so +%%PROXY_FTP%%libexec/apache25/mod_proxy_ftp.so +%%PROXY_HTML%%libexec/apache25/mod_proxy_html.so +%%PROXY_HCHECK%%libexec/apache25/mod_proxy_hcheck.so +%%PROXY_HTTP%%libexec/apache25/mod_proxy_http.so +%%PROXY_HTTP2%%libexec/apache25/mod_proxy_http2.so +%%PROXY_SCGI%%libexec/apache25/mod_proxy_scgi.so +%%PROXY_UWSGI%%libexec/apache25/mod_proxy_uwsgi.so +%%PROXY_WSTUNNEL%%libexec/apache25/mod_proxy_wstunnel.so +%%RATELIMIT%%libexec/apache25/mod_ratelimit.so +%%REFLECTOR%%libexec/apache25/mod_reflector.so +%%REMOTEIP%%libexec/apache25/mod_remoteip.so +%%REQTIMEOUT%%libexec/apache25/mod_reqtimeout.so +%%REQUEST%%libexec/apache25/mod_request.so +%%REWRITE%%libexec/apache25/mod_rewrite.so +%%SED%%libexec/apache25/mod_sed.so +%%SESSION%%libexec/apache25/mod_session.so +%%SESSION_COOKIE%%libexec/apache25/mod_session_cookie.so +%%SESSION_CRYPTO%%libexec/apache25/mod_session_crypto.so +%%SESSION_DBD%%libexec/apache25/mod_session_dbd.so +%%SETENVIF%%libexec/apache25/mod_setenvif.so +%%SLOTMEM_PLAIN%%libexec/apache25/mod_slotmem_plain.so +%%SLOTMEM_SHM%%libexec/apache25/mod_slotmem_shm.so +%%SOCACHE_DBM%%libexec/apache25/mod_socache_dbm.so +%%SOCACHE_DC%%libexec/apache25/mod_socache_dc.so +%%SOCACHE_MEMCACHE%%libexec/apache25/mod_socache_memcache.so +%%SOCACHE_SHMCB%%libexec/apache25/mod_socache_shmcb.so +%%SPELING%%libexec/apache25/mod_speling.so +%%SSL%%libexec/apache25/mod_ssl.so +%%SSL_CT%%libexec/apache25/mod_ssl_ct.so +%%STATUS%%libexec/apache25/mod_status.so +%%SUBSTITUTE%%libexec/apache25/mod_substitute.so +%%SUEXEC%%libexec/apache25/mod_suexec.so +%%SYSLOG%%libexec/apache25/mod_syslog.so +%%UNIQUE_ID%%libexec/apache25/mod_unique_id.so +libexec/apache25/mod_unixd.so +%%USERDIR%%libexec/apache25/mod_userdir.so +%%USERTRACK%%libexec/apache25/mod_usertrack.so +%%VERSION%%libexec/apache25/mod_version.so +%%VHOST_ALIAS%%libexec/apache25/mod_vhost_alias.so +%%WATCHDOG%%libexec/apache25/mod_watchdog.so +%%XML2ENC%%libexec/apache25/mod_xml2enc.so man/man1/ab.1.gz man/man1/apxs.1.gz man/man1/dbmmanage.1.gz +man/man1/firehose.1.gz man/man1/htdbm.1.gz man/man1/htdigest.1.gz man/man1/htpasswd.1.gz @@ -227,16 +251,19 @@ man/man8/rotatelogs.8.gz man/man8/suexec.8.gz sbin/apachectl -sbin/apxs +@comment sbin/apxs +bin/apxs %%FORENSIC%%sbin/check_forensic sbin/checkgid -sbin/dbmmanage +sbin/ctlogconfig +@comment sbin/dbmmanage +bin/dbmmanage sbin/envvars +sbin/envvars-std sbin/fcgistarter sbin/htcacheclean sbin/httpd sbin/rotatelogs -sbin/split-logfile %%SUEXEC%%@(,,4755) sbin/suexec %%DATADIR%%/build/config.nice %%DATADIR%%/build/config_vars.mk