diff options
Diffstat (limited to 'main/apache2/APKBUILD')
| -rw-r--r-- | main/apache2/APKBUILD | 69 |
1 files changed, 54 insertions, 15 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 1e47daae52d..5bec2c9ed4a 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> pkgname=apache2 _pkgreal=httpd -pkgver=2.4.52 +pkgver=2.4.59 pkgrel=0 pkgdesc="A high performance Unix-based HTTP server" url="https://httpd.apache.org/" @@ -11,12 +11,25 @@ license="Apache-2.0" install="$pkgname.pre-install $pkgname.pre-upgrade" pkgusers="apache" pkggroups="apache" -makedepends="apr-dev apr-util-dev autoconf automake brotli-dev libxml2-dev - lua-dev nghttp2-dev openssl1.1-compat-dev pcre-dev sed zlib-dev" +makedepends=" + apr-dev + apr-util-dev + autoconf + automake + brotli-dev + libxml2-dev + lua-dev + nghttp2-dev + openssl-dev + pcre2-dev + sed + zlib-dev + " subpackages="$pkgname-ctl $pkgname-error:_error:noarch $pkgname-dev $pkgname-doc + $pkgname-openrc $pkgname-brotli $pkgname-http2 $pkgname-icons::noarch @@ -46,11 +59,40 @@ source="https://dlcdn.apache.org/$_pkgreal/$_pkgreal-$pkgver.tar.bz2 conf/0012-httpd.conf-MIMEMagicFile.patch conf/0013-httpd-.conf-IfModule.patch conf/0014-httpd-.conf-LoadModule.patch + fix-unknown-xmlChar-error.patch " -options="suid" +options="suid !check" builddir="$srcdir"/$_pkgreal-$pkgver # secfixes: +# 2.4.59-r0: +# - CVE-2023-38709 +# - CVE-2024-24795 +# - CVE-2024-27316 +# 2.4.58-r0: +# - CVE-2023-45802 +# - CVE-2023-43622 +# - CVE-2023-31122 +# 2.4.56-r0: +# - CVE-2023-25690 +# - CVE-2023-27522 +# 2.4.55-r0: +# - CVE-2022-36760 +# - CVE-2022-37436 +# 2.4.54-r0: +# - CVE-2022-26377 +# - CVE-2022-28330 +# - CVE-2022-28614 +# - CVE-2022-28615 +# - CVE-2022-29404 +# - CVE-2022-30522 +# - CVE-2022-30556 +# - CVE-2022-31813 +# 2.4.53-r0: +# - CVE-2022-22719 +# - CVE-2022-22720 +# - CVE-2022-22721 +# - CVE-2022-23943 # 2.4.52-r0: # - CVE-2021-44224 # - CVE-2021-44790 @@ -122,11 +164,7 @@ builddir="$srcdir"/$_pkgreal-$pkgver # - CVE-2017-7679 prepare() { - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$(basename $i);; - esac - done + default_prepare cat "$srcdir/alpine.layout" >> config.layout } @@ -184,7 +222,7 @@ package() { mv "$pkgdir"/etc/apache2/extra "$pkgdir"/etc/apache2/conf.d for file in "$pkgdir"/etc/apache2/conf.d/httpd-*; do mv "$file" \ - "$(dirname $file)/${file#$pkgdir/etc/apache2/conf.d/httpd-}" + "$(dirname $file)/${file#"$pkgdir"/etc/apache2/conf.d/httpd-}" done sed -Ei \ 's:^(\t?#?LoadModule .+ )lib/apache2/:\1modules/:;ta;b;:a;s/^#?LoadModule (dav.*|lbmethod_.+|.*ldap|lua|proxy.*|ssl|xml2enc)_module //;tb;b;:b;d' \ @@ -230,7 +268,7 @@ _mv_conf() { _load_mod() { _make_conf_dir echo "LoadModule $1_module modules/mod_$1.so" >> \ - "$_conf_dir"/${subpkgname#$pkgname-}.conf + "$_conf_dir"/${subpkgname#"$pkgname"-}.conf } _load_mods() { @@ -253,7 +291,6 @@ dev() { mv "$pkgdir"/usr/bin/apxs \ "$subpkgdir"/usr/bin/apxs - install -d "$subpkgdir"/usr/share/apache2 mv "$pkgdir"/usr/share/apache2/build \ "$subpkgdir"/usr/share/apache2/ @@ -318,7 +355,7 @@ ctl() { ssl() { pkgdesc="SSL/TLS module for the Apache HTTP Server" install="apache2-ssl.post-install" - depends="apache2 openssl" + depends="apache2 openssl>3" install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_ssl.so \ @@ -380,8 +417,9 @@ _lua() { "$subpkgdir"/usr/lib/apache2/ _load_mods } + sha512sums=" -97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 httpd-2.4.59.tar.bz2 8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd @@ -399,5 +437,6 @@ a3936713f8ffcbf2bb633035873249b94fa8ace9fdb758405264f075f755fbcfec4d08794f79e469 eb09b3bcbab70f6a48d5efe8fc4bd62cc2b3f46def97c09d8454b846a065c02d18bd846313c421897c8d13be728e4b2ca790e2a5c5c6add3821d9e572bacfab2 0011-httpd.conf-IncludeOptional.patch 695742f569720d7bad9306acc40456de3a12ff2ff3a108499afc3fed2e8b13883027c6e14a3fac3efe387a70386b958605b5bbfd0147ec06bb87fad30f3b66fa 0012-httpd.conf-MIMEMagicFile.patch efbba3c3475bebe5c63ce8d6eaf153cf2c46188e282a65830571c8b7dbc1e657ab9ce160dc82e331097ac483fe632f5201fde6f3f5de32fe5c52dcc7dee66216 0013-httpd-.conf-IfModule.patch -56e7bb9743d153416b15c32bb5435e4cf85d84204a02f28767c8dcba08eec1ac302521d57ce74154d3e9f7a3644ab3f8a9318150e21f8559eb67e387087a0821 0014-httpd-.conf-LoadModule.patch +223b0c3f141977fa4e249bcf09b3b2449d6cc9ebbad50621a6b2bd5d3b661fcf0369ece4e2055792bbcddac68f323a19f0f9dc893237676a244e03dc4260958e 0014-httpd-.conf-LoadModule.patch +ca3165e5802a25c271cbc15569b3dcda71b141cce6d91b803d23ba08d99e957d6bd0782d40dfbc913ef714aefff1263ad420663bf2dc693b15e73c6ee8e70575 fix-unknown-xmlChar-error.patch " |