Author: igor Date: Sun Jan 4 14:48:54 2015 New Revision: 3096 Log: fix elinks build with libressl and lua 5.2
Added: trunk/elinks/ trunk/elinks/elinks-git20150102-libressl-1.patch trunk/elinks/elinks-git20150102-lua52-1.patch Added: trunk/elinks/elinks-git20150102-libressl-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/elinks/elinks-git20150102-libressl-1.patch Sun Jan 4 14:48:54 2015 (r3096) @@ -0,0 +1,55 @@ +Submitted By: Igor Živković <[email protected]> +Date: 2015-01-04 +Initial Package Version: git20150102 +Upstream Status: Not submitted +Origin: Self +Description: Fixes build with LibreSSL. + +--- elinks.orig/configure.in 2015-01-04 23:11:26.010283078 +0100 ++++ elinks/configure.in 2015-01-04 23:22:50.212832740 +0100 +@@ -1112,9 +1112,11 @@ + else + LIBS="-lssl -lcrypto $LIBS_X" + fi +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[OpenSSL_add_all_algorithms()]])],[cf_result=yes],[cf_result=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h> ++#include <openssl/ssl.h>]], [[OpenSSL_add_all_algorithms()]])],[cf_result=yes],[cf_result=no]) + if test "$cf_result" != yes; then +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h> ++#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no]) + fi + fi + done +--- elinks.orig/src/network/ssl/socket.c 2015-01-04 23:11:26.123278054 +0100 ++++ elinks/src/network/ssl/socket.c 2015-01-04 23:25:37.323386889 +0100 +@@ -5,6 +5,7 @@ + #endif + + #ifdef CONFIG_OPENSSL ++#include <stdint.h> + #include <openssl/ssl.h> + #include <openssl/x509v3.h> + #define USE_OPENSSL +--- elinks.orig/src/network/ssl/ssl.c 2015-01-04 23:11:26.123278054 +0100 ++++ elinks/src/network/ssl/ssl.c 2015-01-04 23:32:28.197066844 +0100 +@@ -5,6 +5,7 @@ + #endif + + #ifdef CONFIG_OPENSSL ++#include <stdint.h> + #include <openssl/ssl.h> + #include <openssl/rand.h> + #define USE_OPENSSL +@@ -84,11 +85,8 @@ + * cannot initialize the PRNG and so every attempt to use SSL fails. + * It's actually an OpenSSL FAQ, and according to them, it's up to the + * application coders to seed the RNG. -- William Yodlowsky */ +- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { +- /* Not an EGD, so read and write to it */ + if (RAND_load_file(f_randfile, -1)) + RAND_write_file(f_randfile); +- } + + SSLeay_add_ssl_algorithms(); + context = SSL_CTX_new(SSLv23_client_method()); Added: trunk/elinks/elinks-git20150102-lua52-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/elinks/elinks-git20150102-lua52-1.patch Sun Jan 4 14:48:54 2015 (r3096) @@ -0,0 +1,19 @@ +Submitted By: Igor Živković <[email protected]> +Date: 2015-01-04 +Initial Package Version: git20150102 +Upstream Status: Not submitted +Origin: Self +Description: Fixes build with Lua version >= 5.2 + +diff -Naur elinks.orig/src/scripting/lua/hooks.c elinks/src/scripting/lua/hooks.c +--- elinks.orig/src/scripting/lua/hooks.c 2015-01-04 23:11:26.140277298 +0100 ++++ elinks/src/scripting/lua/hooks.c 2015-01-04 23:43:16.309134833 +0100 +@@ -144,7 +144,7 @@ + if (err) return EVENT_HOOK_STATUS_NEXT; + + if (lua_isstring(L, -1)) { +- int len = lua_strlen(L, -1); ++ int len = lua_rawlen(L, -1); + + add_fragment(cached, 0, (unsigned char *) lua_tostring(L, -1), len); + normalize_cache_entry(cached, len); -- http://lists.linuxfromscratch.org/listinfo/patches FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
