diff options
| author | Thomas Heil <heil@terminal-consulting.de> | 2017-10-15 16:59:50 +0200 |
|---|---|---|
| committer | Thomas Heil <heil@terminal-consulting.de> | 2017-10-15 16:59:50 +0200 |
| commit | 923b4558a62f38b9eab4ef1dc88dc3d4da78c5aa (patch) | |
| tree | 3839d34fb9604695587e39cc89318d88b6bcc24b /net/apache | |
| parent | ebbd1a2d881797af20187462245c4e9ec221c1d7 (diff) | |
apache: update to 2.4.28
- fix CVE-2017-9798
- fix #4926
make http2 support configurable, in case of enables libnghttp2
package dont build http2. instead use CONFIG_APACHE_HTTP2 to
enable http2 support
Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
Diffstat (limited to 'net/apache')
| -rw-r--r-- | net/apache/Config.in | 11 | ||||
| -rw-r--r-- | net/apache/Makefile | 24 |
2 files changed, 31 insertions, 4 deletions
diff --git a/net/apache/Config.in b/net/apache/Config.in new file mode 100644 index 000000000..5eb42b30a --- /dev/null +++ b/net/apache/Config.in @@ -0,0 +1,11 @@ +menu "Configuration" + depends on PACKAGE_apache + +config APACHE_HTTP2 + bool + prompt "Enable HTTP2" + help + Enable HTTPS2 support. + default n + +endmenu diff --git a/net/apache/Makefile b/net/apache/Makefile index 098e2befb..6763c4a0e 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apache -PKG_VERSION:=2.4.27 +PKG_VERSION:=2.4.28 PKG_RELEASE:=1 PKG_SOURCE_NAME:=httpd PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> @@ -16,12 +16,23 @@ PKG_LICENSE:=Apache License PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/httpd/ -PKG_HASH:=71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a +PKG_HASH:=c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_INSTALL:=1 +PKG_CONFIG_DEPENDS := \ + CONFIG_APACHE_HTTP2 + +ADDITIONAL_MODULES:= +ifeq ($(CONFIG_APACHE_HTTP2),y) + ADDITIONAL_MODULES += --enable-http2 +endif +ifneq ($(CONFIG_APACHE_HTTP2),y) + ADDITIONAL_MODULES += --enable-http2=no +endif + include $(INCLUDE_DIR)/package.mk define Package/apache/Default @@ -38,9 +49,13 @@ define Package/apache/Default/description Server, it has grown to be the most popular web server on the Internet. endef +define Package/apache/config + source "$(SOURCE)/Config.in" +endef + define Package/apache $(call Package/apache/Default) - DEPENDS:=+libapr +libaprutil +libpcre +libopenssl +unixodbc +zlib + DEPENDS:=+libapr +libaprutil +libpcre +libopenssl +unixodbc +zlib +APACHE_HTTP2:libnghttp2 endef define Package/apache/description @@ -90,13 +105,14 @@ endef TARGET_CFLAGS += $(FPIC) TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -TARGET_LDFLAGS += -lpthread +TARGET_LDFLAGS += -lpthread define Build/Configure $(call Build/Configure/Default, \ --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + $(ADDITIONAL_MODULES) \ --enable-http \ --with-crypto \ --with-sqlit3="$(STAGING_DIR)/usr" \ |