Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apache: Update to 2.4.37

Browse source 
Fixes at least:

CVE-2017-15710
CVE-2017-15715
CVE-2018-1283
CVE-2018-1312

Added CPE ID for proper CVE tracking.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-08-23 18:05:06 -07:00
parent 7681c108af
commit 0ff43a37a3
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/apache/Makefile
View file

@ -8,21 +8,23 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=apache PKG_NAME:=apache
PKG_VERSION:=2.4.28 PKG_VERSION:=2.4.37
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_NAME:=httpd PKG_SOURCE_NAME:=httpd
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
PKG_LICENSE:=Apache License
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@APACHE/httpd/ PKG_SOURCE_URL:=@APACHE/httpd/
PKG_HASH:=c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 PKG_HASH:=3498dc5c6772fac2eb7307dc7963122ffe243b5e806e0be4fb51974ff759d726
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
PKG_LICENSE:=Apache License
PKG_CPE_ID:=cpe:/a:apache:http_server
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS:= \
CONFIG_APACHE_HTTP2 CONFIG_APACHE_HTTP2
ADDITIONAL_MODULES:= ADDITIONAL_MODULES:=
@ -40,7 +42,7 @@ define Package/apache/Default
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
TITLE:=The Apache Web Server TITLE:=The Apache Web Server
URL:=http://httpd.apache.org/ URL:=https://httpd.apache.org/
endef endef
define Package/apache/Default/description define Package/apache/Default/description
@ -103,7 +105,7 @@ $(call Package/apache/Default/description)
This package contains the icons from Apache. This package contains the icons from Apache.
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC) -Wno-error
TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
TARGET_LDFLAGS += -lpthread TARGET_LDFLAGS += -lpthread

2
net/apache/patches/001-Makefile_in.patch
View file

@ -1,6 +1,6 @@
--- a/server/Makefile.in --- a/server/Makefile.in
+++ b/server/Makefile.in +++ b/server/Makefile.in
@@ -26,7 +26,10 @@ gen_test_char: $(gen_test_char_OBJECTS) @@ -29,7 +29,10 @@ gen_test_char: $(gen_test_char_OBJECTS)
$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
test_char.h: gen_test_char test_char.h: gen_test_char

2
net/apache/patches/003-logdir_fix.patch
View file

@ -26,7 +26,7 @@ Index: httpd-2.4.25/config.layout
proxycachedir: ${localstatedir}/proxy proxycachedir: ${localstatedir}/proxy
</Layout> </Layout>
@@ -150,7 +150,7 @@ @@ -174,7 +174,7 @@
includedir: ${prefix}/include includedir: ${prefix}/include
localstatedir: /var${prefix} localstatedir: /var${prefix}
runtimedir: ${localstatedir}/run runtimedir: ${localstatedir}/run

2
net/apache/patches/010-reproducible-builds.patch
View file

@ -31,7 +31,7 @@ Index: apache2/server/Makefile.in
CLEAN_TARGETS = gen_test_char test_char.h \ CLEAN_TARGETS = gen_test_char test_char.h \
ApacheCoreOS2.def httpd.exp export_files \ ApacheCoreOS2.def httpd.exp export_files \
@@ -80,8 +81,8 @@ httpd.exp: exports.c export_vars.h @@ -85,8 +86,8 @@ httpd.exp: exports.c export_vars.h
@echo "#! ." > $@ @echo "#! ." > $@
@echo "* This file was AUTOGENERATED at build time." >> $@ @echo "* This file was AUTOGENERATED at build time." >> $@
@echo "* Please do not edit by hand." >> $@ @echo "* Please do not edit by hand." >> $@