diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-20 14:53:37 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-20 14:54:25 +0300 |
| commit | 1a00cbc70012ee1334634b91fe3ec174b445f9c2 (patch) | |
| tree | 60ea1bf99a05183a03a6b864e632b73a9ca53fc2 | |
| parent | 59a11b59748d0c389571723c781e7c0507893bf5 (diff) | |
| download | alpine_aports-1a00cbc70012ee1334634b91fe3ec174b445f9c2.tar.bz2 alpine_aports-1a00cbc70012ee1334634b91fe3ec174b445f9c2.tar.xz alpine_aports-1a00cbc70012ee1334634b91fe3ec174b445f9c2.zip | |
main/apache2: fix libressl patch
https://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?r1=1832994&r2=1833598&view=patch
| -rw-r--r-- | main/apache2/APKBUILD | 4 | ||||
| -rw-r--r-- | main/apache2/libressl-compat-patch-fix.patch | 18 |
2 files changed, 21 insertions, 1 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 6bc210a432..b55ad0dc19 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | pkgname=apache2 | 3 | pkgname=apache2 |
| 4 | _pkgreal=httpd | 4 | _pkgreal=httpd |
| 5 | pkgver=2.4.34 | 5 | pkgver=2.4.34 |
| 6 | pkgrel=0 | 6 | pkgrel=1 |
| 7 | pkgdesc="A high performance Unix-based HTTP server" | 7 | pkgdesc="A high performance Unix-based HTTP server" |
| 8 | url="http://httpd.apache.org/" | 8 | url="http://httpd.apache.org/" |
| 9 | arch="all" | 9 | arch="all" |
| @@ -32,6 +32,7 @@ source="http://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2 | |||
| 32 | apache2.initd | 32 | apache2.initd |
| 33 | alpine.layout | 33 | alpine.layout |
| 34 | apache-2.4.34-libressl-compatibility.patch | 34 | apache-2.4.34-libressl-compatibility.patch |
| 35 | libressl-compat-patch-fix.patch | ||
| 35 | conf/0001-httpd.conf-ServerRoot.patch | 36 | conf/0001-httpd.conf-ServerRoot.patch |
| 36 | conf/0002-httpd.conf-ServerTokens.patch | 37 | conf/0002-httpd.conf-ServerTokens.patch |
| 37 | conf/0003-httpd.conf-ServerSignature.patch | 38 | conf/0003-httpd.conf-ServerSignature.patch |
| @@ -324,6 +325,7 @@ sha512sums="2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3 | |||
| 324 | 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd | 325 | 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701 apache2.initd |
| 325 | 177c58d049fc4476fd9b9b36b67725145777c84cf81948105c9314cb09312dff6c1931fe21aaa243597abaefded6c6dfd80d83839e45a23950b50de615d73b06 alpine.layout | 326 | 177c58d049fc4476fd9b9b36b67725145777c84cf81948105c9314cb09312dff6c1931fe21aaa243597abaefded6c6dfd80d83839e45a23950b50de615d73b06 alpine.layout |
| 326 | fb0e896666126fd2c79cf12533a09f19ff991a44ede33ab7933381fbe5ebf94008ffb4c824a9958e47d2277fd4b985f14597fa533b2964666e3d4684e8ede9d9 apache-2.4.34-libressl-compatibility.patch | 327 | fb0e896666126fd2c79cf12533a09f19ff991a44ede33ab7933381fbe5ebf94008ffb4c824a9958e47d2277fd4b985f14597fa533b2964666e3d4684e8ede9d9 apache-2.4.34-libressl-compatibility.patch |
| 328 | 470b1c472094e59a812be3e7a68889b7ef8b3c985c9c211dabf9274ec95c1f01f606df57a4aebe75f7007e0832258415b9236645f059fbe7bfdf6bd0ea73b2f5 libressl-compat-patch-fix.patch | ||
| 327 | 361e0a74f6f8f5734f074dc2f2001ff64896ecc81f88ea384b6db7db33b7738eb92b4e16163b356259581a8e7dd86adeac971d36d2584abb781e8f9b8fae6356 0001-httpd.conf-ServerRoot.patch | 329 | 361e0a74f6f8f5734f074dc2f2001ff64896ecc81f88ea384b6db7db33b7738eb92b4e16163b356259581a8e7dd86adeac971d36d2584abb781e8f9b8fae6356 0001-httpd.conf-ServerRoot.patch |
| 328 | 40f3b7579c403952ba1efcb8dfd6ffd91c2695a06a2e5530ab5a583946558790fbfa16cad259d273ac1aa7a6335dd79636aa82fd844dc3a60a34c34d90db5e17 0002-httpd.conf-ServerTokens.patch | 330 | 40f3b7579c403952ba1efcb8dfd6ffd91c2695a06a2e5530ab5a583946558790fbfa16cad259d273ac1aa7a6335dd79636aa82fd844dc3a60a34c34d90db5e17 0002-httpd.conf-ServerTokens.patch |
| 329 | ad0c1711bc240f99cd0256d0984ad0142e03c384d30378ccca3e47cdd2596307e64bb19fbd810a56c0e4c0716577d3160bad2ae39783b1358412588bc729c113 0003-httpd.conf-ServerSignature.patch | 331 | ad0c1711bc240f99cd0256d0984ad0142e03c384d30378ccca3e47cdd2596307e64bb19fbd810a56c0e4c0716577d3160bad2ae39783b1358412588bc729c113 0003-httpd.conf-ServerSignature.patch |
diff --git a/main/apache2/libressl-compat-patch-fix.patch b/main/apache2/libressl-compat-patch-fix.patch new file mode 100644 index 0000000000..c648ea6d94 --- /dev/null +++ b/main/apache2/libressl-compat-patch-fix.patch | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | --- httpd-2.4.34/modules/ssl/ssl_private.h | ||
| 2 | +++ httpd-2.4.34.libressl/modules/ssl/ssl_private.h | ||
| 3 | @@ -132,13 +132,12 @@ | ||
| 4 | SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) | ||
| 5 | #define SSL_CTX_set_max_proto_version(ctx, version) \ | ||
| 6 | SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) | ||
| 7 | -#elif LIBRESSL_VERSION_NUMBER < 0x2070000f | ||
| 8 | +#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */ | ||
| 9 | /* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not | ||
| 10 | * include most changes from OpenSSL >= 1.1 (new functions, macros, | ||
| 11 | * deprecations, ...), so we have to work around this... | ||
| 12 | */ | ||
| 13 | -#define MODSSL_USE_OPENSSL_PRE_1_1_API (1) | ||
| 14 | -#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */ | ||
| 15 | +#define MODSSL_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2080000f) | ||
| 16 | #else /* defined(LIBRESSL_VERSION_NUMBER) */ | ||
| 17 | #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L) | ||
| 18 | #endif | ||