apache: update to 2.4.53, adopt.

Fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720,
CVE-2022-22719.
This commit is contained in:
ologantr 2022-04-30 10:38:10 +02:00 committed by Echo
parent 02f052e94b
commit d7564d0a6d
2 changed files with 9 additions and 17 deletions

View file

@ -1,11 +0,0 @@
--- a/modules/ssl/ssl_engine_init.c.orig 2018-10-30 16:25:09.084840429 +0100
+++ b/modules/ssl/ssl_engine_init.c 2018-10-30 16:25:55.019411636 +0100
@@ -1492,7 +1492,7 @@
X509_STORE_CTX *sctx;
X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
/* For OpenSSL >=1.1.1, turn on client cert support which is
* otherwise turned off by default (by design).
* https://github.com/openssl/openssl/issues/6933 */

View file

@ -1,6 +1,6 @@
# Template file for 'apache'
pkgname=apache
version=2.4.52
version=2.4.53
revision=1
wrksrc="httpd-${version}"
build_style=gnu-configure
@ -19,24 +19,23 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs
--enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
--enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
--enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
--with-z=${XBPS_CROSS_BASE}/usr"
--enable-mpms-shared=all --with-z=${XBPS_CROSS_BASE}/usr"
conf_files="
/etc/${pkgname}/extra/*.conf
/etc/${pkgname}/httpd.conf
/etc/${pkgname}/magic
/etc/${pkgname}/mime.types"
hostmakedepends="pkg-config perl apr-util-devel"
makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel
openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
depends="apache-htpasswd"
short_desc="Apache http server"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="ologantr <mrphyber@protonmail.com>"
license="Apache-2.0"
homepage="http://httpd.apache.org/"
changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
checksum=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9
checksum=d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63
system_accounts="_apache"
_apache_homedir="/srv/www/$pkgname"
@ -63,6 +62,10 @@ pre_configure() {
cat ${FILESDIR}/xbps.layout >> config.layout
if [ "$CROSS_BUILD" ]; then
# pcre{,2}-config detection doesn't work on cross
# since httpd-2.4.53, manually export PCRE_CONFIG
# to let configure know where it is
export PCRE_CONFIG="${XBPS_CROSS_BASE}/usr/bin/pcre2-config"
configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
--with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
else