diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2019-01-26 10:00:23 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2019-01-26 10:04:29 +0200 |
| commit | 3629c9dc90b9eab8a91378b33634ae9b19f9e0b0 (patch) | |
| tree | d4fab3dff5db3d72ed210247e59d957e4ef95a8d | |
| parent | 86686eac58e8b2cd03eb04fdcdab2afdd4871e0c (diff) | |
| download | aports-3629c9dc90b9eab8a91378b33634ae9b19f9e0b0.tar.bz2 aports-3629c9dc90b9eab8a91378b33634ae9b19f9e0b0.tar.xz | |
main/apache2: fix mod_ssl on libressl
| -rw-r--r-- | main/apache2/APKBUILD | 4 | ||||
| -rw-r--r-- | main/apache2/libressl-fix.patch | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 9ee2d35159..0ca7fee891 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache2 _pkgreal=httpd pkgver=2.4.38 -pkgrel=0 +pkgrel=1 pkgdesc="A high performance Unix-based HTTP server" url="https://httpd.apache.org/" arch="all" @@ -27,6 +27,7 @@ subpackages="$pkgname-dev $pkgname-utils $pkgname-webdav" source="https://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2 + libressl-fix.patch apache2.confd apache2.logrotate apache2.initd @@ -325,6 +326,7 @@ _lua() { _load_mods } sha512sums="8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448 httpd-2.4.38.tar.bz2 +655f5a655fedd737fb881b5caa6f012f5a43a611c513cab6d03bb69be7cca7fd70b49cfca0a3f7a5e7c696ad7bc80495c44155ad82a411306be4964e67faae6e libressl-fix.patch 8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd diff --git a/main/apache2/libressl-fix.patch b/main/apache2/libressl-fix.patch new file mode 100644 index 0000000000..ae40c38946 --- /dev/null +++ b/main/apache2/libressl-fix.patch @@ -0,0 +1,11 @@ +--- httpd-2.4.38/modules/ssl/ssl_engine_init.c ++++ httpd-2.4.38.libressl/modules/ssl/ssl_engine_init.c +@@ -1494,7 +1494,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 */ |