Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/a4ddadac3a83348524d120e0332c5f8be5377344
...commit
http://git.netsurf-browser.org/toolchains.git/commit/a4ddadac3a83348524d120e0332c5f8be5377344
...tree
http://git.netsurf-browser.org/toolchains.git/tree/a4ddadac3a83348524d120e0332c5f8be5377344
The branch, master has been updated
via a4ddadac3a83348524d120e0332c5f8be5377344 (commit)
from 21997a5b5d1ea6a29727b947f39e88fc3c8d3119 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=a4ddadac3a83348524d120e0332c5f8be5377344
commit a4ddadac3a83348524d120e0332c5f8be5377344
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix ppc amiga openssl 1.1 build
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
new file mode 100644
index 0000000..3a12454
--- /dev/null
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -0,0 +1,32 @@
+--- /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,29 @@
++%targets = (
++
++ "ppc-amigaos" => {
++ inherit_from => [ "BASE_unix", asm("ppc32_asm") ],
++ cc => "ppc-amigaos-gcc",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYSLOG",
++ debug => "-O0 -g",
++ release => "-O3 ",
++ threads("-D_REENTRANT")),
++ thread_scheme => "(unknown)",
++ perlasm_scheme => "linux32",
++ sys_id => "AMIGAOS4",
++ bn_ops => "BN_LLONG",
++ ranlib => "ppc-amigaos-ranlib",
++ },
++
++ "m68k-unknown-amigaos" => {
++ inherit_from => [ "BASE_unix" ],
++ cc => "m68k-unknown-amigaos-gcc",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYSLOG -m68020",
++ debug => "-O0 -g",
++ release => "-O3 ",
++ threads("-D_REENTRANT")),
++ thread_scheme => "(unknown)",
++ sys_id => "AMIGAOS3",
++ bn_ops => "BN_LLONG",
++ ranlib => "m68k-unknown-amigaos-ranlib",
++ },
++);
diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p
b/sdk/recipes/patches/openssl/apps.speed.c.p
new file mode 100644
index 0000000..88ae1c3
--- /dev/null
+++ b/sdk/recipes/patches/openssl/apps.speed.c.p
@@ -0,0 +1,28 @@
+--- 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
+ #include <openssl/modes.h>
+
++
++#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4)
++# define HAVE_FORK 0
++# undef SIGALRM
++#endif
++
+ #ifndef HAVE_FORK
+ # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+ # 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
+ return ret;
+ }
+ #endif
diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p
b/sdk/recipes/patches/openssl/aps.opt.c.p
new file mode 100644
index 0000000..531cf76
--- /dev/null
+++ b/sdk/recipes/patches/openssl/aps.opt.c.p
@@ -0,0 +1,14 @@
+--- 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/bio_lcl.h.p
b/sdk/recipes/patches/openssl/bio_lcl.h.p
index c920bbb..feae76f 100644
--- a/sdk/recipes/patches/openssl/bio_lcl.h.p
+++ b/sdk/recipes/patches/openssl/bio_lcl.h.p
@@ -5,7 +5,7 @@
* Undefine AF_UNIX on systems that define it but don't support it.
*/
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS)
-+# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) ||
defined(OPENSSL_SYS_RISCOS)
++# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) ||
defined(OPENSSL_SYS_RISCOS) || defined(OPENSSL_SYS_AMIGAOS3) ||
defined(OPENSSL_SYS_AMIGAOS4)
# undef AF_UNIX
# endif
diff --git a/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
b/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
new file mode 100644
index 0000000..ac43e2d
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
@@ -0,0 +1,15 @@
+--- crypto/pkcs7/bio_pk7.c.orig 2017-11-22 07:58:17.501346816 +0000
++++ crypto/pkcs7/bio_pk7.c 2017-11-22 08:00:09.130073671 +0000
+@@ -12,7 +12,11 @@
+ #include <openssl/bio.h>
+
+ #if !defined(OPENSSL_SYS_VXWORKS)
+-# include <memory.h>
++# if !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4)
++# include <memory.h>
++# else
++# include <string.h>
++# endif
+ #endif
+ #include <stdio.h>
+
diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p
b/sdk/recipes/patches/openssl/crypto.rand.build.info.p
new file mode 100644
index 0000000..58b672f
--- /dev/null
+++ b/sdk/recipes/patches/openssl/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/crypto.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
new file mode 100644
index 0000000..a4513f2
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
@@ -0,0 +1,11 @@
+--- 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"
+
+-#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))
+
+ # include <sys/types.h>
+ # include <sys/time.h>
diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p
b/sdk/recipes/patches/openssl/mem_sec.c.p
index 3ec0ef4..156cc93 100644
--- a/sdk/recipes/patches/openssl/mem_sec.c.p
+++ b/sdk/recipes/patches/openssl/mem_sec.c.p
@@ -5,7 +5,7 @@
#include <string.h>
-#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
-+#if ! defined(OPENSSL_SYS_RISCOS) && (defined(OPENSSL_SYS_LINUX) ||
defined(OPENSSL_SYS_UNIX))
++#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && !
defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) ||
defined(OPENSSL_SYS_UNIX))
# define IMPLEMENTED
# include <stdlib.h>
# include <assert.h>
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
deleted file mode 100644
index 3a9bf62..0000000
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/Makefile 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/Makefile 2017-02-08 00:05:03.883009508 +0000
-@@ -71,7 +71,7 @@ uplink-x86.s: $(TOP)/ms/uplink-x86.pl
-
- x86_64cpuid.s: x86_64cpuid.pl; $(PERL) x86_64cpuid.pl
$(PERLASM_SCHEME) > $@
- ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@
--ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
-+ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) > $@
- pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
- alphacpuid.s: alphacpuid.pl
- ([email protected]; trap "rm $$preproc" INT; \
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
index eaaab73..b6ece1e 100644
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p
+++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p
@@ -1,17 +1,19 @@
---- crypto/ppccap.c 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/ppccap.c 2017-02-08 17:48:09.982015412 +0000
-@@ -73,6 +73,7 @@ void sha512_block_data_order(void *ctx,
- sha512_block_ppc(ctx, inp, len);
+--- 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)
{
-@@ -157,3 +158,24 @@ void OPENSSL_cpuid_setup(void)
+@@ -341,3 +343,24 @@
sigaction(SIGILL, &ill_oact, NULL);
sigprocmask(SIG_SETMASK, &oset, NULL);
}
++
+#else
+#include <proto/exec.h>
+void OPENSSL_cpuid_setup(void)
@@ -32,4 +34,3 @@
+ }
+}
+#endif
-+
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
deleted file mode 100644
index 623f599..0000000
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
+++ /dev/null
@@ -1,14 +0,0 @@
---- crypto/rand/Makefile 2017-03-29 18:44:57.752006689 +0100
-+++ crypto/rand/Makefile 2017-03-29 18:45:23.976006610 +0100
-@@ -18,9 +18,9 @@ APPS=
-
- LIB=$(TOP)/libcrypto.a
- LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
-- rand_win.c rand_unix.c rand_os2.c rand_nw.c
-+ rand_win.c rand_unix.c rand_os2.c rand_nw.c rand_amiga.c
- LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \
-- rand_win.o rand_unix.o rand_os2.o rand_nw.o
-+ rand_win.o rand_unix.o rand_os2.o rand_nw.o rand_amiga.o
-
- SRC= $(LIBSRC)
-
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
deleted file mode 100644
index 2caae57..0000000
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/rand/rand_unix.c 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/rand/rand_unix.c 2017-03-29 17:42:59.932017575 +0100
-@@ -116,7 +116,7 @@
- #include <openssl/rand.h>
- #include "rand_lcl.h"
-
--#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) ||
defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE))
-+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) ||
defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) ||
defined(OPENSSL_SYS_AMIGAOS4) || defined(OPENSSL_SYS_AMIGAOS3))
-
- # include <sys/types.h>
- # include <sys/time.h>
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.
-----------------------------------------------------------------------
Summary of changes:
.../openssl/Configurations-50-amigaos.conf.p | 32 ++++++++++++++++++++
sdk/recipes/patches/openssl/apps.speed.c.p | 28 +++++++++++++++++
sdk/recipes/patches/openssl/aps.opt.c.p | 14 +++++++++
sdk/recipes/patches/openssl/bio_lcl.h.p | 2 +-
.../patches/openssl/crypto.pkcs7.bio_pk7.c.p | 15 +++++++++
.../patches/openssl/crypto.rand.build.info.p | 9 ++++++
.../patches/openssl/crypto.rand.rand_unix.c.p | 11 +++++++
sdk/recipes/patches/openssl/mem_sec.c.p | 2 +-
.../patches/openssl/ppc-amigaos/crypto.Makefile.p | 11 -------
.../openssl/ppc-amigaos/crypto.bio_b_addr.c.p | 11 +++++++
.../patches/openssl/ppc-amigaos/crypto.ppccap.c.p | 13 ++++----
.../openssl/ppc-amigaos/crypto.rand.Makefile.p | 14 ---------
.../openssl/ppc-amigaos/crypto.rand.rand_unix.c.p | 11 -------
.../openssl/ppc-amigaos/include.openssl.e_os2.h.p | 11 +++++++
sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p | 22 --------------
sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p | 13 --------
sdk/recipes/patches/openssl/ppc-amigaos/no-term.p | 24 ---------------
17 files changed, 140 insertions(+), 103 deletions(-)
create mode 100644 sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
create mode 100644 sdk/recipes/patches/openssl/apps.speed.c.p
create mode 100644 sdk/recipes/patches/openssl/aps.opt.c.p
create mode 100644 sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
create mode 100644 sdk/recipes/patches/openssl/crypto.rand.build.info.p
create mode 100644 sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
delete mode 100644 sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
create mode 100644
sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p
delete mode 100644
sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
delete mode 100644
sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
create mode 100644
sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p
delete mode 100644 sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p
delete mode 100644 sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p
delete mode 100644 sdk/recipes/patches/openssl/ppc-amigaos/no-term.p
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
new file mode 100644
index 0000000..3a12454
--- /dev/null
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -0,0 +1,32 @@
+--- /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,29 @@
++%targets = (
++
++ "ppc-amigaos" => {
++ inherit_from => [ "BASE_unix", asm("ppc32_asm") ],
++ cc => "ppc-amigaos-gcc",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYSLOG",
++ debug => "-O0 -g",
++ release => "-O3 ",
++ threads("-D_REENTRANT")),
++ thread_scheme => "(unknown)",
++ perlasm_scheme => "linux32",
++ sys_id => "AMIGAOS4",
++ bn_ops => "BN_LLONG",
++ ranlib => "ppc-amigaos-ranlib",
++ },
++
++ "m68k-unknown-amigaos" => {
++ inherit_from => [ "BASE_unix" ],
++ cc => "m68k-unknown-amigaos-gcc",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYSLOG -m68020",
++ debug => "-O0 -g",
++ release => "-O3 ",
++ threads("-D_REENTRANT")),
++ thread_scheme => "(unknown)",
++ sys_id => "AMIGAOS3",
++ bn_ops => "BN_LLONG",
++ ranlib => "m68k-unknown-amigaos-ranlib",
++ },
++);
diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p
b/sdk/recipes/patches/openssl/apps.speed.c.p
new file mode 100644
index 0000000..88ae1c3
--- /dev/null
+++ b/sdk/recipes/patches/openssl/apps.speed.c.p
@@ -0,0 +1,28 @@
+--- 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
+ #include <openssl/modes.h>
+
++
++#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4)
++# define HAVE_FORK 0
++# undef SIGALRM
++#endif
++
+ #ifndef HAVE_FORK
+ # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+ # 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
+ return ret;
+ }
+ #endif
diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p
b/sdk/recipes/patches/openssl/aps.opt.c.p
new file mode 100644
index 0000000..531cf76
--- /dev/null
+++ b/sdk/recipes/patches/openssl/aps.opt.c.p
@@ -0,0 +1,14 @@
+--- 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/bio_lcl.h.p
b/sdk/recipes/patches/openssl/bio_lcl.h.p
index c920bbb..feae76f 100644
--- a/sdk/recipes/patches/openssl/bio_lcl.h.p
+++ b/sdk/recipes/patches/openssl/bio_lcl.h.p
@@ -5,7 +5,7 @@
* Undefine AF_UNIX on systems that define it but don't support it.
*/
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS)
-+# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) ||
defined(OPENSSL_SYS_RISCOS)
++# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) ||
defined(OPENSSL_SYS_RISCOS) || defined(OPENSSL_SYS_AMIGAOS3) ||
defined(OPENSSL_SYS_AMIGAOS4)
# undef AF_UNIX
# endif
diff --git a/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
b/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
new file mode 100644
index 0000000..ac43e2d
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p
@@ -0,0 +1,15 @@
+--- crypto/pkcs7/bio_pk7.c.orig 2017-11-22 07:58:17.501346816 +0000
++++ crypto/pkcs7/bio_pk7.c 2017-11-22 08:00:09.130073671 +0000
+@@ -12,7 +12,11 @@
+ #include <openssl/bio.h>
+
+ #if !defined(OPENSSL_SYS_VXWORKS)
+-# include <memory.h>
++# if !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4)
++# include <memory.h>
++# else
++# include <string.h>
++# endif
+ #endif
+ #include <stdio.h>
+
diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p
b/sdk/recipes/patches/openssl/crypto.rand.build.info.p
new file mode 100644
index 0000000..58b672f
--- /dev/null
+++ b/sdk/recipes/patches/openssl/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/crypto.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
new file mode 100644
index 0000000..a4513f2
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
@@ -0,0 +1,11 @@
+--- 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"
+
+-#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))
+
+ # include <sys/types.h>
+ # include <sys/time.h>
diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p
b/sdk/recipes/patches/openssl/mem_sec.c.p
index 3ec0ef4..156cc93 100644
--- a/sdk/recipes/patches/openssl/mem_sec.c.p
+++ b/sdk/recipes/patches/openssl/mem_sec.c.p
@@ -5,7 +5,7 @@
#include <string.h>
-#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
-+#if ! defined(OPENSSL_SYS_RISCOS) && (defined(OPENSSL_SYS_LINUX) ||
defined(OPENSSL_SYS_UNIX))
++#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && !
defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) ||
defined(OPENSSL_SYS_UNIX))
# define IMPLEMENTED
# include <stdlib.h>
# include <assert.h>
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
deleted file mode 100644
index 3a9bf62..0000000
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/Makefile 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/Makefile 2017-02-08 00:05:03.883009508 +0000
-@@ -71,7 +71,7 @@ uplink-x86.s: $(TOP)/ms/uplink-x86.pl
-
- x86_64cpuid.s: x86_64cpuid.pl; $(PERL) x86_64cpuid.pl
$(PERLASM_SCHEME) > $@
- ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@
--ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
-+ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) > $@
- pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
- alphacpuid.s: alphacpuid.pl
- ([email protected]; trap "rm $$preproc" INT; \
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
index eaaab73..b6ece1e 100644
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p
+++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p
@@ -1,17 +1,19 @@
---- crypto/ppccap.c 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/ppccap.c 2017-02-08 17:48:09.982015412 +0000
-@@ -73,6 +73,7 @@ void sha512_block_data_order(void *ctx,
- sha512_block_ppc(ctx, inp, len);
+--- 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)
{
-@@ -157,3 +158,24 @@ void OPENSSL_cpuid_setup(void)
+@@ -341,3 +343,24 @@
sigaction(SIGILL, &ill_oact, NULL);
sigprocmask(SIG_SETMASK, &oset, NULL);
}
++
+#else
+#include <proto/exec.h>
+void OPENSSL_cpuid_setup(void)
@@ -32,4 +34,3 @@
+ }
+}
+#endif
-+
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
deleted file mode 100644
index 623f599..0000000
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.Makefile.p
+++ /dev/null
@@ -1,14 +0,0 @@
---- crypto/rand/Makefile 2017-03-29 18:44:57.752006689 +0100
-+++ crypto/rand/Makefile 2017-03-29 18:45:23.976006610 +0100
-@@ -18,9 +18,9 @@ APPS=
-
- LIB=$(TOP)/libcrypto.a
- LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
-- rand_win.c rand_unix.c rand_os2.c rand_nw.c
-+ rand_win.c rand_unix.c rand_os2.c rand_nw.c rand_amiga.c
- LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \
-- rand_win.o rand_unix.o rand_os2.o rand_nw.o
-+ rand_win.o rand_unix.o rand_os2.o rand_nw.o rand_amiga.o
-
- SRC= $(LIBSRC)
-
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
deleted file mode 100644
index 2caae57..0000000
--- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.rand_unix.c.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/rand/rand_unix.c 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/rand/rand_unix.c 2017-03-29 17:42:59.932017575 +0100
-@@ -116,7 +116,7 @@
- #include <openssl/rand.h>
- #include "rand_lcl.h"
-
--#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) ||
defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE))
-+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) ||
defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) ||
defined(OPENSSL_SYS_AMIGAOS4) || defined(OPENSSL_SYS_AMIGAOS3))
-
- # include <sys/types.h>
- # include <sys/time.h>
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.
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
