diff options
| author | Derek Straka <derek@asterius.io> | 2016-07-13 08:46:59 -0400 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2016-08-16 10:29:41 -0700 |
| commit | 77fa6a7ca6687c9b4014ff7c4d9fd0147bdace4e (patch) | |
| tree | 4a252d692392311f573517378e71ee044fa17a3c | |
| parent | 5490337a5e8e85541bbc14845fe0bc358583abee (diff) | |
| download | meta-openembedded-77fa6a7ca6687c9b4014ff7c4d9fd0147bdace4e.tar.gz | |
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 9932d1286..b227f191d 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 \ | |||
| 15 | S = "${WORKDIR}/httpd-${PV}" | 15 | S = "${WORKDIR}/httpd-${PV}" |
| 16 | 16 | ||
| 17 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" | 17 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" |
| 18 | SRC_URI[md5sum] = "3ff4f00ee051cf5d5304b47b1bc418b8" | 18 | SRC_URI[md5sum] = "04f19c60e810c028f5240a062668a688" |
| 19 | SRC_URI[sha256sum] = "0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da" | 19 | SRC_URI[sha256sum] = "0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58" |
| 20 | 20 | ||
| 21 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ | 21 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ |
| 22 | --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ | 22 | --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 ae2ec8615..5bea87660 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 \ | |||
| 23 | " | 23 | " |
| 24 | 24 | ||
| 25 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" | 25 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" |
| 26 | SRC_URI[md5sum] = "3ff4f00ee051cf5d5304b47b1bc418b8" | 26 | SRC_URI[md5sum] = "04f19c60e810c028f5240a062668a688" |
| 27 | SRC_URI[sha256sum] = "0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da" | 27 | SRC_URI[sha256sum] = "0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58" |
| 28 | 28 | ||
| 29 | S = "${WORKDIR}/httpd-${PV}" | 29 | S = "${WORKDIR}/httpd-${PV}" |
| 30 | 30 | ||