From a03b3225192dbb9836ea8088cd77161d64254e8e Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Thu, 19 Mar 2015 18:56:47 +0000 Subject: Fix up context in OpenSSL patches --- sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p | 2 +- sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p | 6 +++--- sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p | 2 +- sdk/recipes/patches/openssl/ppc-amigaos/no-term.p | 6 +++--- 4 files changed, 8 insertions(+), 8 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 25afe8f..947eeca 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,6 +1,6 @@ --- apps.c 2014-10-15 13:53:39.000000000 +0100 +++ apps/apps.c 2015-01-05 21:02:13.650018727 +0000 -@@ -2872,11 +2872,12 @@ double app_tminterval(int stop,int usert +@@ -2872,10 +2872,11 @@ double app_tminterval(int stop, int user struct rusage rus; struct timeval now; static struct timeval tmstart; 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 b83f0dd..890cef3 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p @@ -1,7 +1,7 @@ --- crypto/ui/ui_openssl.c.orig 2011-03-08 22:37:51.000000000 +0000 +++ crypto/ui/ui_openssl.c 2011-03-08 22:39:00.000000000 +0000 -@@ -220,6 +220,12 @@ - #undef SGTTY +@@ -218,6 +218,12 @@ + #endif +#if defined(OPENSSL_SYS_AMIGAOS3) @@ -13,7 +13,7 @@ #ifdef TERMIOS # include # define TTY_STRUCT struct termios -@@ -268,7 +274,7 @@ +@@ -266,7 +272,7 @@ typedef int sig_atomic_t; #endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p index 3f5bf17..1a287b1 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p @@ -10,4 +10,4 @@ + # undef BUFSIZE # define BUFSIZE ((long)1024*8+1) - static volatile int run=0; + 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 24bdb86..d8d4d1c 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p @@ -1,7 +1,7 @@ --- crypto/ui/ui_openssl.c.orig 2011-03-08 22:37:51.000000000 +0000 +++ crypto/ui/ui_openssl.c 2011-03-08 22:39:00.000000000 +0000 -@@ -220,6 +220,12 @@ - #undef SGTTY +@@ -218,6 +218,12 @@ + #endif +#if defined(OPENSSL_SYS_AMIGAOS4) @@ -13,7 +13,7 @@ #ifdef TERMIOS # include # define TTY_STRUCT struct termios -@@ -268,7 +274,7 @@ +@@ -266,7 +272,7 @@ typedef int sig_atomic_t; #endif -- cgit v1.2.3