diff options
Diffstat (limited to 'sdk/recipes/patches/openssl')
-rw-r--r-- | sdk/recipes/patches/openssl/Configure.p | 5 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p | 33 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p | 13 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/no-term.p | 24 |
4 files changed, 73 insertions, 2 deletions
diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index 156a589..e2fad67 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,16 +1,17 @@ --- Configure.old 2010-12-29 02:43:14.000000000 +0000 +++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -412,6 +412,9 @@ +@@ -412,6 +412,10 @@ "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", +"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::echo", +"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-unknown-amigaos-ranlib", ++"ppc-amigaos","ppc-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS4 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::ppc-amigaos-ranlib", + #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. -@@ -1039,6 +1042,7 @@ +@@ -1039,6 +1043,7 @@ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p new file mode 100644 index 0000000..38232d1 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p @@ -0,0 +1,33 @@ +--- crypto/asn1/bio_ndef.c.orig 2011-03-08 22:18:51.000000000 +0000 ++++ crypto/asn1/bio_ndef.c 2011-03-08 22:19:03.000000000 +0000 +@@ -58,7 +58,7 @@ + #include <openssl/err.h> + + #ifndef OPENSSL_SYSNAME_NETWARE +-#include <memory.h> ++#include <string.h> + #endif + #include <stdio.h> + +--- 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> + #include <openssl/err.h> +-#include <memory.h> ++#include <string.h> + + /* + * 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 @@ + #include <openssl/bio.h> + + #ifndef OPENSSL_SYSNAME_NETWARE +-#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 new file mode 100644 index 0000000..1b7fa9e --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p @@ -0,0 +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 +@@ -198,6 +198,10 @@ + #define NO_FORK + #endif + ++#ifdef OPENSSL_SYS_AMIGAOS4 ++#undef SIGALRM ++#endif ++ + #undef BUFSIZE + #define BUFSIZE ((long)1024*8+1) + 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 new file mode 100644 index 0000000..097bbb4 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p @@ -0,0 +1,24 @@ +--- 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 +@@ -214,6 +214,12 @@ + #undef SGTTY + #endif + ++#if defined(OPENSSL_SYS_AMIGAOS4) ++#undef TERMIOS ++#undef TERMIO ++#undef SGTTY ++#endif ++ + #ifdef TERMIOS + # include <termios.h> + # define TTY_STRUCT struct termios +@@ -262,7 +268,7 @@ + typedef int sig_atomic_t; + #endif + +-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) ++#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_AMIGAOS4) + /* + * This one needs work. As a matter of fact the code is unoperational + * and this is only a trick to get it compiled. |