Author: igor Date: Tue Jan 6 02:09:15 2015 New Revision: 3099 Log: fix php build with libressl
Added: trunk/php/php-5.6.4-libressl-1.patch Modified: trunk/httpd/httpd-2.4.10-libressl-1.patch Modified: trunk/httpd/httpd-2.4.10-libressl-1.patch ============================================================================== --- trunk/httpd/httpd-2.4.10-libressl-1.patch Mon Jan 5 12:53:13 2015 (r3098) +++ trunk/httpd/httpd-2.4.10-libressl-1.patch Tue Jan 6 02:09:15 2015 (r3099) @@ -1,5 +1,5 @@ Submitted By: Igor Živković <[email protected]> -Date: 2014-01-05 +Date: 2015-01-05 Initial Package Version: 2.4.10 Upstream Status: Unknown Origin: Sabotage Added: trunk/php/php-5.6.4-libressl-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/php/php-5.6.4-libressl-1.patch Tue Jan 6 02:09:15 2015 (r3099) @@ -0,0 +1,24 @@ +Submitted By: Igor Živković <[email protected]> +Date: 2015-01-06 +Initial Package Version: 5.6.4 +Upstream Status: Unknown +Origin: OpenELEC +Description: Fixes build with LibreSSL. + +diff -Naur php-5.6.4.orig/ext/openssl/openssl.c php-5.6.4/ext/openssl/openssl.c +--- php-5.6.4.orig/ext/openssl/openssl.c 2014-12-17 02:25:00.000000000 +0100 ++++ php-5.6.4/ext/openssl/openssl.c 2015-01-06 10:47:21.144704289 +0100 +@@ -975,11 +975,13 @@ + + if (file == NULL) { + file = RAND_file_name(buffer, sizeof(buffer)); ++#ifdef HAVE_SSL_RAND_EGD + } else if (RAND_egd(file) > 0) { + /* if the given filename is an EGD socket, don't + * write anything back to it */ + *egdsocket = 1; + return SUCCESS; ++#endif + } + if (file == NULL || !RAND_load_file(file, -1)) { + if (RAND_status() == 0) { -- http://lists.linuxfromscratch.org/listinfo/patches FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
