From 8a4d0b206d7604db94ea91c788741777a6927072 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 5 Apr 2020 21:08:03 +0200 Subject: [PATCH] apache: security bump to 2.4.43 This minor version bump fixes: CVE-2020-1934 CVE-2020-1927 Upstream added cross-compile compatibility to apxs, so we can drop a sed script. Upstream also added the OpenWrt layout, so we can drop our local copy. Signed-off-by: Sebastian Kemper --- net/apache/Makefile | 11 ++--------- net/apache/files/openwrt.layout | 24 ------------------------ 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 net/apache/files/openwrt.layout diff --git a/net/apache/Makefile b/net/apache/Makefile index a784ce295d..8be3e18dd3 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apache -PKG_VERSION:=2.4.41 +PKG_VERSION:=2.4.43 PKG_RELEASE:=1 PKG_SOURCE_NAME:=httpd PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/httpd/ -PKG_HASH:=133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 +PKG_HASH:=a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) @@ -289,11 +289,6 @@ CONFIGURE_VARS += \ ac_cv_gettid=yes \ ap_cv_void_ptr_lt_long=no -define Build/Prepare - $(call Build/Prepare/Default) - $(INSTALL_DATA) ./files/openwrt.layout $(PKG_BUILD_DIR)/config.layout -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/apxs $(1)/usr/bin @@ -304,8 +299,6 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/share/apache2/build $(CP) $(PKG_INSTALL_DIR)/usr/share/apache2/build/* \ $(1)/usr/share/apache2/build - $(SED) 's%/usr/share/apache2/build%$(STAGING_DIR)/usr/share/apache2/build%' \ - $(1)/usr/bin/apxs $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' \ $(1)/usr/share/apache2/build/config_vars.mk endef diff --git a/net/apache/files/openwrt.layout b/net/apache/files/openwrt.layout deleted file mode 100644 index 844c4f6272..0000000000 --- a/net/apache/files/openwrt.layout +++ /dev/null @@ -1,24 +0,0 @@ - - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${prefix}/bin - sbindir: ${prefix}/sbin - libdir: ${prefix}/lib - libexecdir: ${prefix}/lib+ - mandir: ${prefix}/share/man - sysconfdir: /etc+ - datadir: ${prefix}/share+ - installbuilddir: ${datadir}/build - errordir: ${datadir}/error - iconsdir: ${datadir}/icons - htdocsdir: ${datadir}/htdocs - manualdir: /usr/share/doc/apache2/manual - cgidir: ${datadir}/cgi-bin - includedir: ${prefix}/include+ - localstatedir: /var - runtimedir: ${localstatedir}/run+ - logfiledir: ${localstatedir}/log+ - proxycachedir: ${localstatedir}/cache/apache2 - - -- 2.30.2