diff options
author | Vlad Glagolev | 2015-03-06 10:43:13 +0300 |
---|---|---|
committer | Vlad Glagolev | 2015-03-06 10:43:13 +0300 |
commit | 637251da8d91a0f52e333969619b006ef5b666ce (patch) | |
tree | fe2a4bc1802bb2ee4c2d6ebc7ae47179ae9584f5 | |
parent | 1a1badccf11db23fe0287031152a558216efedb1 (diff) |
stunnel: fixed build with libressl
-rw-r--r-- | net/stunnel/HISTORY | 4 | ||||
-rwxr-xr-x | net/stunnel/PRE_BUILD | 2 | ||||
-rw-r--r-- | net/stunnel/libressl.patch | 18 |
3 files changed, 24 insertions, 0 deletions
diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY index 20e2ca0ad9..50910a1944 100644 --- a/net/stunnel/HISTORY +++ b/net/stunnel/HISTORY @@ -1,3 +1,7 @@ +2015-03-06 Vlad Glagolev <stealth@sourcemage.org> + * PRE_BUILD: apply a patch + * libressl.patch: added, to fix build with libressl + 2015-02-03 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 5.10 diff --git a/net/stunnel/PRE_BUILD b/net/stunnel/PRE_BUILD index 40fdf4a183..c3c2124912 100755 --- a/net/stunnel/PRE_BUILD +++ b/net/stunnel/PRE_BUILD @@ -1,6 +1,8 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +patch -p1 < "$SPELL_DIRECTORY/libressl.patch" && + # fixed default paths in configuration file sedit "s:@prefix@::g" tools/stunnel.conf-sample.in && diff --git a/net/stunnel/libressl.patch b/net/stunnel/libressl.patch new file mode 100644 index 0000000000..85b90071b9 --- /dev/null +++ b/net/stunnel/libressl.patch @@ -0,0 +1,18 @@ +--- stunnel-5.02.org/src/ssl.c 2014-07-12 06:13:07.356889656 +0000 ++++ stunnel-5.02/src/ssl.c 2014-07-12 06:15:39.032889896 +0000 +@@ -195,6 +195,7 @@ + } + s_log(LOG_DEBUG, "RAND_screen failed to sufficiently seed PRNG"); + #else ++#ifdef HAVE_RAND_EGD + if(global->egd_sock) { + if((bytes=RAND_egd(global->egd_sock))==-1) { + s_log(LOG_WARNING, "EGD Socket %s failed", global->egd_sock); +@@ -207,6 +208,7 @@ + so no need to check if seeded sufficiently */ + } + } ++#endif + /* try the good-old default /dev/urandom, if available */ + totbytes+=add_rand_file(global, "/dev/urandom"); + if(RAND_status()) |