summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p2
-rw-r--r--sdk/recipes/patches/openssl/Configurations-50-atari.conf.p2
-rw-r--r--sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p2
-rw-r--r--sdk/recipes/patches/openssl/Configurations-50-windows.conf.p2
-rw-r--r--sdk/recipes/patches/openssl/Configure.p4
-rw-r--r--sdk/recipes/patches/openssl/apps.s_socket.c.p6
-rw-r--r--sdk/recipes/patches/openssl/apps.speed.c.p10
-rw-r--r--sdk/recipes/patches/openssl/aps.opt.c.p2
-rw-r--r--sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p (renamed from sdk/recipes/patches/openssl/bio_lcl.h.p)6
-rw-r--r--sdk/recipes/patches/openssl/crypto.mem_sec.c.p16
-rw-r--r--sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p15
-rw-r--r--sdk/recipes/patches/openssl/e_os.h.p16
12 files changed, 41 insertions, 42 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..53b266e 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -1,7 +1,7 @@
--- /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 = (
++my %targets = (
+
+ "ppc-amigaos" => {
+ inherit_from => [ "BASE_unix", asm("ppc32_asm") ],
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..c05a4ad 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 = (
++my %targets = (
+
+ "arm-unknown-riscos" => {
+ inherit_from => [ "BASE_unix" ],
diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
index c492c01..6a15f5d 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
@@ -1,7 +1,7 @@
--- /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 = (
++my %targets = (
+
+ "i686-w64-mingw32" => {
+ inherit_from => [ "BASE_unix", asm("x86_asm"),
diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p
index c26e08b..5a21528 100644
--- a/sdk/recipes/patches/openssl/Configure.p
+++ b/sdk/recipes/patches/openssl/Configure.p
@@ -1,10 +1,10 @@
--- Configure.orig 2017-10-17 14:53:18.369801491 +0100
+++ Configure 2017-10-17 15:11:04.312242542 +0100
-@@ -946,6 +946,7 @@
+@@ -1143,6 +1143,7 @@
$target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
|| $config{target} =~ /^(?:Cygwin|mingw)/);
$target{exe_extension}=".pm" if ($config{target} =~ /vos/);
+$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos");
($target{shared_extension_simple}=$target{shared_extension})
- =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\)||;
+ =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
diff --git a/sdk/recipes/patches/openssl/apps.s_socket.c.p b/sdk/recipes/patches/openssl/apps.s_socket.c.p
index f4c8e1c..cc6f582 100644
--- a/sdk/recipes/patches/openssl/apps.s_socket.c.p
+++ b/sdk/recipes/patches/openssl/apps.s_socket.c.p
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -239,6 +239,7 @@
sock_protocol = BIO_ADDRINFO_protocol(res);
sock_address = BIO_ADDRINFO_address(res);
next = BIO_ADDRINFO_next(res);
@@ -8,11 +8,11 @@
if (sock_family == AF_INET6)
sock_options |= BIO_SOCK_V6_ONLY;
if (next != NULL
-@@ -174,6 +175,7 @@
+@@ -257,6 +258,7 @@
sock_options &= ~BIO_SOCK_V6_ONLY;
}
}
+#endif
asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);
- if (asock == INVALID_SOCKET
+ if (asock == INVALID_SOCKET && sock_family_fallback != AF_UNSPEC) {
diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p b/sdk/recipes/patches/openssl/apps.speed.c.p
index 88ae1c3..20d455e 100644
--- a/sdk/recipes/patches/openssl/apps.speed.c.p
+++ b/sdk/recipes/patches/openssl/apps.speed.c.p
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -99,6 +99,12 @@
#endif
#include <openssl/modes.h>
@@ -11,11 +11,9 @@
+#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 @@
+@@ -220,8 +226,10 @@
static double Time_F(int s)
{
double ret = app_tminterval(s, usertime);
@@ -25,4 +23,4 @@
+ #endif
return ret;
}
- #endif
+
diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p b/sdk/recipes/patches/openssl/aps.opt.c.p
index 531cf76..7c6bab2 100644
--- a/sdk/recipes/patches/openssl/aps.opt.c.p
+++ b/sdk/recipes/patches/openssl/aps.opt.c.p
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -374,6 +374,11 @@
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
defined(INTMAX_MAX) && defined(UINTMAX_MAX)
diff --git a/sdk/recipes/patches/openssl/bio_lcl.h.p b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
index feae76f..6caa72f 100644
--- a/sdk/recipes/patches/openssl/bio_lcl.h.p
+++ b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
@@ -1,6 +1,6 @@
---- 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
-@@ -36,7 +36,7 @@
+--- 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
+@@ -37,7 +37,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..b517fd8 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"
+@@ -122,7 +122,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..6c91409
--- /dev/null
+++ b/sdk/recipes/patches/openssl/e_os.h.p
@@ -0,0 +1,16 @@
+--- e_os.h.orig 2019-02-13 14:25:17.725058588 +0000
++++ e_os.h 2019-02-13 14:35:39.790029062 +0000
+@@ -350,7 +350,12 @@
+ # endif
+
+ /* unistd.h 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__) )
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 05:15:42 +0000