Date: Sunday, September 25, 2022 @ 19:46:00 Author: anatolik Revision: 456780
FS#76001 Remove openssl-malloc-init.patch In every release of OpenSSL 1.1.1 since 1.1.1b [1] and all release of OpenSSL 3.0 [2] [3] OPENSSL_malloc_init() is a no-op and ordering other SSL functions before or after a no-op has no effect. [1] https://github.com/openssl/openssl/issues/2865 [2] https://github.com/openssl/openssl/commit/e1cce612a6520555805c25be2539f231c22696d9 [3] https://github.com/openssl/openssl/commit/ef45aa14c5af024fcb8bef1c9007f3d1c115bd85 Modified: apache/trunk/PKGBUILD Deleted: apache/trunk/openssl-malloc-init.patch ---------------------------+ PKGBUILD | 5 ----- openssl-malloc-init.patch | 20 -------------------- 2 files changed, 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-25 18:47:03 UTC (rev 456779) +++ PKGBUILD 2022-09-25 19:46:00 UTC (rev 456780) @@ -35,7 +35,6 @@ ) source=( https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} - openssl-malloc-init.patch apache.tmpfiles.conf httpd.logrotate httpd.service @@ -43,7 +42,6 @@ ) sha256sums=('eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340' 'SKIP' - 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c' '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16' 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960' @@ -64,9 +62,6 @@ -i docs/conf/httpd.conf.in cat "${srcdir}/arch.layout" >> config.layout - - # https://github.com/openssl/openssl/issues/2865 - patch -Np1 -i ../openssl-malloc-init.patch } build() { Deleted: openssl-malloc-init.patch =================================================================== --- openssl-malloc-init.patch 2022-09-25 18:47:03 UTC (rev 456779) +++ openssl-malloc-init.patch 2022-09-25 19:46:00 UTC (rev 456780) @@ -1,20 +0,0 @@ ---- 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); -
