From 64f29186b42ec744359c466e7393190599749de5 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 22 Feb 2019 10:20:20 +0000 Subject: update m68k atari sdk patches --- sdk/recipes/patches/openssl/crypto.mem_sec.c.p | 16 ++++++++++++++++ .../patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p | 11 ----------- sdk/recipes/patches/openssl/mem_sec.c.p | 15 --------------- 3 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 sdk/recipes/patches/openssl/crypto.mem_sec.c.p delete mode 100644 sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p delete mode 100644 sdk/recipes/patches/openssl/mem_sec.c.p diff --git a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p new file mode 100644 index 0000000..271d571 --- /dev/null +++ b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p @@ -0,0 +1,16 @@ +--- 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,12 @@ + #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_MINT) \ ++ && defined(OPENSSL_SYS_UNIX) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) ) diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p b/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p deleted file mode 100644 index 5dbd97e..0000000 --- a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- crypto/mem_sec.c.orig 2018-06-03 03:52:26.000000000 +0200 -+++ crypto/mem_sec.c 2018-06-03 03:53:35.000000000 +0200 -@@ -24,7 +24,7 @@ - - #include - --#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && ! defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)) -+#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && ! defined(OPENSSL_SYS_AMIGAOS4) && !defined(OPENSSL_SYS_MINT) && (defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)) - # define IMPLEMENTED - # include - # include diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p b/sdk/recipes/patches/openssl/mem_sec.c.p deleted file mode 100644 index e209f75..0000000 --- a/sdk/recipes/patches/openssl/mem_sec.c.p +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 - - /* 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