From 1be884811237c6ae3b70afed70eac27a8fc41cc5 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 13 Feb 2019 17:20:49 +0000 Subject: update sdk some library versions --- sdk/Makefile | 6 +++--- 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 --#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 - # include + /* 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__) ) -- cgit v1.2.3