Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/2c28cd73e55b80b358ec008d07ff0cae310e96d6
...commit
http://git.netsurf-browser.org/toolchains.git/commit/2c28cd73e55b80b358ec008d07ff0cae310e96d6
...tree
http://git.netsurf-browser.org/toolchains.git/tree/2c28cd73e55b80b358ec008d07ff0cae310e96d6
The branch, jmb/openssl3 has been created
at 2c28cd73e55b80b358ec008d07ff0cae310e96d6 (commit)
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=2c28cd73e55b80b358ec008d07ff0cae310e96d6
commit 2c28cd73e55b80b358ec008d07ff0cae310e96d6
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
OpenSSL: make it tolerate ARMv3
We still build for ARMv3 by default, but we also do not build any
of the optimised assembler implementations. Thus, we can do the
bare minimum here and teach the header file what ARMv3 is without
updating any of the implementations to cope.
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
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=2549a2d898f96e636f6052f2017824ec42186da3
commit 2549a2d898f96e636f6052f2017824ec42186da3
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: UnixLib doesn't support locale_t
Not entirely true -- it gained support for that in 2019. However,
the release our toolchain uses significantly predates that. Patch
around it until someone has time to do something about it.
diff --git a/sdk/recipes/patches/openssl/crypto.ctype.c.p
b/sdk/recipes/patches/openssl/crypto.ctype.c.p
new file mode 100644
index 0000000..e0ecc21
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.ctype.c.p
@@ -0,0 +1,11 @@
+--- crypto/ctype.c.orig 2022-05-27 00:00:00.000000000 +0000
+--- crypto/ctype.c 2022-05-27 00:00:00.000000000 +0000
+@@ -295,7 +295,7 @@
+ /* str[n]casecmp_l is defined in POSIX 2008-01. Value is taken accordingly
+ *
https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html */
+
+-#if (defined OPENSSL_SYS_WINDOWS) || (defined(_POSIX_C_SOURCE) &&
_POSIX_C_SOURCE >= 200809L)
++#if (defined OPENSSL_SYS_WINDOWS) || (defined(_POSIX_C_SOURCE) &&
_POSIX_C_SOURCE >= 200809L && !defined(OPENSSL_SYS_RISCOS))
+
+ # if defined OPENSSL_SYS_WINDOWS
+ # define locale_t _locale_t
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=5aa9b885910ff71cd07040f3ba2f973a4ec96723
commit 5aa9b885910ff71cd07040f3ba2f973a4ec96723
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Upgrade to OpenSSL 3
diff --git a/sdk/Makefile b/sdk/Makefile
index b638f1c..a00c029 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -30,7 +30,7 @@ VERSION_LIBICONV := 1.17
# https://laurikari.net/tre/
VERSION_LIBTRE := 0.8.0
# https://www.openssl.org/
-VERSION_OPENSSL := 1.1.1o
+VERSION_OPENSSL := 3.0.3
# http://www.libpng.org/pub/png/libpng.html
VERSION_LIBPNG := 1.6.37
# http://libjpeg.sourceforge.net/
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 53b266e..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 @@
+@@ -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-windows.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
index 6a15f5d..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 @@
+@@ -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 5a21528..6b1a39e 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
-@@ -1143,6 +1143,7 @@
- $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
- || $config{target} =~ /^(?:Cygwin|mingw)/);
+@@ -1329,6 +1329,7 @@
+ $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-unknown-riscos");
- ($target{shared_extension_simple}=$target{shared_extension})
- =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
+ # 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 cc6f582..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
-@@ -239,6 +239,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
-@@ -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 && 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 20d455e..1ccac30 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
-@@ -99,6 +99,12 @@
- #endif
+@@ -62,6 +62,12 @@
+ #include "./testdsa.h"
#include <openssl/modes.h>
+
@@ -13,7 +13,7 @@
#ifndef HAVE_FORK
# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) ||
defined(OPENSSL_SYS_VXWORKS)
# define HAVE_FORK 0
-@@ -220,8 +226,10 @@
+@@ -134,8 +240,10 @@
static double Time_F(int s)
{
double ret = app_tminterval(s, usertime);
diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p
b/sdk/recipes/patches/openssl/aps.opt.c.p
index 7c6bab2..2ba3fba 100644
--- a/sdk/recipes/patches/openssl/aps.opt.c.p
+++ b/sdk/recipes/patches/openssl/aps.opt.c.p
@@ -1,8 +1,8 @@
---- apps/opt.c.orig 2017-11-22 08:42:07.605882648 +0000
-+++ apps/opt.c 2017-11-22 08:48:31.712843519 +0000
-@@ -374,6 +374,11 @@
- #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
- defined(INTMAX_MAX) && defined(UINTMAX_MAX)
+--- apps/lib/opt.c.orig 2017-11-22 08:42:07.605882648 +0000
++++ apps/lib/opt.c 2017-11-22 08:48:31.712843519 +0000
+@@ -564,6 +564,11 @@
+ defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \
+ !defined(OPENSSL_NO_INTTYPES_H)
+#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4)
+# define strtoimax strtol
@@ -10,5 +10,5 @@
+#endif
+
/* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */
- int opt_imax(const char *value, intmax_t *result)
+ int opt_intmax(const char *value, ossl_intmax_t *result)
{
diff --git a/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
index 6caa72f..e811d8b 100644
--- a/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
+++ b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -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.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
index b517fd8..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,6 +1,6 @@
---- 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
-@@ -122,7 +122,8 @@
+--- 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) \
diff --git a/sdk/recipes/patches/openssl/e_os.h.p
b/sdk/recipes/patches/openssl/e_os.h.p
index 6c91409..07ed97e 100644
--- a/sdk/recipes/patches/openssl/e_os.h.p
+++ b/sdk/recipes/patches/openssl/e_os.h.p
@@ -1,16 +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
-@@ -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__) )
+@@ -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__) )) \
-----------------------------------------------------------------------
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
