[arch-commits] Commit in apache/trunk (PKGBUILD openssl-malloc-init.patch)

[Jan de Groot]

    Date: Sunday, May 21, 2017 @ 22:10:21
  Author: jgc
Revision: 296391

upgpkg: apache 2.4.25-3

Fix ab (FS#53934)

Added:
  apache/trunk/openssl-malloc-init.patch
Modified:
  apache/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    7 ++++++-
 openssl-malloc-init.patch |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-21 21:29:38 UTC (rev 296390)
+++ PKGBUILD	2017-05-21 22:10:21 UTC (rev 296391)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.25
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -30,6 +30,7 @@
     https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
     http2-fixes.patch
     httpd-2.4.23-openssl11.patch
+    openssl-malloc-init.patch
     apache.tmpfiles.conf
     httpd.logrotate
     httpd.service
@@ -39,6 +40,7 @@
             'SKIP'
             '4f0ee70a847d1b87f77b16892cbde38d65e4089e543a0e5d7f0ddc39a5a41f1d'
             '2ff801bbc6ef8a19d177409bd39a4af6b588e9e43d257e43fbf9f786f6140758'
+            'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
             '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
             '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
             'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
@@ -60,6 +62,9 @@
 
   # Support OpenSSL 1.1
   patch -Np1 -i ../httpd-2.4.23-openssl11.patch
+
+  # https://github.com/openssl/openssl/issues/2865
+  patch -Np1 -i ../openssl-malloc-init.patch
 }
 
 build() {

Added: openssl-malloc-init.patch
===================================================================
--- openssl-malloc-init.patch	                        (rev 0)
+++ openssl-malloc-init.patch	2017-05-21 22:10:21 UTC (rev 296391)
@@ -0,0 +1,20 @@
+--- httpd-2.4.25/support/ab.c.orig	2017-05-21 21:59:17.131193359 +0000
++++ httpd-2.4.25/support/ab.c	2017-05-21 22:01:34.704322361 +0000
+@@ -2496,6 +2496,8 @@
+         heartbeatres = 0;
+ 
+ #ifdef USE_SSL
++    SSL_load_error_strings();
++    SSL_library_init();
+ #ifdef RSAREF
+     R_malloc_init();
+ #else
+@@ -2505,8 +2507,6 @@
+     OPENSSL_malloc_init();
+ #endif
+ #endif
+-    SSL_load_error_strings();
+-    SSL_library_init();
+     bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+     bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+