buildsystem: branch tlsa/python-testrunner updated. release/1.6-3-g777093d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/buildsystem.git/shortlog/777093d441ab01e8a...
...commit http://git.netsurf-browser.org/buildsystem.git/commit/777093d441ab01e8a15...
...tree http://git.netsurf-browser.org/buildsystem.git/tree/777093d441ab01e8a15df...
The branch, tlsa/python-testrunner has been updated
discards db14e3fc674ca715fbde762c743c31ebf82129cb (commit)
discards ffc010bc1b8c2c38315b05b63e5bb0f8a72e67bc (commit)
discards c0152aae2d6741799a60782c56d4988b935275d1 (commit)
discards 0b023edcdea4f34822828e8a7fbed503101fcc49 (commit)
via 777093d441ab01e8a15df0cc478cd05c4377c475 (commit)
via 8589835723af7d1bf11924b13e38cf4f818c81ab (commit)
via f7f02cb2f1ba51a1b99c3883b90732ad6f6da365 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (db14e3fc674ca715fbde762c743c31ebf82129cb)
\
N -- N -- N (777093d441ab01e8a15df0cc478cd05c4377c475)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/buildsystem.git/commit/?id=777093d441ab01e...
commit 777093d441ab01e8a15df0cc478cd05c4377c475
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Python test runner: Convert from Python 2 to Python 3.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 2dde372..e6bb7d5 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -282,6 +282,7 @@ MV ?= mv
PERL ?= perl
PYTHON ?= python
+PYTHON3 ?= python3
PKGCONFIG ?= PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)" pkg-config
diff --git a/testtools/testrunner.py b/testtools/testrunner.py
index 9d3aee8..6648372 100644
--- a/testtools/testrunner.py
+++ b/testtools/testrunner.py
@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/python3
#
# Testcase runner for NetSurf projects
#
@@ -13,7 +13,7 @@
import os
import sys
-import Queue
+import queue
import threading
import subprocess
@@ -41,11 +41,11 @@ LOG = open(os.path.join(builddir, "testlog"), "w")
def run_test(test_exe, test_data):
- io_q = Queue.Queue()
+ io_q = queue.Queue()
def output_collector(identifier, stream):
for line in stream:
- io_q.put((identifier, line.rstrip()))
+ io_q.put((identifier, line.decode("utf-8").rstrip()))
if not stream.closed:
stream.close()
@@ -109,7 +109,7 @@ with open(os.path.join(directory, "INDEX"), "r") as TINDEX:
continue
# Found one; decompose
- decomposed = filter(None, line.split('\t'))
+ decomposed = list(filter(None, line.split('\t')))
# Strip whitespace
test = decomposed[0].strip()
@@ -136,7 +136,7 @@ with open(os.path.join(directory, "INDEX"), "r") as TINDEX:
continue
# Found one; decompose
- ddecomposed = filter(None, dline.split('\t'))
+ ddecomposed = list(filter(None, dline.split('\t')))
# Strip whitespace
dtest = ddecomposed[0].strip()
commitdiff http://git.netsurf-browser.org/buildsystem.git/commit/?id=8589835723af7d1...
commit 8589835723af7d1bf11924b13e38cf4f818c81ab
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Buildsystem: Install the Python test tool implementation too.
diff --git a/Makefile b/Makefile
index d1fd44b..10aac57 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ MAKEFILES := $(patsubst %,Makefile.%, \
clang gcc norcroft open64 \
)
-TESTTOOLS := testrunner.pl
+TESTTOOLS := testrunner.pl testrunner.py
CITOOLS := jenkins-build.sh
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 86fac4c..2dde372 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -281,6 +281,7 @@ MKDIRFLAGS ?= -p
MV ?= mv
PERL ?= perl
+PYTHON ?= python
PKGCONFIG ?= PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)" pkg-config
commitdiff http://git.netsurf-browser.org/buildsystem.git/commit/?id=f7f02cb2f1ba51a...
commit f7f02cb2f1ba51a1b99c3883b90732ad6f6da365
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Testrunner: Add Python implementation of testrunner.pl
diff --git a/testtools/testrunner.py b/testtools/testrunner.py
new file mode 100644
index 0000000..9d3aee8
--- /dev/null
+++ b/testtools/testrunner.py
@@ -0,0 +1,171 @@
+#!/bin/python
+#
+# Testcase runner for NetSurf projects
+#
+# Usage: testrunner <builddir> <testdir> <prefix> [<executable extension>]
+#
+# Operates upon INDEX files described in the README.
+# Locates and executes testcases, feeding data files to programs
+# as appropriate.
+# Logs testcase output to file.
+# Aborts test sequence on detection of error.
+#
+
+import os
+import sys
+import Queue
+import threading
+import subprocess
+
+global builddir
+global directory
+global prefix
+global exeext
+
+if len(sys.argv) < 4:
+ print("Usage: testrunner.pl <builddir> <testdir> <prefix> [<exeext>]")
+ sys.exit(1)
+
+# Get directories
+builddir = sys.argv[1]
+directory = sys.argv[2]
+prefix = sys.argv[3]
+
+# Get EXE extension (if any)
+exeext = None
+if len(sys.argv) > 4:
+ exeext = sys.argv[4]
+
+# Open log file and /dev/null
+LOG = open(os.path.join(builddir, "testlog"), "w")
+
+
+def run_test(test_exe, test_data):
+ io_q = Queue.Queue()
+
+ def output_collector(identifier, stream):
+ for line in stream:
+ io_q.put((identifier, line.rstrip()))
+
+ if not stream.closed:
+ stream.close()
+
+ # Run the test
+ proc = subprocess.Popen([test_exe, test_data],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+ # Threads for sticking output into queue
+ tout = threading.Thread(target=output_collector, name='stdout-watcher',
+ args=('STDOUT', proc.stdout))
+ terr = threading.Thread(target=output_collector, name='stderr-watcher',
+ args=('STDERR', proc.stderr))
+
+ tout.start()
+ terr.start()
+
+ # Wait for test to finish
+ ret = proc.wait()
+
+ # And join the output collector threads
+ tout.join()
+ terr.join()
+
+ # If last line of STDOUT is "PASS", then the test passed
+ last_line = None
+
+ # The STDERR output is just collected up and put at the end of LOG
+ error_lines = []
+
+ while not io_q.empty():
+ identifier, line = io_q.get()
+ if identifier == "STDOUT":
+ LOG.write("%s\n" % line)
+ last_line = line
+ else:
+ error_lines += line
+
+ # Check for test process returning error
+ if ret != 0:
+ LOG.write(" FAIL: Exit status %i\n" % ret)
+ last_line = "FAIL"
+
+ # Dump stderr to log
+ for error_line in error_lines:
+ LOG.write("%s\n" % line)
+
+ if not last_line == "PASS":
+ last_line = "FAIL"
+
+ # Print rest result
+ print(last_line)
+ return
+
+# Open testcase index
+with open(os.path.join(directory, "INDEX"), "r") as TINDEX:
+ # Parse testcase index, looking for testcases
+ for line in TINDEX:
+ # Skip comments
+ if line[0] == '#' or line.isspace():
+ continue
+
+ # Found one; decompose
+ decomposed = filter(None, line.split('\t'))
+
+ # Strip whitespace
+ test = decomposed[0].strip()
+ desc = decomposed[1].strip()
+ data = None
+ if len(decomposed) > 2:
+ data = decomposed[2].strip()
+
+ # Append prefix & EXE extension to binary name
+ test = prefix + test
+ if exeext:
+ test += exeext
+
+ print("Test: " + desc)
+
+ if data:
+ # Testcase has external data files
+
+ # Open datafile index
+ with open(os.path.join(directory, "data/" + data + "/INDEX"), "r") as DINDEX:
+ # Parse datafile index, looking for datafiles
+ for dline in DINDEX:
+ if dline[0] == '#' or dline.isspace():
+ continue
+
+ # Found one; decompose
+ ddecomposed = filter(None, dline.split('\t'))
+
+ # Strip whitespace
+ dtest = ddecomposed[0].strip()
+ ddesc = ddecomposed[1].strip()
+
+ LOG.write("Running %s %s\n" % (
+ os.path.join(builddir, test),
+ os.path.join(directory, "data/" + data + "/" + dtest)))
+
+ # Make message fit on an 80 column terminal
+ msg = " ==> " + test + " [" + data + "/" + dtest + "]"
+ msg += "." * (80 - len(msg) - 8)
+
+ sys.stdout.write(msg)
+
+ # Run testcase
+ run_test(os.path.join(builddir, test),
+ os.path.join(directory, "data/" + data + "/" + dtest))
+ else:
+ # Testcase has no external data files
+ LOG.write("Running %s\n" % (os.path.join(builddir, test)))
+
+ # Make message fit on an 80 column terminal
+ msg = " ==> " + test
+ msg += "." * (80 - len(msg) - 8)
+
+ sys.stdout.write(msg)
+
+ # Run testcase
+ run_test(os.path.join(builddir, test))
+
+ print("")
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
makefiles/Makefile.tools | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e221973..10aac57 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ MAKEFILES := $(patsubst %,Makefile.%, \
clang gcc norcroft open64 \
)
-TESTTOOLS := testrunner.py
+TESTTOOLS := testrunner.pl testrunner.py
CITOOLS := jenkins-build.sh
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 732a962..e6bb7d5 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -281,7 +281,8 @@ MKDIRFLAGS ?= -p
MV ?= mv
PERL ?= perl
-PYTHON ?= python3
+PYTHON ?= python
+PYTHON3 ?= python3
PKGCONFIG ?= PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)" pkg-config
--
NetSurf Project build system
5 years, 4 months
- 1
- 0
libcss: branch tlsa/lcneves/select-autogen updated. release/0.7.0-18-gb8997eb
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libcss.git/shortlog/b8997eb73a1b966939fca4...
...commit http://git.netsurf-browser.org/libcss.git/commit/b8997eb73a1b966939fca4b7...
...tree http://git.netsurf-browser.org/libcss.git/tree/b8997eb73a1b966939fca4b7e2...
The branch, tlsa/lcneves/select-autogen has been updated
discards a1e9d6005dbc92821e996a4681d1c104ee92fd31 (commit)
discards 8af9f4a1dbcca9dbd2868ae1488adfd5011e470c (commit)
via b8997eb73a1b966939fca4b7e2f4ef799b872ab9 (commit)
via 637af005876a14b4c64c0b14d39e67738e76d816 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (a1e9d6005dbc92821e996a4681d1c104ee92fd31)
\
N -- N -- N (b8997eb73a1b966939fca4b7e2f4ef799b872ab9)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/libcss.git/commit/?id=b8997eb73a1b966939fc...
commit b8997eb73a1b966939fca4b7e2f4ef799b872ab9
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Selection: Autogenerated propset: Fix release of previous strings.
diff --git a/src/select/select_generator.py b/src/select/select_generator.py
index c6a03de..f87c929 100644
--- a/src/select/select_generator.py
+++ b/src/select/select_generator.py
@@ -641,9 +641,9 @@ class CSSGroup:
old_t, old_n_shift = shift_star(v.type, old_n)
if v.name is 'string':
- t.append('{} {} = style{}->{}{} = {};'.format(
+ t.append('{} {} = style{}->{}{};'.format(
old_t, old_n_shift,
- grp, i_dot, p.name + v.suffix, v.name + v.suffix))
+ grp, i_dot, p.name + v.suffix))
t.append()
t.append('if ({} != NULL) {{'.format(v.name + v.suffix))
t.indent(1)
commitdiff http://git.netsurf-browser.org/libcss.git/commit/?id=637af005876a14b4c64c...
commit 637af005876a14b4c64c0b14d39e67738e76d816
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Selection: Content prop, use CSS_CONTENT_SET as condition for generator.
diff --git a/src/select/select_config.py b/src/select/select_config.py
index 468e8dc..a543542 100644
--- a/src/select/select_config.py
+++ b/src/select/select_config.py
@@ -164,7 +164,7 @@ uncommon = {
('cursor', 5, 'string_arr', None, 'CSS_CURSOR_AUTO',
'Encode cursor uri(s) as an array of string objects, terminated '
'with a blank entry'),
- ('content', 2, 'content_item', 'CSS_CONTENT_NORMAL', 'CSS_CONTENT_NORMAL',
+ ('content', 2, 'content_item', 'CSS_CONTENT_SET', 'CSS_CONTENT_NORMAL',
'Encode content as an array of content items, terminated with '
'a blank entry.', 'set')
}
-----------------------------------------------------------------------
Summary of changes:
--
Cascading Style Sheets library
5 years, 4 months
- 1
- 0
libcss: branch tlsa/lcneves/select-autogen updated. release/0.7.0-18-ga1e9d60
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libcss.git/shortlog/a1e9d6005dbc92821e996a...
...commit http://git.netsurf-browser.org/libcss.git/commit/a1e9d6005dbc92821e996a46...
...tree http://git.netsurf-browser.org/libcss.git/tree/a1e9d6005dbc92821e996a4681...
The branch, tlsa/lcneves/select-autogen has been updated
via a1e9d6005dbc92821e996a4681d1c104ee92fd31 (commit)
from 8af9f4a1dbcca9dbd2868ae1488adfd5011e470c (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/libcss.git/commit/?id=a1e9d6005dbc92821e99...
commit a1e9d6005dbc92821e996a4681d1c104ee92fd31
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Selection: Autogenerated propset: Fix release of previous strings.
diff --git a/src/select/select_generator.py b/src/select/select_generator.py
index c6a03de..f87c929 100644
--- a/src/select/select_generator.py
+++ b/src/select/select_generator.py
@@ -641,9 +641,9 @@ class CSSGroup:
old_t, old_n_shift = shift_star(v.type, old_n)
if v.name is 'string':
- t.append('{} {} = style{}->{}{} = {};'.format(
+ t.append('{} {} = style{}->{}{};'.format(
old_t, old_n_shift,
- grp, i_dot, p.name + v.suffix, v.name + v.suffix))
+ grp, i_dot, p.name + v.suffix))
t.append()
t.append('if ({} != NULL) {{'.format(v.name + v.suffix))
t.indent(1)
-----------------------------------------------------------------------
Summary of changes:
src/select/select_generator.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/select/select_generator.py b/src/select/select_generator.py
index c6a03de..f87c929 100644
--- a/src/select/select_generator.py
+++ b/src/select/select_generator.py
@@ -641,9 +641,9 @@ class CSSGroup:
old_t, old_n_shift = shift_star(v.type, old_n)
if v.name is 'string':
- t.append('{} {} = style{}->{}{} = {};'.format(
+ t.append('{} {} = style{}->{}{};'.format(
old_t, old_n_shift,
- grp, i_dot, p.name + v.suffix, v.name + v.suffix))
+ grp, i_dot, p.name + v.suffix))
t.append()
t.append('if ({} != NULL) {{'.format(v.name + v.suffix))
t.indent(1)
--
Cascading Style Sheets library
5 years, 4 months
- 1
- 0
libcss: branch tlsa/lcneves/select-autogen created. release/0.7.0-17-g8af9f4a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libcss.git/shortlog/8af9f4a1dbcca9dbd2868a...
...commit http://git.netsurf-browser.org/libcss.git/commit/8af9f4a1dbcca9dbd2868ae1...
...tree http://git.netsurf-browser.org/libcss.git/tree/8af9f4a1dbcca9dbd2868ae148...
The branch, tlsa/lcneves/select-autogen has been created
at 8af9f4a1dbcca9dbd2868ae1488adfd5011e470c (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libcss.git/commit/?id=8af9f4a1dbcca9dbd286...
commit 8af9f4a1dbcca9dbd2868ae1488adfd5011e470c
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Selection: Cor content prop, use CSS_CONTENT_SET as condition for generator.
diff --git a/src/select/select_config.py b/src/select/select_config.py
index 468e8dc..a543542 100644
--- a/src/select/select_config.py
+++ b/src/select/select_config.py
@@ -164,7 +164,7 @@ uncommon = {
('cursor', 5, 'string_arr', None, 'CSS_CURSOR_AUTO',
'Encode cursor uri(s) as an array of string objects, terminated '
'with a blank entry'),
- ('content', 2, 'content_item', 'CSS_CONTENT_NORMAL', 'CSS_CONTENT_NORMAL',
+ ('content', 2, 'content_item', 'CSS_CONTENT_SET', 'CSS_CONTENT_NORMAL',
'Encode content as an array of content items, terminated with '
'a blank entry.', 'set')
}
-----------------------------------------------------------------------
--
Cascading Style Sheets library
5 years, 4 months
- 1
- 0
toolchains: branch master updated. a04d5edbeef3b2a02c5731eab865272f75e64070
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/a04d5edbeef3b2a02c...
...commit http://git.netsurf-browser.org/toolchains.git/commit/a04d5edbeef3b2a02c57...
...tree http://git.netsurf-browser.org/toolchains.git/tree/a04d5edbeef3b2a02c5731...
The branch, master has been updated
via a04d5edbeef3b2a02c5731eab865272f75e64070 (commit)
from 65c920f57e760f7029249e0127dbf0d67ef1e0e6 (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=a04d5edbeef3b2a0...
commit a04d5edbeef3b2a02c5731eab865272f75e64070
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
enable ssl usage in libcurl for windows
diff --git a/sdk/Makefile b/sdk/Makefile
index 8d628a3..860a7d4 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -120,7 +120,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random
- LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32"
EXTRAARGS_OPENSSL := no-asm enable-capieng
endif
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index 8d628a3..860a7d4 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -120,7 +120,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random
- LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32"
EXTRAARGS_OPENSSL := no-asm enable-capieng
endif
--
Cross-compilation toolchains and environments
5 years, 4 months
- 1
- 0
netsurf: branch master updated. release/3.7-26-g1a7fc08
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/1a7fc08e04ffbb0a6872b...
...commit http://git.netsurf-browser.org/netsurf.git/commit/1a7fc08e04ffbb0a6872baa...
...tree http://git.netsurf-browser.org/netsurf.git/tree/1a7fc08e04ffbb0a6872baa34...
The branch, master has been updated
via 1a7fc08e04ffbb0a6872baa343e42e3d982ae4ab (commit)
from acf5a20a2b7a0de8a91ab0a5c91929c4126403da (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/netsurf.git/commit/?id=1a7fc08e04ffbb0a687...
commit 1a7fc08e04ffbb0a6872baa343e42e3d982ae4ab
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add crypto library to windows link to cope with updated openssl
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index bd34b46..50d0d4b 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -15,7 +15,7 @@ $(eval $(call pkg_config_find_and_add,libcares,Cares))
$(eval $(call pkg_config_find_and_add,zlib,ZLib))
# libraries for windows API
-LDFLAGS += -lgnurx -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -lshlwapi -mwindows
+LDFLAGS += -lgnurx -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -lshlwapi -lcrypt32 -mwindows
CFLAGS += -U__STRICT_ANSI__ -mwin32
# only windows versions after XP are supported
-----------------------------------------------------------------------
Summary of changes:
frontends/windows/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index bd34b46..50d0d4b 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -15,7 +15,7 @@ $(eval $(call pkg_config_find_and_add,libcares,Cares))
$(eval $(call pkg_config_find_and_add,zlib,ZLib))
# libraries for windows API
-LDFLAGS += -lgnurx -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -lshlwapi -mwindows
+LDFLAGS += -lgnurx -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -lshlwapi -lcrypt32 -mwindows
CFLAGS += -U__STRICT_ANSI__ -mwin32
# only windows versions after XP are supported
--
NetSurf Browser
5 years, 4 months
- 1
- 0
toolchains: branch master updated. 65c920f57e760f7029249e0127dbf0d67ef1e0e6
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/65c920f57e760f7029...
...commit http://git.netsurf-browser.org/toolchains.git/commit/65c920f57e760f702924...
...tree http://git.netsurf-browser.org/toolchains.git/tree/65c920f57e760f7029249e...
The branch, master has been updated
via 65c920f57e760f7029249e0127dbf0d67ef1e0e6 (commit)
from c86aacc4540add3a46bf2f53077943254268a33b (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=65c920f57e760f70...
commit 65c920f57e760f7029249e0127dbf0d67ef1e0e6
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
enable CAPI in windows build
diff --git a/sdk/Makefile b/sdk/Makefile
index c224176..8d628a3 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -121,7 +121,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random
LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
- EXTRAARGS_OPENSSL := no-asm
+ EXTRAARGS_OPENSSL := no-asm enable-capieng
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index c224176..8d628a3 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -121,7 +121,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random
LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
- EXTRAARGS_OPENSSL := no-asm
+ EXTRAARGS_OPENSSL := no-asm enable-capieng
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
--
Cross-compilation toolchains and environments
5 years, 4 months
- 1
- 0
toolchains: branch master updated. c86aacc4540add3a46bf2f53077943254268a33b
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/c86aacc4540add3a46...
...commit http://git.netsurf-browser.org/toolchains.git/commit/c86aacc4540add3a46bf...
...tree http://git.netsurf-browser.org/toolchains.git/tree/c86aacc4540add3a46bf2f...
The branch, master has been updated
via c86aacc4540add3a46bf2f53077943254268a33b (commit)
from 944f657356371302cb25a42660e4643d72003b5e (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=c86aacc4540add3a...
commit c86aacc4540add3a46bf2f53077943254268a33b
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix windows toolchain build after openssl 1.1 update
diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
new file mode 100644
index 0000000..c492c01
--- /dev/null
+++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
@@ -0,0 +1,28 @@
+--- /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 = (
++
++ "i686-w64-mingw32" => {
++ inherit_from => [ "BASE_unix", asm("x86_asm"),
++ 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",
++ 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",
++ perlasm_scheme => "coff",
++ dso_scheme => "win32",
++ shared_target => "mingw-shared",
++ shared_cflag => add("-D_WINDLL"),
++ shared_ldflag => "-static-libgcc",
++ shared_rcflag => "--target=pe-i386",
++ shared_extension => ".dll",
++ multilib => "",
++ apps_aux_src => add("win32_init.c"),
++ },
++);
diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/crypto.rand.build.info.p
deleted file mode 100644
index 58b672f..0000000
--- a/sdk/recipes/patches/openssl/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.rand.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p
new file mode 100644
index 0000000..58b672f
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-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/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
-----------------------------------------------------------------------
Summary of changes:
.../openssl/Configurations-50-windows.conf.p | 28 ++++++++++++++++++++
.../crypto.rand.build.info.p | 0
.../{ => ppc-amigaos}/crypto.rand.build.info.p | 0
3 files changed, 28 insertions(+)
create mode 100644 sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
copy sdk/recipes/patches/openssl/{ => m68k-unknown-amigaos}/crypto.rand.build.info.p (100%)
rename sdk/recipes/patches/openssl/{ => ppc-amigaos}/crypto.rand.build.info.p (100%)
diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
new file mode 100644
index 0000000..c492c01
--- /dev/null
+++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
@@ -0,0 +1,28 @@
+--- /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 = (
++
++ "i686-w64-mingw32" => {
++ inherit_from => [ "BASE_unix", asm("x86_asm"),
++ 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",
++ 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",
++ perlasm_scheme => "coff",
++ dso_scheme => "win32",
++ shared_target => "mingw-shared",
++ shared_cflag => add("-D_WINDLL"),
++ shared_ldflag => "-static-libgcc",
++ shared_rcflag => "--target=pe-i386",
++ shared_extension => ".dll",
++ multilib => "",
++ apps_aux_src => add("win32_init.c"),
++ },
++);
diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p
similarity index 100%
copy from sdk/recipes/patches/openssl/crypto.rand.build.info.p
copy to sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p
diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p
similarity index 100%
rename from sdk/recipes/patches/openssl/crypto.rand.build.info.p
rename to sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p
--
Cross-compilation toolchains and environments
5 years, 4 months
- 1
- 0
toolchains: branch master updated. 944f657356371302cb25a42660e4643d72003b5e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/944f657356371302cb...
...commit http://git.netsurf-browser.org/toolchains.git/commit/944f657356371302cb25...
...tree http://git.netsurf-browser.org/toolchains.git/tree/944f657356371302cb25a4...
The branch, master has been updated
via 944f657356371302cb25a42660e4643d72003b5e (commit)
from a4ddadac3a83348524d120e0332c5f8be5377344 (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=944f657356371302...
commit 944f657356371302cb25a42660e4643d72003b5e
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix m68k amigaos toolchain build
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 24d3ff5..cd544b8 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -25,7 +25,7 @@ UPSTREAM_MPC_VERSION := 0.8.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_CLIB2_VERSION := 1_213
+UPSTREAM_CLIB2_VERSION := 1_214
UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_TARBALL)
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 3a12454..23a635b 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -1,6 +1,6 @@
--- /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 @@
+@@ -0,0 +1,30 @@
+%targets = (
+
+ "ppc-amigaos" => {
@@ -20,11 +20,12 @@
+ "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",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS -DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=c99",
+ debug => "-O0 -g",
+ release => "-O3 ",
+ threads("-D_REENTRANT")),
+ thread_scheme => "(unknown)",
++ ex_libs => add("-lm -lnet"),
+ sys_id => "AMIGAOS3",
+ bn_ops => "BN_LLONG",
+ ranlib => "m68k-unknown-amigaos-ranlib",
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
new file mode 100644
index 0000000..1d506af
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p
@@ -0,0 +1,36 @@
+--- crypto/bio/b_sock2.c.orig 2017-11-23 12:39:17.912640213 +0000
++++ crypto/bio/b_sock2.c 2017-11-23 12:41:56.350294762 +0000
+@@ -94,6 +94,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 @@
+ return 0;
+ }
+ }
++#endif
+
+ if (connect(sock, BIO_ADDR_sockaddr(addr),
+ BIO_ADDR_sockaddr_size(addr)) == -1) {
+--- crypto/bio/b_sock2.c.orig 2017-11-23 12:43:56.318461652 +0000
++++ crypto/bio/b_sock2.c 2017-11-23 12:44:36.139861658 +0000
+@@ -193,6 +193,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 +201,7 @@
+ return 0;
+ }
+ }
++#endif
+
+ # ifdef IPV6_V6ONLY
+ if ((options & BIO_SOCK_V6_ONLY) && BIO_ADDR_family(addr) == AF_INET6) {
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p
deleted file mode 100644
index 8d3bfc6..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p
+++ /dev/null
@@ -1,12 +0,0 @@
---- crypto/bn/Makefile 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/bn/Makefile 2017-02-11 15:24:31.133017711 +0000
-@@ -60,6 +60,9 @@ lib: $(LIBOBJ)
- $(RANLIB) $(LIB) || echo Never mind.
- @touch lib
-
-+bn_m68k.o: asm/bn_m68k.s
-+ $(CC) $(CFLAGS) -c -o $@ asm/bn_m68k.s
-+
- bn-586.s: asm/bn-586.pl ../perlasm/x86asm.pl
- $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
- co-586.s: asm/co-586.pl ../perlasm/x86asm.pl
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
new file mode 100644
index 0000000..0d5492f
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
@@ -0,0 +1,25 @@
+--- 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
+ q; \
+ })
+ # define REMAINDER_IS_ALREADY_CALCULATED
++# elif defined(__mc68020__)
++ /* Same rationale as for i386. On the 68020-60/CPU32 the divu
++ * instruction will take a 64 bit dividend in a register pair
++ * and overwrite that pair with the remainder:quotient.
++ * Howard Chu
++ */
++# undef bn_div_words
++# define bn_div_words(n0,n1,d0) \
++ ({ asm volatile ( \
++ "divu.l %4,%2:%3" \
++ : "=d"(rem), "=d"(q) \
++ : "0"(n0), "1"(n1), "d"(d0) \
++ : "cc"); \
++ q; \
++ })
++# define REMAINDER_IS_ALREADY_CALCULATED
+ # endif /* __<cpu> */
+ # endif /* __GNUC__ */
+ # endif /* OPENSSL_NO_ASM */
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
deleted file mode 100644
index 0d5492f..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
- q; \
- })
- # define REMAINDER_IS_ALREADY_CALCULATED
-+# elif defined(__mc68020__)
-+ /* Same rationale as for i386. On the 68020-60/CPU32 the divu
-+ * instruction will take a 64 bit dividend in a register pair
-+ * and overwrite that pair with the remainder:quotient.
-+ * Howard Chu
-+ */
-+# undef bn_div_words
-+# define bn_div_words(n0,n1,d0) \
-+ ({ asm volatile ( \
-+ "divu.l %4,%2:%3" \
-+ : "=d"(rem), "=d"(q) \
-+ : "0"(n0), "1"(n1), "d"(d0) \
-+ : "cc"); \
-+ q; \
-+ })
-+# define REMAINDER_IS_ALREADY_CALCULATED
- # endif /* __<cpu> */
- # endif /* __GNUC__ */
- # endif /* OPENSSL_NO_ASM */
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p
deleted file mode 100644
index 623f599..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-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/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p
deleted file mode 100644
index 2caae57..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-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/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p
new file mode 100644
index 0000000..0448499
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p
@@ -0,0 +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 @@
+
+ #endif
+
++#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
++
+ #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
new file mode 100644
index 0000000..6ea1ec8
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-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/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
deleted file mode 100644
index 890cef3..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-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_AMIGAOS3)
-+#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_AMIGAOS3)
- /*
- * 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:
m68k-unknown-amigaos/Makefile | 2 +-
.../openssl/Configurations-50-amigaos.conf.p | 5 +--
.../m68k-unknown-amigaos/crypto.bio.b_sock2.c.p | 36 ++++++++++++++++++++
.../m68k-unknown-amigaos/crypto.bn.Makefile.p | 12 -------
.../{crypto.bn.bn_div.c.p => crypto.bn.bn_div.c} | 0
.../m68k-unknown-amigaos/crypto.rand.Makefile.p | 14 --------
.../m68k-unknown-amigaos/crypto.rand.rand_unix.c.p | 11 ------
.../m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p | 21 ++++++++++++
.../include.openssl.e_os2.h.p | 0
.../patches/openssl/m68k-unknown-amigaos/no-term.p | 24 -------------
10 files changed, 61 insertions(+), 64 deletions(-)
create mode 100644 sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p
delete mode 100644 sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p
rename sdk/recipes/patches/openssl/m68k-unknown-amigaos/{crypto.bn.bn_div.c.p => crypto.bn.bn_div.c} (100%)
delete mode 100644 sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p
delete mode 100644 sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p
create mode 100644 sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p
copy sdk/recipes/patches/openssl/{ppc-amigaos => m68k-unknown-amigaos}/include.openssl.e_os2.h.p (100%)
delete mode 100644 sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 24d3ff5..cd544b8 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -25,7 +25,7 @@ UPSTREAM_MPC_VERSION := 0.8.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_CLIB2_VERSION := 1_213
+UPSTREAM_CLIB2_VERSION := 1_214
UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_TARBALL)
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 3a12454..23a635b 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -1,6 +1,6 @@
--- /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 @@
+@@ -0,0 +1,30 @@
+%targets = (
+
+ "ppc-amigaos" => {
@@ -20,11 +20,12 @@
+ "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",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS -DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=c99",
+ debug => "-O0 -g",
+ release => "-O3 ",
+ threads("-D_REENTRANT")),
+ thread_scheme => "(unknown)",
++ ex_libs => add("-lm -lnet"),
+ sys_id => "AMIGAOS3",
+ bn_ops => "BN_LLONG",
+ ranlib => "m68k-unknown-amigaos-ranlib",
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
new file mode 100644
index 0000000..1d506af
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p
@@ -0,0 +1,36 @@
+--- crypto/bio/b_sock2.c.orig 2017-11-23 12:39:17.912640213 +0000
++++ crypto/bio/b_sock2.c 2017-11-23 12:41:56.350294762 +0000
+@@ -94,6 +94,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 @@
+ return 0;
+ }
+ }
++#endif
+
+ if (connect(sock, BIO_ADDR_sockaddr(addr),
+ BIO_ADDR_sockaddr_size(addr)) == -1) {
+--- crypto/bio/b_sock2.c.orig 2017-11-23 12:43:56.318461652 +0000
++++ crypto/bio/b_sock2.c 2017-11-23 12:44:36.139861658 +0000
+@@ -193,6 +193,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 +201,7 @@
+ return 0;
+ }
+ }
++#endif
+
+ # ifdef IPV6_V6ONLY
+ if ((options & BIO_SOCK_V6_ONLY) && BIO_ADDR_family(addr) == AF_INET6) {
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p
deleted file mode 100644
index 8d3bfc6..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p
+++ /dev/null
@@ -1,12 +0,0 @@
---- crypto/bn/Makefile 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/bn/Makefile 2017-02-11 15:24:31.133017711 +0000
-@@ -60,6 +60,9 @@ lib: $(LIBOBJ)
- $(RANLIB) $(LIB) || echo Never mind.
- @touch lib
-
-+bn_m68k.o: asm/bn_m68k.s
-+ $(CC) $(CFLAGS) -c -o $@ asm/bn_m68k.s
-+
- bn-586.s: asm/bn-586.pl ../perlasm/x86asm.pl
- $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
- co-586.s: asm/co-586.pl ../perlasm/x86asm.pl
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
similarity index 100%
rename from sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p
rename to sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p
deleted file mode 100644
index 623f599..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-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/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p
deleted file mode 100644
index 2caae57..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-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/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p
new file mode 100644
index 0000000..0448499
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p
@@ -0,0 +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 @@
+
+ #endif
+
++#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
++
+ #ifdef TERMIOS
+ # include <termios.h>
+ # define TTY_STRUCT struct termios
diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p
similarity index 100%
copy from sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p
copy to sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
deleted file mode 100644
index 890cef3..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-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_AMIGAOS3)
-+#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_AMIGAOS3)
- /*
- * 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
5 years, 4 months
- 1
- 0
toolchains: branch master updated. a4ddadac3a83348524d120e0332c5f8be5377344
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/a4ddadac3a83348524...
...commit http://git.netsurf-browser.org/toolchains.git/commit/a4ddadac3a83348524d1...
...tree http://git.netsurf-browser.org/toolchains.git/tree/a4ddadac3a83348524d120...
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=a4ddadac3a833485...
commit a4ddadac3a83348524d120e0332c5f8be5377344
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
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
- (preproc=$$$$.$@.S; 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
- (preproc=$$$$.$@.S; 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
5 years, 4 months
- 1
- 0