aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-07-13 08:46:59 -0400
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:41 -0700
commit77fa6a7ca6687c9b4014ff7c4d9fd0147bdace4e (patch)
tree4a252d692392311f573517378e71ee044fa17a3c
parent5490337a5e8e85541bbc14845fe0bc358583abee (diff)
downloadmeta-openembedded-contrib-77fa6a7ca6687c9b4014ff7c4d9fd0147bdace4e.tar.gz
meta-openembedded-contrib-77fa6a7ca6687c9b4014ff7c4d9fd0147bdace4e.tar.bz2
meta-openembedded-contrib-77fa6a7ca6687c9b4014ff7c4d9fd0147bdace4e.zip
apache2: update to version 2.4.23
This update is mostly bug fixes. Includes: CVE-2016-4979 and CVE-2016-5387 and is why I merged from master. Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 7707dd5bc82583e4cc41ae3080b40d0d6ede8a45) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.20.bb)4
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb)4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.20.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb
index 9932d12864..b227f191d2 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.20.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb
@@ -15,8 +15,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
S = "${WORKDIR}/httpd-${PV}"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
-SRC_URI[md5sum] = "3ff4f00ee051cf5d5304b47b1bc418b8"
-SRC_URI[sha256sum] = "0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da"
+SRC_URI[md5sum] = "04f19c60e810c028f5240a062668a688"
+SRC_URI[sha256sum] = "0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58"
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb
index ae2ec86159..5bea876600 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb
@@ -23,8 +23,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
-SRC_URI[md5sum] = "3ff4f00ee051cf5d5304b47b1bc418b8"
-SRC_URI[sha256sum] = "0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da"
+SRC_URI[md5sum] = "04f19c60e810c028f5240a062668a688"
+SRC_URI[sha256sum] = "0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58"
S = "${WORKDIR}/httpd-${PV}"