diff options
author | John-Mark Bell <jmb@netsurf-browser.org> | 2015-03-19 16:14:34 +0000 |
---|---|---|
committer | John-Mark Bell <jmb@netsurf-browser.org> | 2015-03-19 16:14:34 +0000 |
commit | a7b434369f441a5adf6543bf6d8390e3bdbbec9d (patch) | |
tree | c6b25da4eda32a1ababea100e9bc4b17d2b83db1 /sdk/recipes/patches/openssl/ppc-amigaos | |
parent | 96ebcbd5cfa0859079a06de9013ecac3bfcd21a0 (diff) | |
download | toolchains-a7b434369f441a5adf6543bf6d8390e3bdbbec9d.tar.gz toolchains-a7b434369f441a5adf6543bf6d8390e3bdbbec9d.tar.bz2 |
Refresh patches for OpenSSL 1.0.1m
Diffstat (limited to 'sdk/recipes/patches/openssl/ppc-amigaos')
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p | 10 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p | 16 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/no-term.p | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p index 898748b..4da5a6d 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p @@ -1,5 +1,5 @@ ---- crypto/jpake/jpake.c.orig 2011-03-08 22:19:36.000000000 +0000 -+++ crypto/jpake/jpake.c 2011-03-08 22:19:49.000000000 +0000 +--- crypto/jpake/jpake.c.orig 2011-03-08 22:19:36.000000000 +0000 ++++ crypto/jpake/jpake.c 2011-03-08 22:19:49.000000000 +0000 @@ -3,7 +3,7 @@ #include <openssl/crypto.h> #include <openssl/sha.h> @@ -11,12 +11,12 @@ * In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or --- crypto/pkcs7/bio_pk7.c.orig 2011-03-08 22:21:16.000000000 +0000 +++ crypto/pkcs7/bio_pk7.c 2011-03-08 22:21:23.000000000 +0000 -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ #include <openssl/bio.h> #if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) --#include <memory.h> -+#include <string.h> +-# include <memory.h> ++# include <string.h> #endif #include <stdio.h> diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p index 96d339f..3f5bf17 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p @@ -1,13 +1,13 @@ --- apps/speed.c.orig 2011-03-08 22:44:56.000000000 +0000 +++ apps/speed.c 2011-03-08 22:48:10.000000000 +0000 -@@ -223,6 +223,10 @@ - #define NO_FORK - #endif +@@ -225,6 +225,10 @@ + # define NO_FORK + # endif -+#ifdef OPENSSL_SYS_AMIGAOS4 -+#undef SIGALRM -+#endif ++# ifdef OPENSSL_SYS_AMIGAOS4 ++# undef SIGALRM ++# endif + - #undef BUFSIZE - #define BUFSIZE ((long)1024*8+1) + # undef BUFSIZE + # define BUFSIZE ((long)1024*8+1) static volatile int run=0; diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p index 606e3f1..24bdb86 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p @@ -12,9 +12,9 @@ + #ifdef TERMIOS # include <termios.h> - # define TTY_STRUCT struct termios + # define TTY_STRUCT struct termios @@ -268,7 +274,7 @@ - typedef int sig_atomic_t; + typedef int sig_atomic_t; #endif -#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) |