diff options
Diffstat (limited to 'sdk/recipes/patches/openssl/ppc-amigaos')
7 files changed, 67 insertions, 59 deletions
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p new file mode 100644 index 0000000..dd10e8c --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p @@ -0,0 +1,11 @@ +--- crypto/bio/b_addr.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ crypto/bio/b_addr.c 2017-11-21 22:49:21.488219518 +0000 +@@ -854,7 +854,7 @@ + addrlistp++) + ; + +- for(addresses = addrlistp - he->h_addr_list; ++ for(addresses = addrlistp - (char **)he->h_addr_list; + addrlistp--, addresses-- > 0; ) { + if (!addrinfo_wrap(he->h_addrtype, socktype, + *addrlistp, he->h_length, diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p new file mode 100644 index 0000000..56949ca --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p @@ -0,0 +1,36 @@ +--- crypto/ppccap.c.orig 2017-11-22 13:14:44.655536374 +0000 ++++ crypto/ppccap.c 2017-11-22 13:16:03.666387174 +0000 +@@ -135,6 +135,8 @@ + } + #endif + ++#ifndef OPENSSL_SYS_AMIGAOS4 ++ + static sigjmp_buf ill_jmp; + static void ill_handler(int sig) + { +@@ -341,3 +343,24 @@ + sigaction(SIGILL, &ill_oact, NULL); + sigprocmask(SIG_SETMASK, &oset, NULL); + } ++ ++#else ++#include <proto/exec.h> ++void OPENSSL_cpuid_setup(void) ++{ ++ uint32 family, vec; ++ ++ IExec->GetCPUInfoTags(GCIT_Family, &family, GCIT_VectorUnit, &vec, TAG_DONE); ++ ++ OPENSSL_ppccap_P = PPC_FPU; ++ ++ if((family == CPUFAMILY_PA6T) || (family == CPUFAMILY_E5500)) ++ OPENSSL_ppccap_P |= PPC_FPU64; ++ ++ if((vec == VECTORTYPE_ALTIVEC) && ++ (LIB_IS_AT_LEAST(SysBase, 51, 12))) ++ { ++ OPENSSL_ppccap_P |= PPC_ALTIVEC; ++ } ++} ++#endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p new file mode 100644 index 0000000..58b672f --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p @@ -0,0 +1,9 @@ +--- crypto/rand/build.info.orig 2017-11-22 11:36:06.585363219 +0000 ++++ crypto/rand/build.info 2017-11-22 11:36:39.267232034 +0000 +@@ -1,4 +1,4 @@ + LIBS=../../libcrypto + SOURCE[../../libcrypto]=\ +- md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ +- rand_win.c rand_unix.c rand_vms.c ++ md_rand.c randfile.c rand_lib.c rand_err.c rand_amiga.c \ ++ rand_egd.c rand_win.c rand_unix.c rand_vms.c diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p new file mode 100644 index 0000000..6ea1ec8 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p @@ -0,0 +1,11 @@ +--- include/openssl/e_os2.h.orig 2017-11-21 23:09:39.684814614 +0000 ++++ include/openssl/e_os2.h 2017-11-21 23:10:32.501369938 +0000 +@@ -223,6 +223,8 @@ + # define OSSL_SSIZE_MAX SSIZE_MAX + # elif defined(_POSIX_SSIZE_MAX) + # define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX ++# else ++# define OSSL_SSIZE_MAX INT_MAX + # endif + # endif + diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p deleted file mode 100644 index 4da5a6d..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 -@@ -58,7 +58,7 @@ - #include <openssl/bio.h> - - #if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) --# 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 deleted file mode 100644 index 1a287b1..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p +++ /dev/null @@ -1,13 +0,0 @@ ---- apps/speed.c.orig 2011-03-08 22:44:56.000000000 +0000 -+++ apps/speed.c 2011-03-08 22:48:10.000000000 +0000 -@@ -225,6 +225,10 @@ - # define NO_FORK - # endif - -+# ifdef OPENSSL_SYS_AMIGAOS4 -+# undef SIGALRM -+# endif -+ - # 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 deleted file mode 100644 index d8d4d1c..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 -@@ -218,6 +218,12 @@ - - #endif - -+#if defined(OPENSSL_SYS_AMIGAOS4) -+#undef TERMIOS -+#undef TERMIO -+#undef SGTTY -+#endif -+ - #ifdef TERMIOS - # include <termios.h> - # define TTY_STRUCT struct termios -@@ -266,7 +272,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. |