From owner-svn-ports-all@FreeBSD.ORG Thu Aug 23 04:49:37 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D6D4B106566B; Thu, 23 Aug 2012 04:49:37 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BFD1E8FC0C; Thu, 23 Aug 2012 04:49:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7N4nbqv058998; Thu, 23 Aug 2012 04:49:37 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7N4nb1K058989; Thu, 23 Aug 2012 04:49:37 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201208230449.q7N4nb1K058989@svn.freebsd.org> From: Olli Hauer Date: Thu, 23 Aug 2012 04:49:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302979 - in head: Mk www/apache22 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2012 04:49:38 -0000 Author: ohauer Date: Thu Aug 23 04:49:36 2012 New Revision: 302979 URL: http://svn.freebsd.org/changeset/ports/302979 Log: - rewite apache port - remove all apr/apu related parts (leftovers from bundled apr) - remove invalid parts from Makefile.doc - move MODULES to Makefile.options - remove apache20 parts - remove category handling with hat apache@ Modified: head/Mk/bsd.apache.mk head/www/apache22/Makefile head/www/apache22/Makefile.doc head/www/apache22/Makefile.modules head/www/apache22/Makefile.options head/www/apache22/pkg-plist Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Thu Aug 23 04:39:53 2012 (r302978) +++ head/Mk/bsd.apache.mk Thu Aug 23 04:49:36 2012 (r302979) @@ -37,8 +37,8 @@ # # Examples: # USE_APACHE= 22 # specify exact version -# USE_APACHE= 20+ # specify [min] version, no [max] version -# USE_APACHE= 20-22 # specify [min]-[max] range +# USE_APACHE= 22+ # specify [min] version, no [max] version +# USE_APACHE= 22-24 # specify [min]-[max] range # USE_APACHE= -22 # specify [max] version, no [min] version # # Note: @@ -50,7 +50,7 @@ # # - The following values for USE_APACHE are reserverd and only valid # in apache-server ports! -# USE_APACHE= common20, and common22 +# USE_APACHE= common22 # # # The following variables can be used (ro) in ports Makefile @@ -81,7 +81,7 @@ Apache_Pre_Include= bsd.apache.mk DEFAULT_APACHE_VERSION= 22 -APACHE_SUPPORTED_VERSION= 22 20 # preferred version first +APACHE_SUPPORTED_VERSION= 22 # preferred version first # Print warnings _ERROR_MSG= : Error from bsd.apache.mk. @@ -93,9 +93,9 @@ _ERROR_MSG= : Error from bsd.apache.mk. .if defined(USE_APACHE) && !empty(USE_APACHE) . if ${USE_APACHE:Mcommon*} != "" AP_PORT_IS_SERVER= yes -. elif ${USE_APACHE:C/\-//:S/^20//:S/^22//:C/\+$//} == "" +. elif ${USE_APACHE:C/\-//:S/^22//:C/\+$//} == "" AP_PORT_IS_MODULE= yes -. if ${USE_APACHE:C/\-//:S/^20//:S/^22//} == "+" +. if ${USE_APACHE:C/\-//:S/^22//} == "+" AP_PLUS= yes . endif . else @@ -133,7 +133,6 @@ ALL_MODULES_CATEGORIES+= SLAVE_PORT # Module selection .for category in ${DEFAULT_MODULES_CATEGORIES} DEFAULT_MODULES+= ${${category}_MODULES} -WITH_${category}_MODULES= yes .endfor .for category in ${ALL_MODULES_CATEGORIES} @@ -179,30 +178,6 @@ _APACHE_MODULES+= ${module} WITHOUT_MODULES+= ${module} . endif .endfor - -# MFC TODO: remove together with apache20 -.elif defined(WITH_MODULES) -_APACHE_MODULES+= ${WITH_MODULES} -.else -# MFC TODO: remove together with apache20 -.for category in ${ALL_MODULES_CATEGORIES} -. if defined (WITHOUT_${category}_MODULES) || defined (WITH_CUSTOM_${category}) -. if defined(WITH_${category}_MODULES}) -. undef WITH_${category}_MODULES -. endif -. if defined (WITH_CUSTOM_${category}) -_APACHE_MODULES+= ${WITH_CUSTOM_${category}:U} -. endif -. elif defined(WITH_${category}_MODULES) -_APACHE_MODULES+= ${${category}_MODULES:U} -. endif -.endfor -# MFC TODO: remove this check -# last usage of WITH_EXTRA_MODULES in apache22/Makefile.modules -# http://www.freebsd.org/cgi/cvsweb.cgi/ports/www/apache22/Makefile.modules.diff?r1=text&tr1=1.1&r2=text&tr2=1.3 -.if defined(WITH_EXTRA_MODULES) -_APACHE_MODULES+= ${WITH_EXTRA_MODULES:U} -.endif .endif .if !defined(WITH_STATIC_APACHE) @@ -365,13 +340,7 @@ IGNORE?= PREFIX must be equal to APXS_PR . endif .endif -.if ${APACHE_VERSION} == 20 -AP_BUILDEXT= la -APACHEMODDIR= libexec/apache2 -APACHEINCLUDEDIR=include/apache2 -APACHEETCDIR= etc/apache2 -APACHE_PORT?= www/apache${APACHE_VERSION} -.elif ${APACHE_VERSION} >= 22 +.if ${APACHE_VERSION} >= 22 AP_BUILDEXT= la APACHEMODDIR= libexec/apache${APACHE_VERSION} APACHEINCLUDEDIR=include/apache${APACHE_VERSION} @@ -418,7 +387,7 @@ AP_EXTRAS+= -L ${AP_LIB} Apache_Post_Include= bsd.apache.mk .if defined(USE_APACHE_RUN) && !empty(USE_APACHE_RUN) -. if ${USE_APACHE_RUN:C/\-//:S/^20//:S/^22//:C/\+$//} != "" +. if ${USE_APACHE_RUN:C/\-//:S/^22//:C/\+$//} != "" IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( ${USE_APACHE_RUN} ) . endif .elif defined(USE_APACHE_RUN) @@ -426,7 +395,7 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE .endif .if defined(USE_APACHE_BUILD) && !empty(USE_APACHE_BUILD) -. if ${USE_APACHE_BUILD:C/\-//:S/^20//:S/^22//:C/\+$//} != "" +. if ${USE_APACHE_BUILD:C/\-//:S/^22//:C/\+$//} != "" IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_BUILD ( ${USE_APACHE_BUILD} ) . endif .elif defined(USE_APACHE_BUILD) @@ -499,7 +468,7 @@ ap-gen-plist: .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" -# apache22/20 +# apache22 @${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Thu Aug 23 04:39:53 2012 (r302978) +++ head/www/apache22/Makefile Thu Aug 23 04:49:36 2012 (r302979) @@ -24,24 +24,25 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ MAKE_JOBS_SAFE= yes +# to be removed if port is renamed to apache22 +ETCDIR= ${PREFIX}/etc/${PORTNAME}22 +WWWDIR= ${PREFIX}/www/${PORTNAME}22 LATEST_LINK?= apache22 CONFLICTS= caudium14-1.* \ apache-2.0.* apache-*-2.0.* \ apache-*-2.2.* -USE_APACHE= common22 -USE_BZIP2= yes -USE_ICONV= yes -USE_AUTOTOOLS= autoconf libtool -USE_PERL5= yes -USE_RC_SUBR= apache22 htcacheclean +USE_APACHE= common22 +USE_BZIP2= yes +USE_ICONV= yes +USE_AUTOTOOLS= autoconf libtool +USE_PERL5= yes +USE_RC_SUBR= apache22 htcacheclean LIBTOOLFILES= configure.in -USERS= www -GROUPS= www - -MPM_ITK_VERSION?= 20110321-01 +USERS= www +GROUPS= www # for slave ports .if !defined(MASTERDIR) @@ -50,17 +51,15 @@ APACHEDIR= ${.CURDIR} APACHEDIR= ${MASTERDIR} .endif -.if !defined(WITHOUT_APACHE_OPTIONS) +WITH_MPM?= prefork # or worker, event, itk +WITH_HTTP_PORT?= 80 + +MPM_ITK_VERSION?= 20110321-01 + .include "${APACHEDIR}/Makefile.options" -.endif +.include -.if defined(WITH_SUEXEC_RSRCLIMIT) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit -.if !defined(WITH_SUEXEC) -IGNORE= suEXEC resource limit patch requires mod_suexec.\ - Please (re)run 'make config' and choose SUEXEC option also -.endif -.endif +APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ @@ -71,7 +70,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDES --enable-http \ --with-pcre=${LOCALBASE} \ --with-apr=${LOCALBASE}/bin/apr-1-config \ - --with-apr-util=${LOCALBASE}/bin/apu-1-config + --with-apr-util=${APU_CONFIG} CONFIGURE_ENV= \ CONFIG_SHELL="${SH}" \ @@ -82,80 +81,52 @@ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},, MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" -WITH_MPM?= prefork # or worker, event, itk +# ============================================= +# CONFIGURE_ARGS willl be handled in Makefile.modules, +# here we do only OPTIONS fixups -WITH_HTTP_PORT?= 80 - -.if defined(WITH_STATIC_SUPPORT) -CONFIGURE_ARGS+= --enable-static-support +.if defined(WITH_SUEXEC_RSRCLIMIT) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit +.if !defined(WITH_SUEXEC) +IGNORE= suEXEC resource limit patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also .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 +.if !defined(WITHOUT_SSL) +USE_OPENSSL= yes +WITH_MODULES+= SSL .endif -.include "${APACHEDIR}/Makefile.doc" -.include "${APACHEDIR}/Makefile.modules" -.include - -# OPTIONS fixups -.if defined (WITH_AUTHNZ_LDAP) +.if defined(WITH_AUTHNZ_LDAP) WITH_LDAP= yes .endif -.include "${APACHEDIR}/Makefile.modules" - -.if (defined(WITH_SSL)|| !defined(WITHOUT_SSL_MODULES)) -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} +.if defined (WITH_LDAP) +USE_OPENLDAP= yes +WITH_AUTHNZ_LDAP=yes .endif -.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES) -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --enable-ldap=shared --with-ldap --enable-authnz-ldap \ - --with-ldap-lib="${LOCALBASE}/lib" \ - --with-ldap-include="${LOCALBASE}/include" +.if defined(WITH_MYSQL) +USE_MYSQL= yes +WITH_THREADS= yes .endif -.if defined(WITHOUT_IPV6) -CONFIGURE_ARGS+= --disable-ipv6 -.else -CATEGORIES+= ipv6 -. if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED) -CONFIGURE_ARGS+= --disable-v4-mapped -. else -CONFIGURE_ARGS+= --enable-v4-mapped -. endif +.if defined(WITH_PGSQL) +USE_PGSQL= yes .endif -.if defined(WITH_THREADS) -CONFIGURE_ARGS+= --enable-threads -. if ${ARCH} == i386 -CONFIGURE_ARGS+= --enable-nonportable-atomics -. endif +.if defined(WITH_SQLITE) +USE_SQLITE= yes .endif -.if defined(WITH_AUTH_DIGEST) -WITH_DEVRANDOM= yes -.endif -.if defined(WITH_DEVRANDOM) -CONFIGURE_ARGS+= --with-devrandom -.endif - -CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} +.include "${APACHEDIR}/Makefile.doc" +.include +.include "${APACHEDIR}/Makefile.modules" pre-everything:: @${ECHO_MSG} "" - @${ECHO_MSG} " You can check your modules configuration by using make show-modules" + @${ECHO_MSG} " You can check your modules configuration by using make show-modules" @${ECHO_MSG} " To see all available knobs, type make show-options" @${ECHO_MSG} " To see all modules in different categories, type make show-categories" @${ECHO_MSG} "" @@ -178,9 +149,11 @@ post-install: @${MKDIR} ${PREFIX}/etc/apache22/envvars.d @${MKDIR} ${PREFIX}/etc/apache22/Includes @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${PREFIX}/etc/apache22/Includes + .if defined(WITH_LOG_FORENSIC) @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${PREFIX}/sbin .endif + .if !defined(NOPORTDOCS) .for dir in style/lang style/xsl/util style/xsl @[ -d ${DOCSDIR}/${dir}/ ] && ${TOUCH} ${DOCSDIR}/${dir}/.keepme Modified: head/www/apache22/Makefile.doc ============================================================================== --- head/www/apache22/Makefile.doc Thu Aug 23 04:39:53 2012 (r302978) +++ head/www/apache22/Makefile.doc Thu Aug 23 04:49:36 2012 (r302979) @@ -8,23 +8,12 @@ # $FreeBSD$ # -## Available knobs: -## WITHOUT_APACHE_OPTIONS: Don't use OPTIONS and will allow you to use -## those knobs directly to select modules. -## Knobs with (*) are working only if -## WITHOUT_APACHE_OPTIONS is defined. ## ## By default, modules are compiled as dynamically loadable modules (DSO). ## ## Modules knobs philosophy: -## Modules are split in categories, "make show-categories" shows you -## which modules they contain. You can enable/disable/customize a category (*): -## - To enable a category: WITH__MODULES=yes -## [WITH_PROXY_MODULES=yes] -## - To disable a category: WITHOUT__MODULES=yes -## [WITHOUT_DAV_MODULES=yes] -## - To customize a category: WITH_CUSTOM_ -## [WITH_CUSTOM_PROXY="proxy proxy_http"] +## Note: Use this only for special builds, modules should be selected by +## #> make config ## ## Apache-related ## WITH_MPM: prefork (default) @@ -32,20 +21,9 @@ ## event ## itk ## WITH_HTTP_PORT: default: 80 -## WITH_LDAP: Enable LDAP support (mod_auth_ldap) (implies WITH_LDAP_MODULES) -## WITH_(MYSQL|PGSQL|SQLITE): Enable SQL backend for dbd and apr_dbd. -## When MySQL is chosen, threads are enabled. ## WITHOUT_V4MAPPED ## WITH_IPV6_V6ONLY: Don't allow IPv6 sockets to handle IPv4 ## connections -## WITHOUT_SSL: Disable SSL support -## WITH_THREADS: Enable threads support -## WITH_DBM: Choose your DBM: bdb (Berkeley DB), gdbm or -## ndbm (default) -## WITH_BDB: Define to select bdb via bsd.database.mk -## desired version may be set with -## WITH_BDB_VER or APACHE22_WITH_BDB_VER -## WITH_BDB_BASE: Define to use bdb from base (1.85) ## WITH_STATIC_SUPPORT: Build statically linked support binaries ## WITH_STATIC_APACHE: Build a static version of httpd (implies ## WITH_STATIC_MODULES) @@ -56,8 +34,6 @@ ## WITH_MODULES or with default configuration ## use 'make show-modules', to check if they are ## enabled) -## WITH_MODULES (*): List of modules you choose -## WITHOUT_MODULES (*): Disable selected modules ## WITH_SUEXEC: Enable suExec support ## SUEXEC_DOCROOT: SuExec root directory ## SUEXEC_USERDIR: User subdirectory (default public_html) @@ -75,21 +51,17 @@ ## WITH_EXCEPTION_HOOK: Enable fatal exception hook ## ## Optional patches: -## WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported -## from apr/httpd SVN repositories) ## WITH_ITK_PERDIR_REGEX Add the per-directory setting AssignUserFromPath for mpm-itk ## as described on http://www.pvv.ntnu.no/~knuta/mpm-itk/ ## ## Available make targets: +## config: open the configure dialog +## show config: prints configured options ## show-options: prints this message ## show-modules: prints list of available modules -## show-categories: prints list of modules sorted by category ## ## Examples (*): -## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes \ -## WITH_CUSTOM_AUTH="AUTH AUTH_DBM" -## make WITHOUT_MODULES="ACCESS SPELING STATUS" WITH_PROXY_MODULES=yes -## make WITH_MODULES="INCLUDE REWRITE AUTH" +## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes ## Note: If you define your custom options in /etc/make.conf, don't forget ## to do not use quotes. ## Modified: head/www/apache22/Makefile.modules ============================================================================== --- head/www/apache22/Makefile.modules Thu Aug 23 04:39:53 2012 (r302978) +++ head/www/apache22/Makefile.modules Thu Aug 23 04:49:36 2012 (r302979) @@ -12,42 +12,9 @@ # $FreeBSD$ # -.if !defined(Module_inc) -Module_inc= done - -AUTH_MODULES= AUTH_BASIC AUTH_DIGEST -AUTHN_MODULES= AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \ - AUTHN_ALIAS -AUTHZ_MODULES= AUTHZ_HOST AUTHZ_GROUPFILE AUTHZ_USER AUTHZ_DBM \ - AUTHZ_OWNER AUTHZ_DEFAULT -CACHE_MODULES= CACHE DISK_CACHE FILE_CACHE MEM_CACHE -DAV_MODULES= DAV DAV_FS -EXPERIMENTAL_MODULES= BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \ - LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \ - OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT -LDAP_MODULES= LDAP AUTHNZ_LDAP -MISC_MODULES+= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ - CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \ - HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \ - MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \ - UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT -PROXY_MODULES= PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_AJP PROXY_BALANCER PROXY_SCGI -SSL_MODULES= SSL -SUEXEC_MODULES= SUEXEC -THREADS_MODULES= CGID - -DEFAULT_MODULES_CATEGORIES= \ - AUTH AUTHN AUTHZ DAV CACHE MISC - -ALL_MODULES_CATEGORIES= AUTH AUTHN AUTHZ CACHE DAV EXPERIMENTAL LDAP \ - MISC PROXY SSL SUEXEC THREADS - -.endif - -# ============================================= .if defined(_PREMKINCLUDED) +# ============================================= # MPM's: prefork worker event itk peruser - .if ${WITH_MPM:L} == "prefork" PLIST_SUB+= WORKER="@comment " EVENT="@comment " @@ -78,74 +45,47 @@ LATEST_LINK= apache22-${WITH_MPM:L}-mpm .if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "event" WITH_THREADS= yes -WITH_THREADS_MODULES= yes +WITH_MODULES+= CGID WITHOUT_MODULES+= CGI .endif +# ============================================= -# xDBM section -# -# XXX WITH_BERKELEYDB is deprecated -# this section need rewrite -.if !defined(WITH_DBM) -. if defined(WITH_BDB) || defined(WITH_BDB_BASE) || defined(WITH_BERKELEYDB) -WITH_DBM= bdb -PLIST_SUB+= BDB="" -. else -PLIST_SUB+= BDB="@comment " -. endif -.endif - -.if defined(WITH_BERKELEYDB) && !defined(WITH_BDB_VER) -. if ${WITH_BERKELEYDB} == "FreeBSD" -WITH_BDB_BASE= yes -. else -WITH_BDB_VER= ${WITH_BERKELEYDB:S/db//} -. endif -.endif - -.if defined(WITH_DBM) -. if ${WITH_DBM:L} == "sdbm" -CONFIGURE_ARGS+= --with-dbm=sdbm -. elif ${WITH_DBM:L} == "gdbm" -LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm -CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} -. elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb" -. if defined(WITH_BDB_BASE) -CONFIGURE_ARGS+= --with-dbm=db185 \ - --with-berkeley-db=/usr -. else -USE_BDB= yes -CONFIGURE_ARGS+= --with-dbm=db${BDB_VER:S/40/4/} \ - --with-berkeley-db=${LOCALBASE} -. endif -. else -IGNORE= "Unknown DBM" -. endif -.else -CONFIGURE_ARGS+= --with-dbm=sdbm +# XXX WITH_STATIC_SUPPORT : make.conf, or command line parameter +.if defined(WITH_STATIC_SUPPORT) +CONFIGURE_ARGS+= --enable-static-support +.endif + +# XXX WITH_DEBUG : make.conf, or command line parameter +# 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 + +# WITH_EXCEPTION_HOOK: parameter for command line or make.conf +.if defined(WITH_EXCEPTION_HOOK) +CONFIGURE_ARGS+= --enable-exception-hook .endif -.if defined(WITH_MYSQL) -USE_MYSQL= yes -WITH_THREADS= yes +.if !defined(WITHOUT_SSL) +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif -.if defined(WITH_PGSQL) -USE_PGSQL= yes +.if defined (WITH_AUTHNZ_LDAP) +CONFIGURE_ARGS+= --enable-authnz-ldap .endif -.if defined(WITH_SQLITE) -USE_SQLITE= yes -.endif - -.if !defined(WITHOUT_SSL) -WITH_SSL_MODULES= yes -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.if defined (WITH_LDAP) +CONFIGURE_ARGS+= --enable-ldap=shared .endif .if !defined(WITH_THREADS) WITHOUT_MODULES+= MEM_CACHE -. if !defined(WITHOUT_APACHE_OPTIONS) && defined(WITH_MEM_CACHE) +. if defined(WITH_MEM_CACHE) IGNORE+= mod_mem_cache requires WITH_THREADS . endif .else @@ -155,9 +95,22 @@ LDFLAGS+= ${PTHREAD_LIBS} .if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) WITHOUT_MODULES+= AUTHN_DBD DBD -. if !defined(WITHOUT_APACHE_OPTIONS) && (defined(WITH_DBD) || defined(WITH_AUTHN_DBD)) +. if defined(WITH_DBD) || defined(WITH_AUTHN_DBD) IGNORE+= You need to enable at least one DBD backend . endif .endif +.if defined(WITHOUT_IPV6) +CONFIGURE_ARGS+= --disable-ipv6 +.else +CATEGORIES+= ipv6 +. if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED) +CONFIGURE_ARGS+= --disable-v4-mapped +. else +CONFIGURE_ARGS+= --enable-v4-mapped +. endif +.endif + +CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} + .endif # _PREMKINCLUDED Modified: head/www/apache22/Makefile.options ============================================================================== --- head/www/apache22/Makefile.options Thu Aug 23 04:39:53 2012 (r302978) +++ head/www/apache22/Makefile.options Thu Aug 23 04:49:36 2012 (r302979) @@ -1,12 +1,43 @@ # $FreeBSD$ +.if !defined(Module_inc) +Module_inc= done + +AUTH_MODULES= AUTH_BASIC AUTH_DIGEST +AUTHN_MODULES= AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \ + AUTHN_ALIAS +AUTHZ_MODULES= AUTHZ_HOST AUTHZ_GROUPFILE AUTHZ_USER AUTHZ_DBM \ + AUTHZ_OWNER AUTHZ_DEFAULT +CACHE_MODULES= CACHE DISK_CACHE FILE_CACHE MEM_CACHE +DAV_MODULES= DAV DAV_FS +EXPERIMENTAL_MODULES= BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \ + LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \ + OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT +LDAP_MODULES= LDAP AUTHNZ_LDAP +MISC_MODULES+= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ + CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \ + HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \ + MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \ + UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT +PROXY_MODULES= PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_AJP PROXY_BALANCER \ + PROXY_SCGI +SSL_MODULES= SSL +SUEXEC_MODULES= SUEXEC +THREADS_MODULES= CGID + +DEFAULT_MODULES_CATEGORIES= \ + AUTH AUTHN AUTHZ DAV CACHE MISC + +ALL_MODULES_CATEGORIES= AUTH AUTHN AUTHZ CACHE DAV EXPERIMENTAL LDAP \ + MISC PROXY SSL SUEXEC THREADS +.endif + OPTIONS= \ - THREADS "Threads support in APR" off \ - MYSQL "MySQL support for apr-dbd" off \ - PGSQL "PostgreSQL support for apr-dbd" off \ - SQLITE "SQLite support for apr-dbd" off \ - IPV6 "IPv6 support" on \ - BDB "BerkeleyDB dbm" off + THREADS "apr was build with threads" off \ + MYSQL "apu was build with MySQL" off \ + PGSQL "apu was build with PgSQL" off \ + SQLITE "apu was build with SQLite" off \ + IPV6 "IPv6 support" on OPTIONS+= \ AUTH_BASIC "mod_auth_basic" on \ Modified: head/www/apache22/pkg-plist ============================================================================== --- head/www/apache22/pkg-plist Thu Aug 23 04:39:53 2012 (r302978) +++ head/www/apache22/pkg-plist Thu Aug 23 04:49:36 2012 (r302979) @@ -1,50 +1,50 @@ @comment $FreeBSD$ -@exec mkdir -p %D/etc/apache22/extra 2> /dev/null -@exec mkdir -p %D/etc/apache22/Includes 2> /dev/null || true -@exec mkdir -p %D/etc/apache22/envvars.d 2> /dev/null || true -@unexec if cmp %D/etc/apache22/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache22/httpd.conf; fi +@exec mkdir -p %D/%%ETCDIR%%/extra 2> /dev/null +@exec mkdir -p %D/%%ETCDIR%%/Includes 2> /dev/null || true +@exec mkdir -p %D/%%ETCDIR%%/envvars.d 2> /dev/null || true +@unexec if cmp %D/%%ETCDIR%%/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/%%ETCDIR%%/httpd.conf; fi %%EXAMPLESDIR%%/httpd.conf -@exec [ -f %D/etc/apache22/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache22/httpd.conf -@unexec if cmp -s %D/etc/apache22/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/etc/apache22/magic; fi +@exec [ -f %D/%%ETCDIR%%/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/%%ETCDIR%%/httpd.conf +@unexec if cmp -s %D/%%ETCDIR%%/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/%%ETCDIR%%/magic; fi %%EXAMPLESDIR%%/magic -@exec [ -f %D/etc/apache22/magic ] || cp %D/%%EXAMPLESDIR%%/magic %D/etc/apache22/magic -@unexec if cmp -s %D/etc/apache22/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/etc/apache22/mime.types; fi +@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/etc/apache22/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/etc/apache22/mime.types -@unexec if cmp -s %D/etc/apache22/extra/httpd-autoindex.conf %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf; then rm -f %D/etc/apache22/extra/httpd-autoindex.conf; fi +@exec [ -f %D/%%ETCDIR%%/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/%%ETCDIR%%/mime.types +@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/etc/apache22/extra/httpd-autoindex.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf %D/etc/apache22/extra/httpd-autoindex.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-dav.conf %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf; then rm -f %D/etc/apache22/extra/httpd-dav.conf; fi +@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/etc/apache22/extra/httpd-dav.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf %D/etc/apache22/extra/httpd-dav.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-default.conf %D/%%EXAMPLESDIR%%/extra/httpd-default.conf; then rm -f %D/etc/apache22/extra/httpd-default.conf; fi +@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/etc/apache22/extra/httpd-default.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-default.conf %D/etc/apache22/extra/httpd-default.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-info.conf %D/%%EXAMPLESDIR%%/extra/httpd-info.conf; then rm -f %D/etc/apache22/extra/httpd-info.conf; fi +@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/etc/apache22/extra/httpd-info.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-info.conf %D/etc/apache22/extra/httpd-info.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-languages.conf %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf; then rm -f %D/etc/apache22/extra/httpd-languages.conf; fi +@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/etc/apache22/extra/httpd-languages.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf %D/etc/apache22/extra/httpd-languages.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-manual.conf %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf; then rm -f %D/etc/apache22/extra/httpd-manual.conf; fi +@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/etc/apache22/extra/httpd-manual.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf %D/etc/apache22/extra/httpd-manual.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-mpm.conf %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf; then rm -f %D/etc/apache22/extra/httpd-mpm.conf; fi +@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/etc/apache22/extra/httpd-mpm.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf %D/etc/apache22/extra/httpd-mpm.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-multilang-errordoc.conf %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf; then rm -f %D/etc/apache22/extra/httpd-multilang-errordoc.conf; fi +@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/etc/apache22/extra/httpd-multilang-errordoc.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf %D/etc/apache22/extra/httpd-multilang-errordoc.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-ssl.conf %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf; then rm -f %D/etc/apache22/extra/httpd-ssl.conf; fi +@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/etc/apache22/extra/httpd-ssl.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf %D/etc/apache22/extra/httpd-ssl.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-userdir.conf %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf; then rm -f %D/etc/apache22/extra/httpd-userdir.conf; fi +@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/etc/apache22/extra/httpd-userdir.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf %D/etc/apache22/extra/httpd-userdir.conf -@unexec if cmp -s %D/etc/apache22/extra/httpd-vhosts.conf %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf; then rm -f %D/etc/apache22/extra/httpd-vhosts.conf; fi +@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/etc/apache22/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/etc/apache22/extra/httpd-vhosts.conf -etc/apache22/Includes/no-accf.conf +@exec [ -f %D/%%ETCDIR%%/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/%%ETCDIR%%/extra/httpd-vhosts.conf +%%ETCDIR%%/Includes/no-accf.conf include/apache22/ap_compat.h include/apache22/ap_config.h include/apache22/ap_config_auto.h @@ -99,21 +99,21 @@ libexec/apache22/httpd.exp %%MOD_ACTIONS%%libexec/apache22/mod_actions.so %%MOD_ALIAS%%libexec/apache22/mod_alias.so %%MOD_ASIS%%libexec/apache22/mod_asis.so -%%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.so -%%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.so +%%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.so %%MOD_AUTHN_ALIAS%%libexec/apache22/mod_authn_alias.so %%MOD_AUTHN_ANON%%libexec/apache22/mod_authn_anon.so %%MOD_AUTHN_DBD%%libexec/apache22/mod_authn_dbd.so %%MOD_AUTHN_DBM%%libexec/apache22/mod_authn_dbm.so %%MOD_AUTHN_DEFAULT%%libexec/apache22/mod_authn_default.so %%MOD_AUTHN_FILE%%libexec/apache22/mod_authn_file.so -%%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.so %%MOD_AUTHZ_DBM%%libexec/apache22/mod_authz_dbm.so %%MOD_AUTHZ_DEFAULT%%libexec/apache22/mod_authz_default.so %%MOD_AUTHZ_GROUPFILE%%libexec/apache22/mod_authz_groupfile.so %%MOD_AUTHZ_HOST%%libexec/apache22/mod_authz_host.so %%MOD_AUTHZ_OWNER%%libexec/apache22/mod_authz_owner.so %%MOD_AUTHZ_USER%%libexec/apache22/mod_authz_user.so +%%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.so +%%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.so %%MOD_AUTOINDEX%%libexec/apache22/mod_autoindex.so %%MOD_BUCKETEER%%libexec/apache22/mod_bucketeer.so %%MOD_CACHE%%libexec/apache22/mod_cache.so @@ -140,17 +140,17 @@ libexec/apache22/httpd.exp %%MOD_INCLUDE%%libexec/apache22/mod_include.so %%MOD_INFO%%libexec/apache22/mod_info.so %%MOD_LDAP%%libexec/apache22/mod_ldap.so +%%MOD_LOGIO%%libexec/apache22/mod_logio.so %%MOD_LOG_CONFIG%%libexec/apache22/mod_log_config.so %%MOD_LOG_FORENSIC%%libexec/apache22/mod_log_forensic.so -%%MOD_LOGIO%%libexec/apache22/mod_logio.so %%MOD_MEM_CACHE%%libexec/apache22/mod_mem_cache.so %%MOD_MIME%%libexec/apache22/mod_mime.so %%MOD_MIME_MAGIC%%libexec/apache22/mod_mime_magic.so %%MOD_NEGOTIATION%%libexec/apache22/mod_negotiation.so +%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.so +%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.so %%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache22/mod_optional_hook_export.so %%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache22/mod_optional_hook_import.so -%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.so -%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.so %%MOD_PROXY%%libexec/apache22/mod_proxy.so %%MOD_PROXY_AJP%%libexec/apache22/mod_proxy_ajp.so %%MOD_PROXY_BALANCER%%libexec/apache22/mod_proxy_balancer.so @@ -158,14 +158,14 @@ libexec/apache22/httpd.exp %%MOD_PROXY_FTP%%libexec/apache22/mod_proxy_ftp.so %%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.so %%MOD_PROXY_SCGI%%libexec/apache22/mod_proxy_scgi.so -%%MOD_REWRITE%%libexec/apache22/mod_rewrite.so %%MOD_REQTIMEOUT%%libexec/apache22/mod_reqtimeout.so +%%MOD_REWRITE%%libexec/apache22/mod_rewrite.so %%MOD_SETENVIF%%libexec/apache22/mod_setenvif.so %%MOD_SPELING%%libexec/apache22/mod_speling.so %%MOD_SSL%%libexec/apache22/mod_ssl.so %%MOD_STATUS%%libexec/apache22/mod_status.so -%%MOD_SUEXEC%%libexec/apache22/mod_suexec.so %%MOD_SUBSTITUTE%%libexec/apache22/mod_substitute.so +%%MOD_SUEXEC%%libexec/apache22/mod_suexec.so %%MOD_UNIQUE_ID%%libexec/apache22/mod_unique_id.so %%MOD_USERDIR%%libexec/apache22/mod_userdir.so %%MOD_USERTRACK%%libexec/apache22/mod_usertrack.so @@ -188,8 +188,8 @@ sbin/logresolve sbin/rotatelogs sbin/split-logfile %%MOD_SUEXEC%%sbin/suexec -share/apache22/build/config_vars.mk share/apache22/build/config.nice +share/apache22/build/config_vars.mk share/apache22/build/instdso.sh share/apache22/build/library.mk share/apache22/build/ltlib.mk @@ -197,261 +197,262 @@ share/apache22/build/mkdir.sh share/apache22/build/program.mk share/apache22/build/rules.mk share/apache22/build/special.mk -www/apache22/cgi-bin/printenv -www/apache22/cgi-bin/test-cgi -@unexec if cmp -s %D/www/apache22/data/index.html %D/%%EXAMPLESDIR%%/index.html; then rm -f %D/www/apache22/data/index.html; fi +%%WWWDIR%%/cgi-bin/printenv +%%WWWDIR%%/cgi-bin/test-cgi +@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/www/apache22/data ] || mkdir -p %D/www/apache22/data -@exec [ -f %D/www/apache22/data/index.html ] || cp %D/%%EXAMPLESDIR%%/index.html %D/www/apache22/data/index.html -www/apache22/error/HTTP_BAD_GATEWAY.html.var -www/apache22/error/HTTP_BAD_REQUEST.html.var -www/apache22/error/HTTP_FORBIDDEN.html.var -www/apache22/error/HTTP_GONE.html.var -www/apache22/error/HTTP_INTERNAL_SERVER_ERROR.html.var -www/apache22/error/HTTP_LENGTH_REQUIRED.html.var -www/apache22/error/HTTP_METHOD_NOT_ALLOWED.html.var -www/apache22/error/HTTP_NOT_FOUND.html.var -www/apache22/error/HTTP_NOT_IMPLEMENTED.html.var -www/apache22/error/HTTP_PRECONDITION_FAILED.html.var -www/apache22/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var -www/apache22/error/HTTP_REQUEST_TIME_OUT.html.var -www/apache22/error/HTTP_REQUEST_URI_TOO_LARGE.html.var -www/apache22/error/HTTP_SERVICE_UNAVAILABLE.html.var -www/apache22/error/HTTP_UNAUTHORIZED.html.var -www/apache22/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var -www/apache22/error/HTTP_VARIANT_ALSO_VARIES.html.var -www/apache22/error/README -www/apache22/error/contact.html.var -www/apache22/error/include/bottom.html -www/apache22/error/include/spacer.html -www/apache22/error/include/top.html -www/apache22/icons/README -www/apache22/icons/README.html -www/apache22/icons/a.gif -www/apache22/icons/a.png -www/apache22/icons/alert.black.gif -www/apache22/icons/alert.black.png -www/apache22/icons/alert.red.gif -www/apache22/icons/alert.red.png -www/apache22/icons/apache_pb.gif -www/apache22/icons/apache_pb.png -www/apache22/icons/apache_pb2.gif -www/apache22/icons/apache_pb2.png -www/apache22/icons/apache_pb2_ani.gif -www/apache22/icons/back.gif -www/apache22/icons/back.png -www/apache22/icons/ball.gray.gif -www/apache22/icons/ball.gray.png -www/apache22/icons/ball.red.gif -www/apache22/icons/ball.red.png -www/apache22/icons/binary.gif -www/apache22/icons/binary.png -www/apache22/icons/binhex.gif -www/apache22/icons/binhex.png -www/apache22/icons/blank.gif -www/apache22/icons/blank.png -www/apache22/icons/bomb.gif -www/apache22/icons/bomb.png -www/apache22/icons/box1.gif -www/apache22/icons/box1.png -www/apache22/icons/box2.gif -www/apache22/icons/box2.png -www/apache22/icons/broken.gif -www/apache22/icons/broken.png -www/apache22/icons/burst.gif -www/apache22/icons/burst.png -www/apache22/icons/c.gif -www/apache22/icons/c.png -www/apache22/icons/comp.blue.gif -www/apache22/icons/comp.blue.png -www/apache22/icons/comp.gray.gif -www/apache22/icons/comp.gray.png -www/apache22/icons/compressed.gif -www/apache22/icons/compressed.png -www/apache22/icons/continued.gif -www/apache22/icons/continued.png -www/apache22/icons/dir.gif -www/apache22/icons/dir.png -www/apache22/icons/diskimg.gif -www/apache22/icons/diskimg.png -www/apache22/icons/down.gif -www/apache22/icons/down.png -www/apache22/icons/dvi.gif -www/apache22/icons/dvi.png -www/apache22/icons/f.gif -www/apache22/icons/f.png -www/apache22/icons/folder.gif -www/apache22/icons/folder.open.gif -www/apache22/icons/folder.open.png -www/apache22/icons/folder.png -www/apache22/icons/folder.sec.gif -www/apache22/icons/folder.sec.png -www/apache22/icons/forward.gif -www/apache22/icons/forward.png -www/apache22/icons/generic.gif -www/apache22/icons/generic.png -www/apache22/icons/generic.red.gif -www/apache22/icons/generic.red.png -www/apache22/icons/generic.sec.gif -www/apache22/icons/generic.sec.png -www/apache22/icons/hand.right.gif -www/apache22/icons/hand.right.png -www/apache22/icons/hand.up.gif -www/apache22/icons/hand.up.png -www/apache22/icons/icon.sheet.gif -www/apache22/icons/icon.sheet.png -www/apache22/icons/image1.gif -www/apache22/icons/image1.png -www/apache22/icons/image2.gif -www/apache22/icons/image2.png -www/apache22/icons/image3.gif -www/apache22/icons/image3.png -www/apache22/icons/index.gif -www/apache22/icons/index.png -www/apache22/icons/layout.gif -www/apache22/icons/layout.png -www/apache22/icons/left.gif -www/apache22/icons/left.png -www/apache22/icons/link.gif -www/apache22/icons/link.png -www/apache22/icons/movie.gif -www/apache22/icons/movie.png -www/apache22/icons/p.gif -www/apache22/icons/p.png -www/apache22/icons/patch.gif -www/apache22/icons/patch.png -www/apache22/icons/pdf.gif -www/apache22/icons/pdf.png -www/apache22/icons/pie0.gif -www/apache22/icons/pie0.png -www/apache22/icons/pie1.gif -www/apache22/icons/pie1.png -www/apache22/icons/pie2.gif -www/apache22/icons/pie2.png -www/apache22/icons/pie3.gif -www/apache22/icons/pie3.png -www/apache22/icons/pie4.gif -www/apache22/icons/pie4.png -www/apache22/icons/pie5.gif -www/apache22/icons/pie5.png -www/apache22/icons/pie6.gif -www/apache22/icons/pie6.png -www/apache22/icons/pie7.gif -www/apache22/icons/pie7.png -www/apache22/icons/pie8.gif -www/apache22/icons/pie8.png -www/apache22/icons/portal.gif -www/apache22/icons/portal.png -www/apache22/icons/ps.gif -www/apache22/icons/ps.png -www/apache22/icons/quill.gif -www/apache22/icons/quill.png -www/apache22/icons/right.gif -www/apache22/icons/right.png -www/apache22/icons/screw1.gif -www/apache22/icons/screw1.png -www/apache22/icons/screw2.gif -www/apache22/icons/screw2.png -www/apache22/icons/script.gif -www/apache22/icons/script.png -www/apache22/icons/small/back.gif -www/apache22/icons/small/back.png -www/apache22/icons/small/binary.gif -www/apache22/icons/small/binary.png -www/apache22/icons/small/binhex.gif -www/apache22/icons/small/binhex.png -www/apache22/icons/small/blank.gif -www/apache22/icons/small/blank.png -www/apache22/icons/small/broken.gif -www/apache22/icons/small/broken.png -www/apache22/icons/small/burst.gif -www/apache22/icons/small/burst.png -www/apache22/icons/small/comp1.gif -www/apache22/icons/small/comp1.png -www/apache22/icons/small/comp2.gif -www/apache22/icons/small/comp2.png -www/apache22/icons/small/compressed.gif -www/apache22/icons/small/compressed.png -www/apache22/icons/small/continued.gif -www/apache22/icons/small/continued.png -www/apache22/icons/small/dir.gif -www/apache22/icons/small/dir.png -www/apache22/icons/small/dir2.gif -www/apache22/icons/small/dir2.png -www/apache22/icons/small/doc.gif -www/apache22/icons/small/doc.png -www/apache22/icons/small/forward.gif -www/apache22/icons/small/forward.png -www/apache22/icons/small/generic.gif -www/apache22/icons/small/generic.png -www/apache22/icons/small/generic2.gif -www/apache22/icons/small/generic2.png -www/apache22/icons/small/generic3.gif -www/apache22/icons/small/generic3.png -www/apache22/icons/small/image.gif -www/apache22/icons/small/image.png -www/apache22/icons/small/image2.gif -www/apache22/icons/small/image2.png -www/apache22/icons/small/index.gif -www/apache22/icons/small/index.png -www/apache22/icons/small/key.gif -www/apache22/icons/small/key.png -www/apache22/icons/small/movie.gif -www/apache22/icons/small/movie.png -www/apache22/icons/small/patch.gif -www/apache22/icons/small/patch.png -www/apache22/icons/small/ps.gif -www/apache22/icons/small/ps.png -www/apache22/icons/small/rainbow.gif -www/apache22/icons/small/rainbow.png -www/apache22/icons/small/sound.gif -www/apache22/icons/small/sound.png -www/apache22/icons/small/sound2.gif -www/apache22/icons/small/sound2.png -www/apache22/icons/small/tar.gif *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***