2014-05-03 15:01:24 +02:00
|
|
|
# $NetBSD: Makefile,v 1.27 2014/05/03 13:01:25 alnsn Exp $
|
2012-04-13 20:50:48 +02:00
|
|
|
|
Changes 2.4.9:
*) mod_ssl: Work around a bug in some older versions of OpenSSL that
would cause a crash in SSL_get_certificate for servers where the
certificate hadn't been sent.
*) mod_lua: Add a fixups hook that checks if the original request is intended
for LuaMapHandler. This fixes a bug where FallbackResource invalidates the
LuaMapHandler directive in certain cases by changing the URI before the map
handler code executes
Changes 2.4.8:
*) SECURITY: CVE-2014-0098 (cve.mitre.org)
Clean up cookie logging with fewer redundant string parsing passes.
Log only cookies with a value assignment. Prevents segfaults when
logging truncated cookies.
*) SECURITY: CVE-2013-6438 (cve.mitre.org)
mod_dav: Keep track of length of cdata properly when removing
leading spaces. Eliminates a potential denial of service from
specifically crafted DAV WRITE requests
*) core: Support named groups and backreferences within the LocationMatch,
DirectoryMatch, FilesMatch and ProxyMatch directives. (Requires
non-ancient PCRE library)
*) core: draft-ietf-httpbis-p1-messaging-23 corrections regarding
TE/CL conflicts.
*) mod_dir: Add DirectoryCheckHandler to allow a 2.2-like behavior, skipping
execution when a handler is already set.
*) mod_ssl: Do not perform SNI / Host header comparison in case of a
forward proxy request.
*) mod_ssl: Remove the hardcoded algorithm-type dependency for the
SSLCertificateFile and SSLCertificateKeyFile directives, to enable
future algorithm agility, and deprecate the SSLCertificateChainFile
directive (obsoleted by SSLCertificateFile).
*) mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore,
and IgnoreInherit to allow RewriteRules to be pushed from parent scopes
to child scopes without explicitly configuring each child scope.
*) prefork: Fix long delays when doing a graceful restart.
*) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.
*) mod_proxy_wstunnel: Avoid busy loop on client errors, drop message
IDs 02445, 02446, and 02448 to TRACE1 from DEBUG.
*) mod_remoteip: Correct the trusted proxy match test.
*) mod_proxy_fcgi: Fix error message when an unexpected protocol version
number is received from the application.
*) mod_remoteip: Use the correct IP addresses to populate the proxy_ips field.
*) mod_lua: Update r:setcookie() to accept a table of options and add domain,
path and httponly to the list of options available to set.
*) mod_lua: Fix r:setcookie() to add, rather than replace,
the Set-Cookie header.
*) mod_lua: Allow for database results to be returned as a hash with
row-name/value pairs instead of just row-number/value.
*) mod_rewrite: Add %{CONN_REMOTE_ADDR} as the non-useragent counterpart to
%{REMOTE_ADDR}.
*) WinNT MPM: If ap_run_pre_connection() fails or sets c->aborted, don't
save the socket for reuse by the next worker as if it were an
APR_SO_DISCONNECTED socket. Restores 2.2 behavior.
*) mod_dir: Don't search for a DirectoryIndex or DirectorySlash on a URL
that was just rewritten by mod_rewrite.
*) mod_session: When we have a session we were unable to decode,
behave as if there was no session at all.
*) mod_session: Fix problems interpreting the SessionInclude and
SessionExclude configuration.
*) mod_authn_core: Allow <AuthnProviderAlias>'es to be seen from auth
stanzas under virtual hosts.
*) mod_proxy_fcgi: Use apr_socket_timeout_get instead of hard-coded
30 seconds timeout.
*) mod_proxy: Added support for unix domain sockets as the
backend server endpoint
*) build: only search for modules (config*.m4) in known subdirectories, see
build/config-stubs.
*) mod_cache_disk: Fix potential hangs on Windows when using mod_cache_disk.
*) mod_ssl: Add support for OpenSSL configuration commands by introducing
the SSLOpenSSLConfCmd directive.
*) mod_proxy: Remove (never documented) <Proxy ~ wildcard-url> syntax which
is equivalent to <ProxyMatch wildcard-url>.
*) mod_authz_user, mod_authz_host, mod_authz_groupfile, mod_authz_dbm,
mod_authz_dbd, mod_authnz_ldap: Support the expression parser within the
require directives.
*) mod_proxy_http: Core dumped under high load.
*) mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
previously limited to 64MB.
*) mod_lua: Use binary copy when dealing with uploads through r:parsebody()
to prevent truncating files.
2014-03-18 21:09:08 +01:00
|
|
|
DISTNAME= httpd-2.4.9
|
2012-04-13 20:50:48 +02:00
|
|
|
PKGNAME= ${DISTNAME:S/httpd/apache/}
|
2014-05-03 15:01:24 +02:00
|
|
|
PKGREVISION= 1
|
2012-04-13 20:50:48 +02:00
|
|
|
CATEGORIES= www
|
|
|
|
|
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
|
|
|
|
|
http://archive.apache.org/dist/httpd/ \
|
|
|
|
|
http://archive.eu.apache.org/dist/httpd/
|
|
|
|
|
EXTRACT_SUFX= .tar.bz2
|
|
|
|
|
|
|
|
|
|
MAINTAINER= ryoon@NetBSD.org
|
|
|
|
|
HOMEPAGE= http://httpd.apache.org/
|
|
|
|
|
COMMENT= Apache HTTP (Web) server, version 2.4
|
|
|
|
|
LICENSE= apache-2.0
|
|
|
|
|
|
|
|
|
|
BUILD_DEFS+= IPV6_READY
|
|
|
|
|
BUILD_DEFS+= VARBASE
|
|
|
|
|
BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
|
|
|
|
|
|
|
|
|
|
USE_LIBTOOL= yes
|
|
|
|
|
USE_TOOLS+= pax perl pkg-config
|
2012-04-14 14:46:46 +02:00
|
|
|
GNU_CONFIGURE= yes
|
2012-04-13 20:50:48 +02:00
|
|
|
CONFIGURE_ARGS+= --enable-layout=NetBSD
|
|
|
|
|
CONFIGURE_ARGS+= --enable-mods-shared=all
|
2012-04-14 14:46:46 +02:00
|
|
|
CONFIGURE_ARGS+= --enable-so
|
2012-04-13 20:50:48 +02:00
|
|
|
CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
|
|
|
|
|
CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
|
2012-04-14 14:46:46 +02:00
|
|
|
CONFIGURE_ARGS+= --with-port=80
|
|
|
|
|
CONFIGURE_ENV+= perlbin=${PERL5:Q}
|
|
|
|
|
CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
|
|
|
|
|
CONFIGURE_ENV+= CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
|
2012-04-13 20:50:48 +02:00
|
|
|
|
2012-04-26 14:20:06 +02:00
|
|
|
CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
|
|
|
|
|
|
2012-04-13 20:50:48 +02:00
|
|
|
.include "../../mk/bsd.prefs.mk"
|
Update to 2.4.7
Changelog:
Changes with Apache 2.4.7
*) APR 1.5.0 or later is now required for the event MPM.
*) slotmem_shm: Error detection. [Jim Jagielski]
*) event: Use skiplist data structure. [Jim Jagielski]
*) mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication
and align w/ trunk. [Jim Jagielski]
*) Fix potential rejection of valid MaxMemFree and ThreadStackSize
directives. [Mike Rumph <mike.rumph oracle.com>]
*) mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.
An individual envvar with an encoded length of more than 16K will be
omitted. [Jeff Trawick]
*) mod_proxy_fcgi: Handle reading protocol data that is split between
packets. [Jeff Trawick]
*) mod_ssl: Improve handling of ephemeral DH and ECDH keys by
allowing custom parameters to be configured via SSLCertificateFile,
and by adding standardized DH parameters for 1024/2048/3072/4096 bits.
Unless custom parameters are configured, the standardized parameters
are applied based on the certificate's RSA/DSA key size. [Kaspar Brand]
*) mod_ssl, configure: Require OpenSSL 0.9.8a or later. [Kaspar Brand]
*) mod_ssl: drop support for export-grade ciphers with ephemeral RSA
keys, and unconditionally disable aNULL, eNULL and EXP ciphers
(not overridable via SSLCipherSuite). [Kaspar Brand]
*) Add experimental cmake-based build system for Windows. [Jeff Trawick,
Tom Donovan]
*) event MPM: Fix possible crashes (third party modules accessing c->sbh)
or occasional missed mod_status updates for some keepalive requests
under load. [Eric Covener]
*) mod_authn_socache: Support optional initialization arguments for
socache providers. [Chris Darroch]
*) mod_session: Reset the max-age on session save. Bug 47476. [Alexey
Varlamov <alexey.v.varlamov gmail com>]
*) mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. Bug 55279.
[Graham Leggett]
*) mod_headers: Allow for format specifiers in the substitution string
when using Header edit. [Daniel Ruggeri]
*) mod_dav: dav_resource->uri is treated as unencoded. This was an
unnecessary ABI changed introduced in 2.4.6. Bug 55397.
*) mod_dav: Don't require lock tokens for COPY source. Bug 55306.
*) core: Don't truncate output when sending is interrupted by a signal,
such as from an exiting CGI process. Bug 55643. [Jeff Trawick]
*) WinNT MPM: Exit the child if the parent process crashes or is terminated.
[Oracle Corporation]
*) Windows: Correct failure to discard stderr in some error log
configurations. (Error message AH00093) [Jeff Trawick]
*) mod_session_crypto: Allow using exec: calls to obtain session
encryption key. [Daniel Ruggeri]
*) core: Add missing Reason-Phrase in HTTP response headers.
Bug 54946. [Rainer Jung]
*) mod_rewrite: Make rewrite websocket-aware to allow proxying.
Bug 55598. [Chris Harris <chris.harris kitware com>]
*) mod_ldap: When looking up sub-groups, use an implicit objectClass=*
instead of an explicit cn=* filter. [David Hawes <dhawes vt.edu>]
*) ab: Add wait time, fix processing time, and output write errors only if
they occured. [Christophe Jaillet]
*) worker MPM: Don't forcibly kill worker threads if the child process is
exiting gracefully. [Oracle Corporation]
*) core: apachectl -S prints wildcard name-based virtual hosts twice.
Bug 54948 [Eric Covener]
*) mod_auth_basic: Add AuthBasicUseDigestAlgorithm directive to
allow migration of passwords from digest to basic authentication.
[Chris Darroch]
*) ab: Add a new -l parameter in order not to check the length of the responses.
This can be usefull with dynamic pages.
Bug 9945, Bug 27888, Bug 42040 [<ccikrs1 cranbrook edu>]
*) Suppress formatting of startup messages written to the console when
ErrorLogFormat is used. [Jeff Trawick]
*) mod_auth_digest: Be more specific when the realm mismatches because the
realm has not been specified. [Graham Leggett]
*) mod_proxy: Add a note in the balancer manager stating whether changes
will or will not be persisted and whether settings are inherited.
[Daniel Ruggeri, Jim Jagielski]
*) mod_cache: Avoid a crash with strcmp() when the hostname is not provided.
[Graham Leggett]
*) core: Add util_fcgi.h and associated definitions and support
routines for FastCGI, based largely on mod_proxy_fcgi.
[Jeff Trawick]
*) mod_headers: Add 'Header note header-name note-name' for copying a response
headers value into a note. [Eric Covener]
*) mod_headers: Add 'setifempty' command to Header and RequestHeader.
[Eric Covener]
*) mod_logio: new format-specifier %S (sum) which is the sum of received
and sent byte counts.
Bug 54015 [Christophe Jaillet]
*) mod_deflate: Improve error detection when decompressing request bodies
with trailing garbage: handle case where trailing bytes are in
the same bucket. [Rainer Jung]
*) mod_authz_groupfile, mod_authz_user: Reduce severity of AH01671 and AH01663
from ERROR to DEBUG, since these modules do not know what mod_authz_core
is doing with their AUTHZ_DENIED return value. [Eric Covener]
*) mod_ldap: add TRACE5 for LDAP retries. [Eric Covener]
*) mod_ldap: retry on an LDAP timeout during authn. [Eric Covener]
*) mod_ldap: Change "LDAPReferrals off" to actually set the underlying LDAP
SDK option to OFF, and introduce "LDAPReferrals default" to take the SDK
default, sans rebind authentication callback.
[Jan Kaluza <kaluze AT redhat.com>]
*) core: Log a message at TRACE1 when the client aborts a connection.
[Eric Covener]
*) WinNT MPM: Don't crash during child process initialization if the
Listen protocol is unrecognized. [Jeff Trawick]
*) modules: Fix some compiler warnings. [Guenter Knauf]
*) Sync 2.4 and trunk
- Avoid some memory allocation and work when TRACE1 is not activated
- fix typo in include guard
- indent
- No need to lower the string before removing the path, it is just a waste of time...
- Save a few cycles
[Christophe Jaillet <christophe.jaillet wanadoo.fr>]
*) mod_filter: Add "change=no" as a proto-flag to FilterProtocol
to remove a providers initial flags set at registration time.
[Eric Covener]
*) core, mod_ssl: Enable the ability for a module to reverse the sense of
a poll event from a read to a write or vice versa. This is a step on
the way to allow mod_ssl taking full advantage of the event MPM.
[Graham Leggett]
*) Makefile.win: Install proper pcre DLL file during debug build install.
Bug 55235. [Ben Reser <ben reser org>]
*) mod_ldap: Fix a potential memory leak or corruption. Bug 54936.
[Zhenbo Xu <zhenbo1987 gmail com>]
*) ab: Fix potential buffer overflows when processing the T and X
command-line options. Bug 55360.
[Mike Rumph <mike.rumph oracle.com>]
*) fcgistarter: Specify SO_REUSEADDR to allow starting a server
with old connections in TIME_WAIT. [Jeff Trawick]
*) core: Add open_htaccess hook which, in conjunction with dirwalk_stat
and post_perdir_config (introduced in 2.4.5), allows mpm-itk to be
used without patches to httpd core. [Stefan Fritsch]
*) support/htdbm: fix processing of -t command line switch. Regression
introduced in 2.4.4
Bug 55264 [Jo Rhett <jrhett netconsonance com>]
[Apache 2.3.0-dev includes those bug fixes and changes with the
Apache 2.2.xx tree as documented, and except as noted, below.]
Changes with Apache 2.2.x and later:
*) http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=markup
Changes with Apache 2.0.x and later:
*) http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=markup
2013-12-01 11:02:34 +01:00
|
|
|
BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
|
2012-04-13 20:50:48 +02:00
|
|
|
.include "../../devel/apr/buildlink3.mk"
|
Update to 2.4.7
Changelog:
Changes with Apache 2.4.7
*) APR 1.5.0 or later is now required for the event MPM.
*) slotmem_shm: Error detection. [Jim Jagielski]
*) event: Use skiplist data structure. [Jim Jagielski]
*) mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication
and align w/ trunk. [Jim Jagielski]
*) Fix potential rejection of valid MaxMemFree and ThreadStackSize
directives. [Mike Rumph <mike.rumph oracle.com>]
*) mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.
An individual envvar with an encoded length of more than 16K will be
omitted. [Jeff Trawick]
*) mod_proxy_fcgi: Handle reading protocol data that is split between
packets. [Jeff Trawick]
*) mod_ssl: Improve handling of ephemeral DH and ECDH keys by
allowing custom parameters to be configured via SSLCertificateFile,
and by adding standardized DH parameters for 1024/2048/3072/4096 bits.
Unless custom parameters are configured, the standardized parameters
are applied based on the certificate's RSA/DSA key size. [Kaspar Brand]
*) mod_ssl, configure: Require OpenSSL 0.9.8a or later. [Kaspar Brand]
*) mod_ssl: drop support for export-grade ciphers with ephemeral RSA
keys, and unconditionally disable aNULL, eNULL and EXP ciphers
(not overridable via SSLCipherSuite). [Kaspar Brand]
*) Add experimental cmake-based build system for Windows. [Jeff Trawick,
Tom Donovan]
*) event MPM: Fix possible crashes (third party modules accessing c->sbh)
or occasional missed mod_status updates for some keepalive requests
under load. [Eric Covener]
*) mod_authn_socache: Support optional initialization arguments for
socache providers. [Chris Darroch]
*) mod_session: Reset the max-age on session save. Bug 47476. [Alexey
Varlamov <alexey.v.varlamov gmail com>]
*) mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. Bug 55279.
[Graham Leggett]
*) mod_headers: Allow for format specifiers in the substitution string
when using Header edit. [Daniel Ruggeri]
*) mod_dav: dav_resource->uri is treated as unencoded. This was an
unnecessary ABI changed introduced in 2.4.6. Bug 55397.
*) mod_dav: Don't require lock tokens for COPY source. Bug 55306.
*) core: Don't truncate output when sending is interrupted by a signal,
such as from an exiting CGI process. Bug 55643. [Jeff Trawick]
*) WinNT MPM: Exit the child if the parent process crashes or is terminated.
[Oracle Corporation]
*) Windows: Correct failure to discard stderr in some error log
configurations. (Error message AH00093) [Jeff Trawick]
*) mod_session_crypto: Allow using exec: calls to obtain session
encryption key. [Daniel Ruggeri]
*) core: Add missing Reason-Phrase in HTTP response headers.
Bug 54946. [Rainer Jung]
*) mod_rewrite: Make rewrite websocket-aware to allow proxying.
Bug 55598. [Chris Harris <chris.harris kitware com>]
*) mod_ldap: When looking up sub-groups, use an implicit objectClass=*
instead of an explicit cn=* filter. [David Hawes <dhawes vt.edu>]
*) ab: Add wait time, fix processing time, and output write errors only if
they occured. [Christophe Jaillet]
*) worker MPM: Don't forcibly kill worker threads if the child process is
exiting gracefully. [Oracle Corporation]
*) core: apachectl -S prints wildcard name-based virtual hosts twice.
Bug 54948 [Eric Covener]
*) mod_auth_basic: Add AuthBasicUseDigestAlgorithm directive to
allow migration of passwords from digest to basic authentication.
[Chris Darroch]
*) ab: Add a new -l parameter in order not to check the length of the responses.
This can be usefull with dynamic pages.
Bug 9945, Bug 27888, Bug 42040 [<ccikrs1 cranbrook edu>]
*) Suppress formatting of startup messages written to the console when
ErrorLogFormat is used. [Jeff Trawick]
*) mod_auth_digest: Be more specific when the realm mismatches because the
realm has not been specified. [Graham Leggett]
*) mod_proxy: Add a note in the balancer manager stating whether changes
will or will not be persisted and whether settings are inherited.
[Daniel Ruggeri, Jim Jagielski]
*) mod_cache: Avoid a crash with strcmp() when the hostname is not provided.
[Graham Leggett]
*) core: Add util_fcgi.h and associated definitions and support
routines for FastCGI, based largely on mod_proxy_fcgi.
[Jeff Trawick]
*) mod_headers: Add 'Header note header-name note-name' for copying a response
headers value into a note. [Eric Covener]
*) mod_headers: Add 'setifempty' command to Header and RequestHeader.
[Eric Covener]
*) mod_logio: new format-specifier %S (sum) which is the sum of received
and sent byte counts.
Bug 54015 [Christophe Jaillet]
*) mod_deflate: Improve error detection when decompressing request bodies
with trailing garbage: handle case where trailing bytes are in
the same bucket. [Rainer Jung]
*) mod_authz_groupfile, mod_authz_user: Reduce severity of AH01671 and AH01663
from ERROR to DEBUG, since these modules do not know what mod_authz_core
is doing with their AUTHZ_DENIED return value. [Eric Covener]
*) mod_ldap: add TRACE5 for LDAP retries. [Eric Covener]
*) mod_ldap: retry on an LDAP timeout during authn. [Eric Covener]
*) mod_ldap: Change "LDAPReferrals off" to actually set the underlying LDAP
SDK option to OFF, and introduce "LDAPReferrals default" to take the SDK
default, sans rebind authentication callback.
[Jan Kaluza <kaluze AT redhat.com>]
*) core: Log a message at TRACE1 when the client aborts a connection.
[Eric Covener]
*) WinNT MPM: Don't crash during child process initialization if the
Listen protocol is unrecognized. [Jeff Trawick]
*) modules: Fix some compiler warnings. [Guenter Knauf]
*) Sync 2.4 and trunk
- Avoid some memory allocation and work when TRACE1 is not activated
- fix typo in include guard
- indent
- No need to lower the string before removing the path, it is just a waste of time...
- Save a few cycles
[Christophe Jaillet <christophe.jaillet wanadoo.fr>]
*) mod_filter: Add "change=no" as a proto-flag to FilterProtocol
to remove a providers initial flags set at registration time.
[Eric Covener]
*) core, mod_ssl: Enable the ability for a module to reverse the sense of
a poll event from a read to a write or vice versa. This is a step on
the way to allow mod_ssl taking full advantage of the event MPM.
[Graham Leggett]
*) Makefile.win: Install proper pcre DLL file during debug build install.
Bug 55235. [Ben Reser <ben reser org>]
*) mod_ldap: Fix a potential memory leak or corruption. Bug 54936.
[Zhenbo Xu <zhenbo1987 gmail com>]
*) ab: Fix potential buffer overflows when processing the T and X
command-line options. Bug 55360.
[Mike Rumph <mike.rumph oracle.com>]
*) fcgistarter: Specify SO_REUSEADDR to allow starting a server
with old connections in TIME_WAIT. [Jeff Trawick]
*) core: Add open_htaccess hook which, in conjunction with dirwalk_stat
and post_perdir_config (introduced in 2.4.5), allows mpm-itk to be
used without patches to httpd core. [Stefan Fritsch]
*) support/htdbm: fix processing of -t command line switch. Regression
introduced in 2.4.4
Bug 55264 [Jo Rhett <jrhett netconsonance com>]
[Apache 2.3.0-dev includes those bug fixes and changes with the
Apache 2.2.xx tree as documented, and except as noted, below.]
Changes with Apache 2.2.x and later:
*) http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=markup
Changes with Apache 2.0.x and later:
*) http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=markup
2013-12-01 11:02:34 +01:00
|
|
|
BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
|
2012-04-13 20:50:48 +02:00
|
|
|
.include "../../devel/apr-util/buildlink3.mk"
|
|
|
|
|
.include "../../devel/pcre/buildlink3.mk"
|
|
|
|
|
.include "../../security/openssl/buildlink3.mk"
|
|
|
|
|
.include "../../textproc/expat/buildlink3.mk"
|
|
|
|
|
.include "../../mk/dlopen.buildlink3.mk"
|
|
|
|
|
.include "../../mk/pthread.buildlink3.mk"
|
|
|
|
|
|
2012-04-14 14:46:46 +02:00
|
|
|
CONFIGURE_ARGS+= --disable-xml2enc
|
2012-04-18 13:27:01 +02:00
|
|
|
CONFIGURE_ARGS+= --disable-proxy-html
|
2012-04-13 20:50:48 +02:00
|
|
|
|
|
|
|
|
DFLT_APACHE_MODULES+= all
|
|
|
|
|
APACHE_MODULES?= ${DFLT_APACHE_MODULES}
|
|
|
|
|
|
|
|
|
|
.include "options.mk"
|
|
|
|
|
|
|
|
|
|
FIND_PREFIX:= APRDIR=apr
|
|
|
|
|
.include "../../mk/find-prefix.mk"
|
|
|
|
|
|
|
|
|
|
# LDAP support
|
|
|
|
|
PLIST_VARS+= ldap
|
2012-07-11 21:09:18 +02:00
|
|
|
.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la)
|
2012-04-13 20:50:48 +02:00
|
|
|
DFLT_APACHE_MODULES+= ldap authnz_ldap
|
|
|
|
|
PLIST.ldap= yes
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
APACHE_USER?= www
|
|
|
|
|
APACHE_GROUP?= www
|
|
|
|
|
PKG_GROUPS= ${APACHE_GROUP}
|
|
|
|
|
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
|
|
|
|
|
PKG_GROUPS_VARS= APACHE_GROUP
|
|
|
|
|
PKG_USERS_VARS= APACHE_USER
|
|
|
|
|
|
|
|
|
|
PKG_SYSCONFVAR= apache
|
|
|
|
|
PKG_SYSCONFSUBDIR?= httpd
|
|
|
|
|
EGDIR= ${PREFIX}/share/examples/httpd
|
|
|
|
|
SBINDIR= ${PREFIX}/sbin
|
|
|
|
|
CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf
|
|
|
|
|
.for f in autoindex dav default info languages manual mpm \
|
|
|
|
|
multilang-errordoc ssl userdir vhosts
|
|
|
|
|
CONF_FILES+= ${EGDIR}/extra/httpd-${f}.conf \
|
|
|
|
|
${PKG_SYSCONFDIR}/httpd-${f}.conf
|
|
|
|
|
.endfor
|
|
|
|
|
CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
|
|
|
|
|
CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
|
|
|
|
|
RCD_SCRIPTS= apache
|
|
|
|
|
|
|
|
|
|
REQD_DIRS= ${PREFIX}/share/httpd
|
|
|
|
|
REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
|
|
|
|
|
OWN_DIRS= ${VARBASE}/log/httpd
|
|
|
|
|
OWN_DIRS+= ${VARBASE}/db/httpd
|
|
|
|
|
OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
|
|
|
|
|
FIX_PERMS_SBIN= apachectl envvars-std
|
|
|
|
|
FIX_PERMS_BIN= apxs dbmmanage mkcert
|
|
|
|
|
FIX_MAN_PERMS= man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1
|
|
|
|
|
FIX_MAN_PERMS+= man1/dbmmanage.1 man8/httpd.8 man8/suexec.8
|
|
|
|
|
FIX_MAN_PERMS+= man8/rotatelogs.8 man1/logresolve.1 man1/apxs.1
|
|
|
|
|
FIX_MAN_PERMS+= man8/apachectl.8 man1/ab.1 man1/httxt2dbm.1
|
|
|
|
|
|
|
|
|
|
# Fix paths in the apache manpages.
|
|
|
|
|
SUBST_CLASSES+= man
|
|
|
|
|
SUBST_STAGE.man= post-patch
|
|
|
|
|
SUBST_MESSAGE.man= Fixing paths in man pages.
|
|
|
|
|
SUBST_FILES.man= docs/man/*.1 docs/man/*.8
|
|
|
|
|
SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
|
|
|
|
|
SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
|
|
|
|
|
SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,'
|
|
|
|
|
SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
|
|
|
|
|
|
|
|
|
|
SUBST_CLASSES+= paths
|
|
|
|
|
SUBST_STAGE.paths= pre-configure
|
|
|
|
|
SUBST_MESSAGE.paths= Fixing paths.
|
|
|
|
|
SUBST_FILES.paths= config.layout Makefile.in support/apxs.in
|
|
|
|
|
SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g"
|
|
|
|
|
SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g"
|
|
|
|
|
SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
|
|
|
|
|
SUBST_SED.paths+= -e "s|@PAX@|${PAX}|g"
|
|
|
|
|
SUBST_SED.paths+= -e "s|@LOCALBASE@|${PREFIX}|g"
|
|
|
|
|
|
|
|
|
|
SUBST_CLASSES+= apr-lt
|
|
|
|
|
SUBST_STAGE.apr-lt= post-configure
|
|
|
|
|
SUBST_MESSAGE.apr-lt= Fixing libtool references.
|
|
|
|
|
SUBST_FILES.apr-lt= build/config_vars.mk
|
|
|
|
|
SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
|
|
|
|
|
|
|
|
|
|
SUBST_CLASSES+= confs
|
|
|
|
|
SUBST_STAGE.confs= post-configure
|
|
|
|
|
SUBST_MESSAGE.confs= Fixing configuration files.
|
|
|
|
|
SUBST_FILES.confs= docs/conf/httpd.conf
|
|
|
|
|
SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf
|
|
|
|
|
SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
|
|
|
|
|
SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
|
|
|
|
|
SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
|
|
|
|
|
SUBST_SED.confs+= -e "s|logs/|${VARBASE}/log/httpd/|g"
|
|
|
|
|
SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g'
|
|
|
|
|
SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g'
|
|
|
|
|
SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g'
|
|
|
|
|
SUBST_SED.confs+= -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g'
|
|
|
|
|
|
|
|
|
|
# abs_srcdir in config_vars.mk is used during install so needs to reference
|
|
|
|
|
# the work dir path, and by other packages such as ap2-fastcgi after install,
|
|
|
|
|
# so we fix after install to reference the installed path
|
|
|
|
|
SUBST_CLASSES+= abs_srcdir
|
|
|
|
|
SUBST_STAGE.abs_srcdir= post-install
|
|
|
|
|
SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir
|
|
|
|
|
SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
|
|
|
|
|
SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
|
|
|
|
|
|
|
|
|
|
REPLACE_PERL= docs/cgi-examples/printenv
|
|
|
|
|
|
|
|
|
|
. include "../../devel/zlib/buildlink3.mk"
|
|
|
|
|
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
|
|
|
|
|
CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib}
|
|
|
|
|
|
|
|
|
|
post-extract:
|
|
|
|
|
${TOUCH} ${WRKSRC}/build/libtool
|
|
|
|
|
${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in
|
|
|
|
|
|
|
|
|
|
post-build:
|
|
|
|
|
${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
|
|
|
|
|
< ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
|
|
|
|
|
|
|
|
|
|
INSTALL_TARGET= install-conf install
|
|
|
|
|
INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
|
|
|
|
|
|
|
|
|
|
post-install:
|
|
|
|
|
${LN} -sf ${APRDIR}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
|
|
|
|
|
${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
|
|
|
|
|
|
|
|
|
|
${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin
|
|
|
|
|
|
|
|
|
|
.for file in ${FIX_PERMS_SBIN}
|
|
|
|
|
${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/${file}
|
|
|
|
|
${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/${file}
|
|
|
|
|
.endfor
|
|
|
|
|
|
|
|
|
|
.for file in ${FIX_PERMS_BIN}
|
|
|
|
|
${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/bin/${file}
|
|
|
|
|
${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${file}
|
|
|
|
|
.endfor
|
|
|
|
|
|
2013-12-12 13:24:47 +01:00
|
|
|
${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
|
|
|
|
|
${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
|
|
|
|
|
${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
|
2012-04-13 20:50:48 +02:00
|
|
|
${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
|
|
|
|
|
${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
|
|
|
|
|
|
|
|
|
|
.for file in ${FIX_MAN_PERMS}
|
|
|
|
|
${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${file}
|
|
|
|
|
.endfor
|
|
|
|
|
|
|
|
|
|
${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
|
|
|
|
|
.if exists(${DESTDIR}${PREFIX}/sbin/suexec)
|
|
|
|
|
${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
.include "../../mk/pthread.buildlink3.mk"
|
2014-05-03 15:01:24 +02:00
|
|
|
.include "../../devel/readline/buildlink3.mk"
|
2012-04-13 20:50:48 +02:00
|
|
|
.include "../../mk/bsd.pkg.mk"
|
