From 7bd0b76c47c41ed2fc45f86d068c887474b1d1e5 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+apkfission@gmail.com>
Date: Mon, 6 Aug 2018 13:22:24 -0500
Subject: user/apache-httpd: upgrade to 2.4.34
---
user/apache-httpd/APKBUILD | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index 4f4ea3414..2eabdaf90 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=apache-httpd
_pkgreal=httpd
-pkgver=2.4.29
+pkgver=2.4.34
pkgrel=0
pkgdesc="Open-source HTTP server"
url="https://httpd.apache.org"
@@ -36,6 +36,18 @@ source="http://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
builddir="$srcdir/$_pkgreal-$pkgver"
options="suid !check"
+# 2.4.30: (unreleased)
+# - CVE-2017-15710
+# - CVE-2018-1283
+# - CVE-2018-1303
+# - CVE-2018-1301
+# - CVE-2017-15715
+# - CVE-2018-1312
+# - CVE-2018-1302
+# 2.4.34:
+# - CVE-2018-8011
+# - CVE-2018-1333
+
prepare() {
default_prepare
cat "$srcdir"/adelie.layout >> "$builddir"/config.layout
@@ -123,7 +135,7 @@ ldap() {
"$subpkgdir"/usr/libexec/apache2
}
-sha512sums="840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a httpd-2.4.29.tar.bz2
+sha512sums="2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8 httpd-2.4.34.tar.bz2
c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout
336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd
9893248f1724748c9ef91171728b4c557ced7de543e23ed72cb75c02728048b2813ac99015a4a28e7984daa51faa6e42403c17b875539fe71c33424865eccecf apache-httpd.initd
--
cgit v1.2.3-70-g09d2