summaryrefslogtreecommitdiff
path: root/sdk
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2015-03-19 16:14:34 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2015-03-19 16:14:34 +0000
commita7b434369f441a5adf6543bf6d8390e3bdbbec9d (patch)
treec6b25da4eda32a1ababea100e9bc4b17d2b83db1 /sdk
parent96ebcbd5cfa0859079a06de9013ecac3bfcd21a0 (diff)
downloadtoolchains-a7b434369f441a5adf6543bf6d8390e3bdbbec9d.tar.gz
toolchains-a7b434369f441a5adf6543bf6d8390e3bdbbec9d.tar.bz2
Refresh patches for OpenSSL 1.0.1m
Diffstat (limited to 'sdk')
-rw-r--r--sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p19
-rw-r--r--sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p4
-rw-r--r--sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p10
-rw-r--r--sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p16
-rw-r--r--sdk/recipes/patches/openssl/ppc-amigaos/no-term.p4
5 files changed, 26 insertions, 27 deletions
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p
index 3f3a4ec..25afe8f 100644
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p
@@ -1,16 +1,15 @@
--- apps.c 2014-10-15 13:53:39.000000000 +0100
+++ apps/apps.c 2015-01-05 21:02:13.650018727 +0000
-@@ -3009,9 +3009,11 @@ double app_tminterval(int stop,int usert
- struct rusage rus;
- struct timeval now;
- static struct timeval tmstart;
+@@ -2872,11 +2872,12 @@ double app_tminterval(int stop,int usert
+ struct rusage rus;
+ struct timeval now;
+ static struct timeval tmstart;
-
+#if !defined(OPENSSL_SYS_AMIGAOS3)
- if (usertime) getrusage(RUSAGE_SELF,&rus), now = rus.ru_utime;
-- else gettimeofday(&now,NULL);
-+ else
+ if (usertime)
+ getrusage(RUSAGE_SELF, &rus), now = rus.ru_utime;
+ else
+#endif
-+ gettimeofday(&now,NULL);
+ gettimeofday(&now, NULL);
- if (stop==TM_START) tmstart = now;
- else ret = ( (now.tv_sec+now.tv_usec*1e-6)
+ if (stop == TM_START)
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
index 337dc87..b83f0dd 100644
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
+++ b/sdk/recipes/patches/openssl/m68k-unknown-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)
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)