2bf40ad66b
Fixes the following security issues:
*) SECURITY: CVE-2020-1934 (cve.mitre.org)
mod_proxy_ftp: Use of uninitialized value with malicious backend FTP
server. [Eric Covener]
*) SECURITY: CVE-2020-1927 (cve.mitre.org)
rewrite, core: Set PCRE_DOTALL flag by default to avoid unpredictable
matches and substitutions with encoded line break characters.
The fix for CVE-2019-10098 was not effective. [Ruediger Pluem]
The LICENSE file has been updated to fix a s/waranties/warranties/ typo, so
update the hash to match and adjust the spacing to match recent agreements:
-This software is provided "as is" and any express or implied waranties,
+This software is provided "as is" and any express or implied warranties,
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
123 lines
3.1 KiB
Makefile
123 lines
3.1 KiB
Makefile
################################################################################
|
|
#
|
|
# apache
|
|
#
|
|
################################################################################
|
|
|
|
APACHE_VERSION = 2.4.43
|
|
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
|
|
APACHE_SITE = http://archive.apache.org/dist/httpd
|
|
APACHE_LICENSE = Apache-2.0
|
|
APACHE_LICENSE_FILES = LICENSE
|
|
# Needed for mod_php
|
|
APACHE_INSTALL_STAGING = YES
|
|
# We have a patch touching configure.in and Makefile.in,
|
|
# so we need to autoreconf:
|
|
APACHE_AUTORECONF = YES
|
|
APACHE_DEPENDENCIES = apr apr-util pcre
|
|
|
|
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
|
define APACHE_FIXUP_APR_LIBTOOL
|
|
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \
|
|
$(STAGING_DIR)/usr/build-1/libtool
|
|
endef
|
|
APACHE_POST_CONFIGURE_HOOKS += APACHE_FIXUP_APR_LIBTOOL
|
|
endif
|
|
|
|
APACHE_CONF_ENV= \
|
|
ap_cv_void_ptr_lt_long=no \
|
|
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
|
|
|
|
ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y)
|
|
APACHE_MPM = event
|
|
else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y)
|
|
APACHE_MPM = prefork
|
|
else ifeq ($(BR2_PACKAGE_APACHE_MPM_WORKER),y)
|
|
APACHE_MPM = worker
|
|
endif
|
|
|
|
APACHE_CONF_OPTS = \
|
|
--sysconfdir=/etc/apache2 \
|
|
--with-apr=$(STAGING_DIR)/usr \
|
|
--with-apr-util=$(STAGING_DIR)/usr \
|
|
--with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \
|
|
--enable-http \
|
|
--enable-dbd \
|
|
--enable-proxy \
|
|
--enable-mime-magic \
|
|
--without-suexec-bin \
|
|
--enable-mods-shared=all \
|
|
--with-mpm=$(APACHE_MPM) \
|
|
--disable-luajit
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
|
APACHE_DEPENDENCIES += libxml2
|
|
# Apache wants the path to the header file, where it can find
|
|
# <libxml/parser.h>.
|
|
APACHE_CONF_OPTS += \
|
|
--enable-xml2enc \
|
|
--enable-proxy-html \
|
|
--with-libxml2=$(STAGING_DIR)/usr/include/libxml2
|
|
else
|
|
APACHE_CONF_OPTS += \
|
|
--disable-xml2enc \
|
|
--disable-proxy-html
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LUA),y)
|
|
APACHE_CONF_OPTS += --enable-lua
|
|
APACHE_DEPENDENCIES += lua
|
|
else
|
|
APACHE_CONF_OPTS += --disable-lua
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NGHTTP2),y)
|
|
APACHE_CONF_OPTS += \
|
|
--enable-http2 \
|
|
--with-nghttp2=$(STAGING_DIR)/usr
|
|
APACHE_DEPENDENCIES += nghttp2
|
|
else
|
|
APACHE_CONF_OPTS += --disable-http2
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
APACHE_DEPENDENCIES += openssl
|
|
APACHE_CONF_OPTS += \
|
|
--enable-ssl \
|
|
--with-ssl=$(STAGING_DIR)/usr
|
|
else
|
|
APACHE_CONF_OPTS += --disable-ssl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
APACHE_DEPENDENCIES += zlib
|
|
APACHE_CONF_OPTS += \
|
|
--enable-deflate \
|
|
--with-z=$(STAGING_DIR)/usr
|
|
else
|
|
APACHE_CONF_OPTS += --disable-deflate
|
|
endif
|
|
|
|
define APACHE_FIX_STAGING_APACHE_CONFIG
|
|
$(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs
|
|
$(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk
|
|
endef
|
|
APACHE_POST_INSTALL_STAGING_HOOKS += APACHE_FIX_STAGING_APACHE_CONFIG
|
|
|
|
define APACHE_CLEANUP_TARGET
|
|
$(RM) -rf $(TARGET_DIR)/usr/manual $(TARGET_DIR)/usr/build
|
|
endef
|
|
APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET
|
|
|
|
define APACHE_INSTALL_INIT_SYSV
|
|
$(INSTALL) -D -m 0755 package/apache/S50apache \
|
|
$(TARGET_DIR)/etc/init.d/S50apache
|
|
endef
|
|
|
|
define APACHE_INSTALL_INIT_SYSTEMD
|
|
$(INSTALL) -D -m 644 package/apache/apache.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/apache.service
|
|
endef
|
|
|
|
$(eval $(autotools-package))
|