diff options
Diffstat (limited to 'sdk/recipes/patches/openssl')
38 files changed, 315 insertions, 252 deletions
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p index 3012ad2..26bb873 100644 --- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p +++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p @@ -1,16 +1,17 @@ --- /dev/null 2017-10-10 15:19:45.611896396 +0100 +++ Configurations/50-amigaos.conf 2017-10-17 15:42:25.304921197 +0100 -@@ -0,0 +1,31 @@ -+%targets = ( +@@ -0,0 +1,32 @@ ++my %targets = ( + + "ppc-amigaos" => { -+ inherit_from => [ "BASE_unix", asm("ppc32_asm") ], ++ inherit_from => [ "BASE_unix" ], + cc => "ppc-amigaos-gcc", + cflags => picker(default => "-DB_ENDIAN -DTERMIOS -DNO_SYS_UN_H -DNO_SYSLOG", + debug => "-O0 -g", + release => "-O3 -fomit-frame-pointer", -+ threads("-D_REENTRANT")), ++ threads("-D_REENTRANT")), + thread_scheme => "(unknown)", ++ asm_arch => "ppc32", + perlasm_scheme => "linux32", + sys_id => "AMIGAOS4", + bn_ops => "THIRTY_TWO_BIT BN_LLONG RC4_CHAR", @@ -23,7 +24,7 @@ + cflags => picker(default => "-DB_ENDIAN -DTERMIOS -DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=gnu99", + debug => "-O0 -g", + release => "-O3 -fomit-frame-pointer", -+ threads("-D_REENTRANT")), ++ threads("-D_REENTRANT")), + thread_scheme => "(unknown)", + ex_libs => add("-lm -lnet"), + sys_id => "AMIGAOS3", diff --git a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p index b5a55dd..d9c51be 100644 --- a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p +++ b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p @@ -1,7 +1,7 @@ --- /dev/null 2018-06-01 10:46:49.956110101 +0200 +++ Configurations/50-atari.conf 2018-06-03 03:10:55.000000000 +0200 @@ -0,0 +1,42 @@ -+%targets = ( ++my %targets = ( + "atari-common" => { + inherit_from => [ "BASE_unix" ], + template => 1, diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p index 128d400..c3f2fe5 100644 --- a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p +++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p @@ -1,7 +1,7 @@ --- /dev/null 2017-10-10 15:19:45.611896396 +0100 +++ Configurations/50-riscos.conf 2017-10-17 15:42:25.304921197 +0100 -@@ -0,0 +1,14 @@ -+%targets = ( +@@ -0,0 +1,26 @@ ++my %targets = ( + + "arm-unknown-riscos" => { + inherit_from => [ "BASE_unix" ], @@ -14,4 +14,16 @@ + sys_id => "RISCOS", + bn_ops => "BN_LLONG", + }, ++ ++ "arm-riscos-gnueabi" => { ++ inherit_from => [ "BASE_unix" ], ++ cc => "arm-riscos-gnueabi-gcc", ++ cflags => picker(default => "-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H", ++ debug => "-O0 -g", ++ release => "-O3 ", ++ threads("-D_REENTRANT")), ++ thread_scheme => "(unknown)", ++ sys_id => "RISCOS", ++ bn_ops => "BN_LLONG", ++ }, +); diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p index c492c01..fafa6cf 100644 --- a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p +++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p @@ -1,20 +1,21 @@ --- /dev/null 2017-10-10 15:19:45.611896396 +0100 +++ Configurations/50-windows.conf 2017-10-17 15:42:25.304921197 +0100 -@@ -0,0 +1,25 @@ -+%targets = ( +@@ -0,0 +1,26 @@ ++my %targets = ( + + "i686-w64-mingw32" => { -+ inherit_from => [ "BASE_unix", asm("x86_asm"), -+ sub { $disabled{shared} ? () : "x86_uplink" } ], ++ inherit_from => [ "BASE_unix", ++ sub { $disabled{shared} ? () : "x86_uplink" } ], + cc => "gcc", + cflags => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall", -+ debug => "-g -O0", ++ debug => "-g -O0", + release => "-O3 -fomit-frame-pointer"), + threads("-D_MT")), + sys_id => "MINGW32", + ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), + bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", + thread_scheme => "winthreads", ++ asm_arch => "x86", + perlasm_scheme => "coff", + dso_scheme => "win32", + shared_target => "mingw-shared", diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index c26e08b..aff7878 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,10 +1,11 @@ --- Configure.orig 2017-10-17 14:53:18.369801491 +0100 +++ Configure 2017-10-17 15:11:04.312242542 +0100 -@@ -946,6 +946,7 @@ - $target{exe_extension}=".exe" if ($config{target} eq "DJGPP" - || $config{target} =~ /^(?:Cygwin|mingw)/); +@@ -1329,6 +1329,8 @@ + $target{cxxflags}//=$target{cflags} if $target{CXX}; + $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"); $target{exe_extension}=".pm" if ($config{target} =~ /vos/); ++$target{exe_extension}=",e1f" if ($config{target} eq "arm-riscos-gnueabi"); +$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos"); - ($target{shared_extension_simple}=$target{shared_extension}) - =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\)||; + # Fill %config with values from %user, and in case those are undefined or + # empty, use values from %target (acting as a default). diff --git a/sdk/recipes/patches/openssl/apps.s_socket.c.p b/sdk/recipes/patches/openssl/apps.s_socket.c.p deleted file mode 100644 index f4c8e1c..0000000 --- a/sdk/recipes/patches/openssl/apps.s_socket.c.p +++ /dev/null @@ -1,18 +0,0 @@ ---- apps/s_socket.c.orig 2019-02-13 18:04:36.643334493 +0000 -+++ apps/s_socket.c 2019-02-13 18:04:46.271279170 +0000 -@@ -160,6 +160,7 @@ - sock_protocol = BIO_ADDRINFO_protocol(res); - sock_address = BIO_ADDRINFO_address(res); - next = BIO_ADDRINFO_next(res); -+#ifdef AF_INET6 - if (sock_family == AF_INET6) - sock_options |= BIO_SOCK_V6_ONLY; - if (next != NULL -@@ -174,6 +175,7 @@ - sock_options &= ~BIO_SOCK_V6_ONLY; - } - } -+#endif - - asock = BIO_socket(sock_family, sock_type, sock_protocol, 0); - if (asock == INVALID_SOCKET diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p b/sdk/recipes/patches/openssl/apps.speed.c.p index 88ae1c3..132d473 100644 --- a/sdk/recipes/patches/openssl/apps.speed.c.p +++ b/sdk/recipes/patches/openssl/apps.speed.c.p @@ -1,7 +1,7 @@ ---- apps/speed.c.orig 2017-11-22 08:07:53.851790744 +0000 -+++ apps/speed.c 2017-11-22 08:15:49.608768064 +0000 -@@ -111,6 +111,12 @@ - #endif +--- apps/speed.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/speed.c 2017-11-21 22:49:21.488219518 +0000 +@@ -62,6 +62,12 @@ + #include "./testdsa.h" #include <openssl/modes.h> + @@ -11,18 +11,24 @@ +#endif + #ifndef HAVE_FORK - # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) + # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS) # define HAVE_FORK 0 ---- apps/speed.c.orig 2017-11-22 08:33:02.137445746 +0000 -+++ apps/speed.c 2017-11-22 08:36:00.833790589 +0000 -@@ -345,8 +345,10 @@ - static double Time_F(int s) - { - double ret = app_tminterval(s, usertime); -+ #ifdef SIGALRM - if (s == STOP) - alarm(0); -+ #endif +@@ -186,6 +192,18 @@ + return ret; } ++#elif defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) ++static void alarm_aos(unsigned int secs) ++{ ++ (void) secs; ++} ++#define alarm alarm_aos ++ ++static double Time_F(int s) ++{ ++ double ret = app_tminterval(s, usertime); ++ return ret; ++} + #else + # error "SIGALRM not defined and the platform is not Windows" #endif diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p b/sdk/recipes/patches/openssl/aps.opt.c.p deleted file mode 100644 index 531cf76..0000000 --- a/sdk/recipes/patches/openssl/aps.opt.c.p +++ /dev/null @@ -1,14 +0,0 @@ ---- apps/opt.c.orig 2017-11-22 08:42:07.605882648 +0000 -+++ apps/opt.c 2017-11-22 08:48:31.712843519 +0000 -@@ -353,6 +353,11 @@ - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ - defined(INTMAX_MAX) && defined(UINTMAX_MAX) - -+#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) -+# define strtoimax strtol -+# define strtoumax strtoul -+#endif -+ - /* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */ - int opt_imax(const char *value, intmax_t *result) - { diff --git a/sdk/recipes/patches/openssl/crypto.arm_arch.h.p b/sdk/recipes/patches/openssl/crypto.arm_arch.h.p new file mode 100644 index 0000000..093e4de --- /dev/null +++ b/sdk/recipes/patches/openssl/crypto.arm_arch.h.p @@ -0,0 +1,11 @@ +--- crypto/arm_arch.h 2015-07-09 12:21:24.000000000 +0000 ++++ crypto/arm_arch.h 2015-11-13 13:47:02.386910047 +0000 +@@ -51,6 +51,8 @@ + # define __ARM_ARCH__ 5 + # elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) + # define __ARM_ARCH__ 4 ++# elif defined(__ARM_ARCH_3__) ++# define __ARM_ARCH__ 3 + # else + # error "unsupported ARM architecture" + # endif diff --git a/sdk/recipes/patches/openssl/bio_lcl.h.p b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p index feae76f..e811d8b 100644 --- a/sdk/recipes/patches/openssl/bio_lcl.h.p +++ b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p @@ -1,5 +1,5 @@ ---- crypto/bio/bio_lcl.h.orig 2017-10-17 16:19:36.908150231 +0100 -+++ crypto/bio/bio_lcl.h 2017-10-17 16:19:52.056631064 +0100 +--- crypto/bio/bio_local.h.orig 2017-10-17 16:19:36.908150231 +0100 ++++ crypto/bio/bio_local.h 2017-10-17 16:19:52.056631064 +0100 @@ -36,7 +36,7 @@ /* * Undefine AF_UNIX on systems that define it but don't support it. diff --git a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p deleted file mode 100644 index 271d571..0000000 --- a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p +++ /dev/null @@ -1,16 +0,0 @@ ---- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000 -+++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000 -@@ -25,7 +25,12 @@ - #include <string.h> - - /* e_os.h includes unistd.h, which defines _POSIX_VERSION */ --#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \ -+#if !defined(OPENSSL_NO_SECURE_MEMORY) \ -+ && !defined(OPENSSL_SYS_RISCOS) \ -+ && !defined(OPENSSL_SYS_AMIGAOS3) \ -+ && !defined(OPENSSL_SYS_AMIGAOS4) \ -+ && !defined(OPENSSL_SYS_MINT) \ -+ && defined(OPENSSL_SYS_UNIX) \ - && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ - || defined(__sun) || defined(__hpux) || defined(__sgi) \ - || defined(__osf__) ) diff --git a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p index a4513f2..366cd19 100644 --- a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p +++ b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p @@ -1,11 +1,12 @@ ---- crypto/rand/rand_unix.c.orig 2017-11-22 11:25:03.096636507 +0000 -+++ crypto/rand/rand_unix.c 2017-11-22 11:25:52.649406308 +0000 -@@ -15,7 +15,7 @@ - #include <openssl/rand.h> - #include "rand_lcl.h" +--- providers/implementations/rands/seeding/rand_unix.c.orig 2017-11-22 11:25:03.096636507 +0000 ++++ providers/implementations/rands/seeding/rand_unix.c 2017-11-22 11:25:52.649406308 +0000 +@@ -109,7 +109,8 @@ --#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)) -+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4)) + #if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) \ + || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) \ +- || defined(OPENSSL_SYS_UEFI)) ++ || defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) \ ++ || defined(OPENSSL_SYS_AMIGAOS4)) + + # if defined(OPENSSL_SYS_VOS) - # include <sys/types.h> - # include <sys/time.h> diff --git a/sdk/recipes/patches/openssl/e_os.h.p b/sdk/recipes/patches/openssl/e_os.h.p new file mode 100644 index 0000000..07ed97e --- /dev/null +++ b/sdk/recipes/patches/openssl/e_os.h.p @@ -0,0 +1,13 @@ +--- e_os.h.orig 2019-02-13 14:25:17.725058588 +0000 ++++ e_os.h 2019-02-13 14:35:39.790029062 +0000 +@@ -399,6 +399,10 @@ + # ifndef OPENSSL_NO_SECURE_MEMORY + /* unistd.h defines _POSIX_VERSION */ + # if (defined(OPENSSL_SYS_UNIX) \ ++ && !defined(OPENSSL_SYS_RISCOS) \ ++ && !defined(OPENSSL_SYS_AMIGAOS3) \ ++ && !defined(OPENSSL_SYS_AMIGAOS4) \ ++ && !defined(OPENSSL_SYS_MINT) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) )) \ diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/apps.lib.s_socket.c.p b/sdk/recipes/patches/openssl/m5475-atari-mint/apps.lib.s_socket.c.p new file mode 100644 index 0000000..d659de7 --- /dev/null +++ b/sdk/recipes/patches/openssl/m5475-atari-mint/apps.lib.s_socket.c.p @@ -0,0 +1,12 @@ +--- apps/lib/s_socket.c.orig 2018-06-03 03:19:29.000000000 +0200 ++++ apps/lib/s_socket.c 2018-06-03 03:19:36.000000000 +0200 +@@ -179,7 +179,9 @@ + BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " : + #endif + BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " : ++#ifdef AF_UNIX + BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "", ++#endif + bindhost != NULL ? bindhost : "", + bindport != NULL ? ":" : "", + bindport != NULL ? bindport : ""); diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p b/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p deleted file mode 100644 index ede1edc..0000000 --- a/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p +++ /dev/null @@ -1,18 +0,0 @@ ---- e_os.h.orig 2018-06-03 03:19:29.000000000 +0200 -+++ e_os.h 2018-06-03 03:19:36.000000000 +0200 -@@ -462,6 +462,15 @@ - # define OPENSSL_USE_IPV6 0 - # endif - # endif -+/* -+ * We mean it -+ */ -+# if (OPENSSL_USE_IPV6 == 0) -+# undef AF_INET6 -+# warning undef AF_INET6 -+# undef AF_UNIX -+# warning undef AF_UNIX -+# endif - - # endif - diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/include.internal.sockets.h.p b/sdk/recipes/patches/openssl/m5475-atari-mint/include.internal.sockets.h.p new file mode 100644 index 0000000..5ad3a7b --- /dev/null +++ b/sdk/recipes/patches/openssl/m5475-atari-mint/include.internal.sockets.h.p @@ -0,0 +1,19 @@ +--- include/internal/sockets.h.orig 2018-06-03 03:19:29.000000000 +0200 ++++ include/internal/sockets.h 2018-06-03 03:19:36.000000000 +0200 +@@ -124,6 +124,16 @@ + # define OPENSSL_USE_IPV6 0 + # endif + # endif ++/* ++ * We mean it ++ */ ++# if (OPENSSL_USE_IPV6 == 0) ++# undef AF_INET6 ++# warning undef AF_INET6 ++# undef AF_UNIX ++# warning undef AF_UNIX ++# undef IPV6_V6ONLY ++# endif + + # define get_last_socket_error() errno + # define clear_socket_error() errno=0 diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p new file mode 100644 index 0000000..d659de7 --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p @@ -0,0 +1,12 @@ +--- apps/lib/s_socket.c.orig 2018-06-03 03:19:29.000000000 +0200 ++++ apps/lib/s_socket.c 2018-06-03 03:19:36.000000000 +0200 +@@ -179,7 +179,9 @@ + BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " : + #endif + BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " : ++#ifdef AF_UNIX + BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "", ++#endif + bindhost != NULL ? bindhost : "", + bindport != NULL ? ":" : "", + bindport != NULL ? bindport : ""); diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p b/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p deleted file mode 100644 index ede1edc..0000000 --- a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p +++ /dev/null @@ -1,18 +0,0 @@ ---- e_os.h.orig 2018-06-03 03:19:29.000000000 +0200 -+++ e_os.h 2018-06-03 03:19:36.000000000 +0200 -@@ -462,6 +462,15 @@ - # define OPENSSL_USE_IPV6 0 - # endif - # endif -+/* -+ * We mean it -+ */ -+# if (OPENSSL_USE_IPV6 == 0) -+# undef AF_INET6 -+# warning undef AF_INET6 -+# undef AF_UNIX -+# warning undef AF_UNIX -+# endif - - # endif - diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p new file mode 100644 index 0000000..5ad3a7b --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p @@ -0,0 +1,19 @@ +--- include/internal/sockets.h.orig 2018-06-03 03:19:29.000000000 +0200 ++++ include/internal/sockets.h 2018-06-03 03:19:36.000000000 +0200 +@@ -124,6 +124,16 @@ + # define OPENSSL_USE_IPV6 0 + # endif + # endif ++/* ++ * We mean it ++ */ ++# if (OPENSSL_USE_IPV6 == 0) ++# undef AF_INET6 ++# warning undef AF_INET6 ++# undef AF_UNIX ++# warning undef AF_UNIX ++# undef IPV6_V6ONLY ++# endif + + # define get_last_socket_error() errno + # define clear_socket_error() errno=0 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 947eeca..1e677d2 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,10 +2872,11 @@ double app_tminterval(int stop, int user +--- apps/lib/apps.c.orig 2014-10-15 13:53:39.000000000 +0100 ++++ apps/lib/apps.c 2015-01-05 21:02:13.650018727 +0000 +@@ -2797,10 +2797,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/apps.include.http_server.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p new file mode 100644 index 0000000..8d9684e --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p @@ -0,0 +1,11 @@ +--- apps/include/http_server.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/include/http_server.h 2017-11-21 22:49:21.488219518 +0000 +@@ -27,7 +27,7 @@ + # endif + + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ +- && !defined(OPENSSL_NO_POSIX_IO) ++ && !defined(OPENSSL_NO_POSIX_IO) && !defined(NO_SYSLOG) + # define HTTP_DAEMON + # include <sys/types.h> + # include <sys/wait.h> diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p index 4f6fa4b..93db04c 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p @@ -1,14 +1,14 @@ ---- crypto/bio/b_sock2.c.orig 2019-02-15 10:07:24.181612545 +0000 -+++ crypto/bio/b_sock2.c 2019-02-15 10:07:15.637654488 +0000 -@@ -94,6 +94,7 @@ +--- crypto/bio/bio_sock2.c.orig 2019-02-15 10:07:24.181612545 +0000 ++++ crypto/bio/bio_sock2.c 2019-02-15 10:07:15.637654488 +0000 +@@ -98,6 +98,7 @@ } } +#if defined(TCP_NODELAY) if (options & BIO_SOCK_NODELAY) { - if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); -@@ -101,6 +102,7 @@ + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + (const void *)&on, sizeof(on)) != 0) { +@@ -107,6 +108,7 @@ return 0; } } @@ -16,19 +16,19 @@ if (connect(sock, BIO_ADDR_sockaddr(addr), BIO_ADDR_sockaddr_size(addr)) == -1) { -@@ -193,6 +195,7 @@ +@@ -252,6 +254,7 @@ } } +#if defined(TCP_NODELAY) if (options & BIO_SOCK_NODELAY) { - if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); -@@ -200,6 +203,7 @@ + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + (const void *)&on, sizeof(on)) != 0) { +@@ -261,6 +264,7 @@ return 0; } } +#endif - # ifdef IPV6_V6ONLY - if (BIO_ADDR_family(addr) == AF_INET6) { + /* On OpenBSD it is always ipv6 only with ipv6 sockets thus read-only */ + # if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p index 0d5492f..3fa3a53 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p @@ -1,6 +1,6 @@ --- crypto/bn/bn_div.c 2017-01-26 13:22:03.000000000 +0000 +++ crypto/bn/bn_div.c 2017-02-11 16:06:29.437010335 +0000 -@@ -175,6 +175,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, cons +@@ -194,6 +194,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, cons q; \ }) # define REMAINDER_IS_ALREADY_CALCULATED diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p deleted file mode 100644 index 7447d54..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p +++ /dev/null @@ -1,36 +0,0 @@ ---- crypto/include/internal/md32_common.h 2017-11-02 14:29:03.000000000 +0000 -+++ crypto/include/internal/md32_common.h 2018-07-23 20:12:11.228066913 +0100 -@@ -182,6 +182,9 @@ - # define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, (l)) - # endif - # endif -+# elif defined(__mc68020) -+# define HOST_c2l(c,l) ({ asm volatile ("movel %0@+,%1" : "=a"(c), "=d"(l) : "0"(c)); }) -+# define HOST_l2c(l,c) ({ asm volatile ("movel %1,%0@+" : "=a"(c) : "d"(l), "0"(c)); }) - # endif - # endif - # if defined(__s390__) || defined(__s390x__) -@@ -215,6 +218,22 @@ - # define HOST_l2c(l,c) ({ asm ("strv %1,%0" \ - :"=m"(*(unsigned int *)(c)) :"d"(l));\ - (c)+=4; (l); }) -+# elif defined(__mc68020) -+# define HOST_c2l(c,l) ({ unsigned int r; \ -+ asm volatile ("movel %1@+,%0\n" \ -+ "rorw #8,%0\n" \ -+ "swap %0\n" \ -+ "rorw #8,%0\n" \ -+ : "=d"(r), "=a"(c) \ -+ : "1"(c)); \ -+ (l)=r; }) -+# define HOST_l2c(l,c) ({ unsigned int r=(l); \ -+ asm volatile ("rorw #8,%0\n" \ -+ "swap %0\n" \ -+ "rorw #8,%0\n" \ -+ "movel %0,%1@+\n" \ -+ : "=d"(r), "=a"(c) \ -+ : "0"(r), "1"(c)); }) - # endif - # endif - # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) - diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p deleted file mode 100644 index 58b672f..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p index 0448499..3407a48 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p @@ -1,21 +1,21 @@ --- crypto/ui/ui_openssl.c.orig 2017-11-23 13:22:15.760078583 +0000 +++ crypto/ui/ui_openssl.c 2017-11-23 13:21:40.534382076 +0000 -@@ -99,6 +99,18 @@ +@@ -103,6 +103,18 @@ + # undef SGTTY + # endif - #endif - -+#if defined(OPENSSL_SYS_AMIGAOS3) -+#undef TERMIOS -+#undef TERMIO -+#undef SGTTY ++# if defined(OPENSSL_SYS_AMIGAOS3) ++# undef TERMIOS ++# undef TERMIO ++# undef SGTTY +struct termios { int foo; }; -+# define TTY_STRUCT struct termios -+# define TTY_FLAGS foo -+# define TTY_get(tty,data) /* tcgetattr(tty,data) */ -1 -+# define TTY_set(tty,data) /* tcsetattr(tty,TCSANOW,data) */ 0 -+# define ECHO 0 -+#endif ++# define TTY_STRUCT struct termios ++# define TTY_FLAGS foo ++# define TTY_get(tty,data) /* tcgetattr(tty,data) */ -1 ++# define TTY_set(tty,data) /* tcsetattr(tty,TCSANOW,data) */ 0 ++# define ECHO 0 ++# endif + - #ifdef TERMIOS - # include <termios.h> - # define TTY_STRUCT struct termios + # ifdef TERMIOS + # include <termios.h> + # define TTY_STRUCT struct termios diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p deleted file mode 100644 index 6ea1ec8..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p new file mode 100644 index 0000000..c887eff --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p @@ -0,0 +1,12 @@ +--- providers/implementations/rands/seeding/build.info.orig 2017-11-21 22:49:00.185608040 +0000 ++++ providers/implementations/rands/seeding/build.info 2017-11-21 22:49:21.488219518 +0000 +@@ -5,6 +5,9 @@ + IF[{- $config{target} =~ /vms/i -}] + $COMMON=$COMMON rand_vms.c + ENDIF ++IF[{- $config{target} =~ /amiga/i -}] ++ $COMMON=$COMMON rand_amiga.c ++ENDIF + + SOURCE[../../../libdefault.a]=$COMMON + diff --git a/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p b/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p new file mode 100644 index 0000000..27f6a9d --- /dev/null +++ b/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p @@ -0,0 +1,22 @@ +--- apps/lib/opt.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ apps/lib/opt.c 2017-10-17 15:42:25.304921197 +0100 +@@ -562,7 +562,7 @@ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ + defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \ +- !defined(OPENSSL_NO_INTTYPES_H) ++ !defined(OPENSSL_NO_INTTYPES_H) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + + /* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */ + int opt_intmax(const char *value, ossl_intmax_t *result) +--- test/params_conversion_test.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ test/params_conversion_test.c 2017-10-17 15:42:25.304921197 +0100 +@@ -15,7 +15,7 @@ + /* On machines that dont support <inttypes.h> just disable the tests */ + #if !defined(OPENSSL_NO_INTTYPES_H) + +-# ifdef OPENSSL_SYS_VMS ++# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) + # define strtoumax strtoull + # define strtoimax strtoll + # endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p new file mode 100644 index 0000000..8d9684e --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p @@ -0,0 +1,11 @@ +--- apps/include/http_server.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/include/http_server.h 2017-11-21 22:49:21.488219518 +0000 +@@ -27,7 +27,7 @@ + # endif + + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ +- && !defined(OPENSSL_NO_POSIX_IO) ++ && !defined(OPENSSL_NO_POSIX_IO) && !defined(NO_SYSLOG) + # define HTTP_DAEMON + # include <sys/types.h> + # include <sys/wait.h> diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/atomics-are-broken.p b/sdk/recipes/patches/openssl/ppc-amigaos/atomics-are-broken.p new file mode 100644 index 0000000..c6abf48 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/atomics-are-broken.p @@ -0,0 +1,22 @@ +--- include/internal/tsan_assist.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ include/internal/tsan_assist.h 2017-11-21 22:49:21.488219518 +0000 +@@ -48,7 +48,7 @@ + */ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \ +- && !defined(__STDC_NO_ATOMICS__) ++ && !defined(__STDC_NO_ATOMICS__) && !defined(__AMIGA__) + # include <stdatomic.h> + + # if defined(ATOMIC_POINTER_LOCK_FREE) \ +--- include/internal/refcount.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ include/internal/refcount.h 2017-11-21 22:49:21.488219518 +0000 +@@ -15,7 +15,7 @@ + + # if defined(OPENSSL_THREADS) && !defined(OPENSSL_DEV_NO_ATOMICS) + # if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \ +- && !defined(__STDC_NO_ATOMICS__) ++ && !defined(__STDC_NO_ATOMICS__) && !defined(__AMIGA__) + # include <stdatomic.h> + # define HAVE_C11_ATOMICS + # endif 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 index dd10e8c..ac14e86 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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 @@ +--- crypto/bio/bio_addr.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ crypto/bio/bio_addr.c 2017-11-21 22:49:21.488219518 +0000 +@@ -910,7 +910,7 @@ addrlistp++) ; diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p index 56949ca..46d6213 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p @@ -1,15 +1,15 @@ --- 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 +@@ -34,6 +34,8 @@ + + static sigset_t all_masked; +#ifndef OPENSSL_SYS_AMIGAOS4 + static sigjmp_buf ill_jmp; static void ill_handler(int sig) { -@@ -341,3 +343,24 @@ +@@ -309,3 +311,29 @@ sigaction(SIGILL, &ill_oact, NULL); sigprocmask(SIG_SETMASK, &oset, NULL); } @@ -33,4 +33,9 @@ + OPENSSL_ppccap_P |= PPC_ALTIVEC; + } +} ++ ++uint32_t OPENSSL_rdtsc(void) ++{ ++ return 0; ++} +#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 deleted file mode 100644 index 58b672f..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 deleted file mode 100644 index 6ea1ec8..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/providers.implementations.rands.seeding.build.info.p b/sdk/recipes/patches/openssl/ppc-amigaos/providers.implementations.rands.seeding.build.info.p new file mode 100644 index 0000000..c887eff --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/providers.implementations.rands.seeding.build.info.p @@ -0,0 +1,12 @@ +--- providers/implementations/rands/seeding/build.info.orig 2017-11-21 22:49:00.185608040 +0000 ++++ providers/implementations/rands/seeding/build.info 2017-11-21 22:49:21.488219518 +0000 +@@ -5,6 +5,9 @@ + IF[{- $config{target} =~ /vms/i -}] + $COMMON=$COMMON rand_vms.c + ENDIF ++IF[{- $config{target} =~ /amiga/i -}] ++ $COMMON=$COMMON rand_amiga.c ++ENDIF + + SOURCE[../../../libdefault.a]=$COMMON + diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p index a5fa68a..969062b 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p @@ -1,14 +1,14 @@ --- test/rsa_complex.c.orig 2019-02-14 10:16:06.665734720 +0000 +++ test/rsa_complex.c 2019-02-14 10:16:18.581682332 +0000 -@@ -12,11 +12,6 @@ - * The former defines "I" as a macro and earlier versions of the latter use - * for function arguments. +@@ -16,11 +16,6 @@ */ --#if defined(__STDC_VERSION__) --# if __STDC_VERSION__ >= 199901L --# include <complex.h> + + #if !defined(__DJGPP__) +-# if defined(__STDC_VERSION__) +-# if __STDC_VERSION__ >= 199901L +-# include <complex.h> +-# endif -# endif --#endif - #include <openssl/rsa.h> + # include <openssl/rsa.h> + #endif #include <stdlib.h> - diff --git a/sdk/recipes/patches/openssl/test.drbgtest.c.p b/sdk/recipes/patches/openssl/test.drbgtest.c.p new file mode 100644 index 0000000..ecf3e81 --- /dev/null +++ b/sdk/recipes/patches/openssl/test.drbgtest.c.p @@ -0,0 +1,20 @@ +--- test/drbgtest.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ test/drbgtest.c 2017-10-17 15:42:25.304921197 +0100 +@@ -277,7 +277,7 @@ + } + + +-#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) ++#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + /* number of children to fork */ + #define DRBG_FORK_COUNT 9 + /* two results per child, two for the parent */ +@@ -895,7 +895,7 @@ + int setup_tests(void) + { + ADD_TEST(test_rand_reseed); +-#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) ++#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + ADD_ALL_TESTS(test_rand_fork_safety, RANDOM_SIZE); + #endif + ADD_TEST(test_rand_prediction_resistance); |