diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2019-02-13 17:20:49 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2019-02-13 17:20:49 +0000 |
| commit | 1be884811237c6ae3b70afed70eac27a8fc41cc5 (patch) | |
| tree | ca1bbcd98491ef0a17458486fc6a627806b41a20 /sdk | |
| parent | 5e71cd0080285dce5ee903f13cff496dad5fa668 (diff) | |
| download | toolchains-1be884811237c6ae3b70afed70eac27a8fc41cc5.tar.gz toolchains-1be884811237c6ae3b70afed70eac27a8fc41cc5.tar.bz2 | |
update sdk some library versions
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/Makefile | 6 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/mem_sec.c.p | 22 |
2 files changed, 16 insertions, 12 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 4af3119..3827095 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -26,12 +26,12 @@ endif VERSION_ZLIB := 1.2.11 VERSION_LIBICONV := 1.15 VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.1.0g -VERSION_LIBPNG := 1.6.29 +VERSION_OPENSSL := 1.1.0j +VERSION_LIBPNG := 1.6.36 VERSION_LIBJPEG := 8d VERSION_LIBJPEG_TURBO := 1.5.3 VERSION_LIBCARES := 1.13.0 -VERSION_LIBCURL := 7.58.0 +VERSION_LIBCURL := 7.64.0 VERSION_LIBGNURX := 2.5.1 VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p b/sdk/recipes/patches/openssl/mem_sec.c.p index 156cc93..e209f75 100644 --- a/sdk/recipes/patches/openssl/mem_sec.c.p +++ b/sdk/recipes/patches/openssl/mem_sec.c.p @@ -1,11 +1,15 @@ ---- crypto/mem_sec.c.orig 2017-10-17 16:46:24.923285526 +0100 -+++ crypto/mem_sec.c 2017-10-17 16:48:00.358325267 +0100 -@@ -24,7 +24,7 @@ - +--- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000 ++++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000 +@@ -25,7 +25,11 @@ #include <string.h> --#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) -+#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && ! defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)) - # define IMPLEMENTED - # include <stdlib.h> - # include <assert.h> + /* e_os.h includes unistd.h, which defines _POSIX_VERSION */ +-#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \ ++#if !defined(OPENSSL_NO_SECURE_MEMORY) \ ++ && !defined(OPENSSL_SYS_RISCOS) \ ++ && !defined(OPENSSL_SYS_AMIGAOS3) \ ++ && !defined(OPENSSL_SYS_AMIGAOS4) \ ++ && defined(OPENSSL_SYS_UNIX) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) ) |