Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/d0d148d69f449627f42c497fcde429d4206cb682
...commit
http://git.netsurf-browser.org/toolchains.git/commit/d0d148d69f449627f42c497fcde429d4206cb682
...tree
http://git.netsurf-browser.org/toolchains.git/tree/d0d148d69f449627f42c497fcde429d4206cb682
The branch, master has been updated
via d0d148d69f449627f42c497fcde429d4206cb682 (commit)
via 4c5e4ff76a32b246dc81132845578541bd85d38a (commit)
via e36cf51c16ac003c4761e33e968e2e41b931db9a (commit)
via 7cc74041cfbb7a65aa3f040213d67061a80fad23 (commit)
from 6a68f6cf2628d82a5d31f668051d0bb9062ac4ae (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=d0d148d69f449627f42c497fcde429d4206cb682
commit d0d148d69f449627f42c497fcde429d4206cb682
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
libwebp: upgrade to 1.2.2
diff --git a/sdk/Makefile b/sdk/Makefile
index e3bc476..3e2c7fb 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -39,8 +39,7 @@ VERSION_LIBJPEG := 8d
# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.1.3
VERSION_LIBJPEG_TURBO := 1.5.3
# https://developers.google.com/speed/webp/
-# 1.2.2
-VERSION_LIBWEBP := 1.0.3
+VERSION_LIBWEBP := 1.2.2
# https://c-ares.haxx.se/
VERSION_LIBCARES := 1.18.1
# https://curl.haxx.se/
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=4c5e4ff76a32b246dc81132845578541bd85d38a
commit 4c5e4ff76a32b246dc81132845578541bd85d38a
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Update build rules for curl 7.83.1
diff --git a/sdk/Makefile b/sdk/Makefile
index 7fb3486..e3bc476 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -98,7 +98,7 @@ SDK_ITEMS :=
COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libcares.d libcurl.d libexpat.d
-LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps rtsp
telnet gopher tftp pop3 imap smb smtp manual)
+LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps mqtt
rtsp telnet gopher tftp pop3 imap smb smtp manual)
FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config
--cflags) LIBPNG_LDFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --ldflags)
# per target environments
@@ -493,7 +493,7 @@ $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz:
# libcurl
$(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d
- cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS=""
$(LIBCURL_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET)
--host=$(TARGET) --disable-shared --without-libidn ${EXTRAARGS_LIBCURL}
+ cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS=""
$(LIBCURL_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET)
--host=$(TARGET) --disable-shared --with-openssl --without-libidn2
${EXTRAARGS_LIBCURL}
cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install
touch $@
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=e36cf51c16ac003c4761e33e968e2e41b931db9a
commit e36cf51c16ac003c4761e33e968e2e41b931db9a
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
OpenSSL: refresh patches for 1.1.1o
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 3012ad2..53b266e 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2017-10-10 15:19:45.611896396 +0100
+++ Configurations/50-amigaos.conf 2017-10-17 15:42:25.304921197 +0100
@@ -0,0 +1,31 @@
-+%targets = (
++my %targets = (
+
+ "ppc-amigaos" => {
+ inherit_from => [ "BASE_unix", asm("ppc32_asm") ],
diff --git a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
index b5a55dd..d9c51be 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2018-06-01 10:46:49.956110101 +0200
+++ Configurations/50-atari.conf 2018-06-03 03:10:55.000000000 +0200
@@ -0,0 +1,42 @@
-+%targets = (
++my %targets = (
+ "atari-common" => {
+ inherit_from => [ "BASE_unix" ],
+ template => 1,
diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
index 128d400..c05a4ad 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2017-10-10 15:19:45.611896396 +0100
+++ Configurations/50-riscos.conf 2017-10-17 15:42:25.304921197 +0100
@@ -0,0 +1,14 @@
-+%targets = (
++my %targets = (
+
+ "arm-unknown-riscos" => {
+ inherit_from => [ "BASE_unix" ],
diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
index c492c01..6a15f5d 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2017-10-10 15:19:45.611896396 +0100
+++ Configurations/50-windows.conf 2017-10-17 15:42:25.304921197 +0100
@@ -0,0 +1,25 @@
-+%targets = (
++my %targets = (
+
+ "i686-w64-mingw32" => {
+ inherit_from => [ "BASE_unix", asm("x86_asm"),
diff --git a/sdk/recipes/patches/openssl/Configure.p
b/sdk/recipes/patches/openssl/Configure.p
index c26e08b..5a21528 100644
--- a/sdk/recipes/patches/openssl/Configure.p
+++ b/sdk/recipes/patches/openssl/Configure.p
@@ -1,10 +1,10 @@
--- Configure.orig 2017-10-17 14:53:18.369801491 +0100
+++ Configure 2017-10-17 15:11:04.312242542 +0100
-@@ -946,6 +946,7 @@
+@@ -1143,6 +1143,7 @@
$target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
|| $config{target} =~ /^(?:Cygwin|mingw)/);
$target{exe_extension}=".pm" if ($config{target} =~ /vos/);
+$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos");
($target{shared_extension_simple}=$target{shared_extension})
- =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\)||;
+ =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
diff --git a/sdk/recipes/patches/openssl/apps.s_socket.c.p
b/sdk/recipes/patches/openssl/apps.s_socket.c.p
index f4c8e1c..cc6f582 100644
--- a/sdk/recipes/patches/openssl/apps.s_socket.c.p
+++ b/sdk/recipes/patches/openssl/apps.s_socket.c.p
@@ -1,6 +1,6 @@
--- apps/s_socket.c.orig 2019-02-13 18:04:36.643334493 +0000
+++ apps/s_socket.c 2019-02-13 18:04:46.271279170 +0000
-@@ -160,6 +160,7 @@
+@@ -239,6 +239,7 @@
sock_protocol = BIO_ADDRINFO_protocol(res);
sock_address = BIO_ADDRINFO_address(res);
next = BIO_ADDRINFO_next(res);
@@ -8,11 +8,11 @@
if (sock_family == AF_INET6)
sock_options |= BIO_SOCK_V6_ONLY;
if (next != NULL
-@@ -174,6 +175,7 @@
+@@ -257,6 +258,7 @@
sock_options &= ~BIO_SOCK_V6_ONLY;
}
}
+#endif
asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);
- if (asock == INVALID_SOCKET
+ if (asock == INVALID_SOCKET && sock_family_fallback != AF_UNSPEC) {
diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p
b/sdk/recipes/patches/openssl/apps.speed.c.p
index 88ae1c3..20d455e 100644
--- a/sdk/recipes/patches/openssl/apps.speed.c.p
+++ b/sdk/recipes/patches/openssl/apps.speed.c.p
@@ -1,6 +1,6 @@
--- apps/speed.c.orig 2017-11-22 08:07:53.851790744 +0000
+++ apps/speed.c 2017-11-22 08:15:49.608768064 +0000
-@@ -111,6 +111,12 @@
+@@ -99,6 +99,12 @@
#endif
#include <openssl/modes.h>
@@ -11,11 +11,9 @@
+#endif
+
#ifndef HAVE_FORK
- # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+ # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) ||
defined(OPENSSL_SYS_VXWORKS)
# define HAVE_FORK 0
---- apps/speed.c.orig 2017-11-22 08:33:02.137445746 +0000
-+++ apps/speed.c 2017-11-22 08:36:00.833790589 +0000
-@@ -345,8 +345,10 @@
+@@ -220,8 +226,10 @@
static double Time_F(int s)
{
double ret = app_tminterval(s, usertime);
@@ -25,4 +23,4 @@
+ #endif
return ret;
}
- #endif
+
diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p
b/sdk/recipes/patches/openssl/aps.opt.c.p
index 531cf76..7c6bab2 100644
--- a/sdk/recipes/patches/openssl/aps.opt.c.p
+++ b/sdk/recipes/patches/openssl/aps.opt.c.p
@@ -1,6 +1,6 @@
--- apps/opt.c.orig 2017-11-22 08:42:07.605882648 +0000
+++ apps/opt.c 2017-11-22 08:48:31.712843519 +0000
-@@ -353,6 +353,11 @@
+@@ -374,6 +374,11 @@
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
defined(INTMAX_MAX) && defined(UINTMAX_MAX)
diff --git a/sdk/recipes/patches/openssl/bio_lcl.h.p
b/sdk/recipes/patches/openssl/bio_lcl.h.p
deleted file mode 100644
index feae76f..0000000
--- a/sdk/recipes/patches/openssl/bio_lcl.h.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/bio/bio_lcl.h.orig 2017-10-17 16:19:36.908150231 +0100
-+++ crypto/bio/bio_lcl.h 2017-10-17 16:19:52.056631064 +0100
-@@ -36,7 +36,7 @@
- /*
- * 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) || defined(OPENSSL_SYS_AMIGAOS3) ||
defined(OPENSSL_SYS_AMIGAOS4)
- # undef AF_UNIX
- # endif
-
diff --git a/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
new file mode 100644
index 0000000..6caa72f
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
@@ -0,0 +1,11 @@
+--- crypto/bio/bio_local.h.orig 2017-10-17 16:19:36.908150231 +0100
++++ crypto/bio/bio_local.h 2017-10-17 16:19:52.056631064 +0100
+@@ -37,7 +37,7 @@
+ /*
+ * Undefine AF_UNIX on systems that define it but don't support it.
+ */
+-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS)
++# 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.mem_sec.c.p
b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
deleted file mode 100644
index 271d571..0000000
--- a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
+++ /dev/null
@@ -1,16 +0,0 @@
---- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000
-+++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000
-@@ -25,7 +25,12 @@
- #include <string.h>
-
- /* e_os.h includes unistd.h, which defines _POSIX_VERSION */
--#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
-+#if !defined(OPENSSL_NO_SECURE_MEMORY) \
-+ && !defined(OPENSSL_SYS_RISCOS) \
-+ && !defined(OPENSSL_SYS_AMIGAOS3) \
-+ && !defined(OPENSSL_SYS_AMIGAOS4) \
-+ && !defined(OPENSSL_SYS_MINT) \
-+ && defined(OPENSSL_SYS_UNIX) \
- && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
- || defined(__sun) || defined(__hpux) || defined(__sgi) \
- || defined(__osf__) )
diff --git a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
index a4513f2..b517fd8 100644
--- a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
+++ b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
@@ -1,11 +1,12 @@
--- crypto/rand/rand_unix.c.orig 2017-11-22 11:25:03.096636507 +0000
+++ crypto/rand/rand_unix.c 2017-11-22 11:25:52.649406308 +0000
-@@ -15,7 +15,7 @@
- #include <openssl/rand.h>
- #include "rand_lcl.h"
+@@ -122,7 +122,8 @@
--#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) ||
defined(OPENSSL_SYS_UEFI))
-+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) ||
defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) ||
defined(OPENSSL_SYS_AMIGAOS4))
+ #if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) \
+ || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) \
+- || defined(OPENSSL_SYS_UEFI))
++ || defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) \
++ || defined(OPENSSL_SYS_AMIGAOS4))
+
+ # if defined(OPENSSL_SYS_VOS)
- # include <sys/types.h>
- # include <sys/time.h>
diff --git a/sdk/recipes/patches/openssl/e_os.h.p
b/sdk/recipes/patches/openssl/e_os.h.p
new file mode 100644
index 0000000..6c91409
--- /dev/null
+++ b/sdk/recipes/patches/openssl/e_os.h.p
@@ -0,0 +1,16 @@
+--- e_os.h.orig 2019-02-13 14:25:17.725058588 +0000
++++ e_os.h 2019-02-13 14:35:39.790029062 +0000
+@@ -350,7 +350,12 @@
+ # endif
+
+ /* unistd.h defines _POSIX_VERSION */
+-# if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
++# if !defined(OPENSSL_NO_SECURE_MEMORY) \
++ && !defined(OPENSSL_SYS_RISCOS) \
++ && !defined(OPENSSL_SYS_AMIGAOS3) \
++ && !defined(OPENSSL_SYS_AMIGAOS4) \
++ && !defined(OPENSSL_SYS_MINT) \
++ && defined(OPENSSL_SYS_UNIX) \
+ && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
+ || defined(__sun) || defined(__hpux) || defined(__sgi) \
+ || defined(__osf__) )
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=7cc74041cfbb7a65aa3f040213d67061a80fad23
commit 7cc74041cfbb7a65aa3f040213d67061a80fad23
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Bump SDK component versions; use HTTPS
diff --git a/sdk/Makefile b/sdk/Makefile
index de5ec55..7fb3486 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -24,37 +24,41 @@ endif
# Upstream package versions
# https://zlib.net/
-VERSION_ZLIB := 1.2.11
+VERSION_ZLIB := 1.2.12
# https://www.gnu.org/software/libiconv/
-VERSION_LIBICONV := 1.16
+VERSION_LIBICONV := 1.17
# https://laurikari.net/tre/
VERSION_LIBTRE := 0.8.0
# https://www.openssl.org/
-VERSION_OPENSSL := 1.1.0l
+VERSION_OPENSSL := 1.1.1o
# http://www.libpng.org/pub/png/libpng.html
VERSION_LIBPNG := 1.6.37
# http://libjpeg.sourceforge.net/
VERSION_LIBJPEG := 8d
# https://libjpeg-turbo.org/
-# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.0.2
+# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.1.3
VERSION_LIBJPEG_TURBO := 1.5.3
# https://developers.google.com/speed/webp/
+# 1.2.2
VERSION_LIBWEBP := 1.0.3
# https://c-ares.haxx.se/
-VERSION_LIBCARES := 1.15.0
+VERSION_LIBCARES := 1.18.1
# https://curl.haxx.se/
-VERSION_LIBCURL := 7.76.1
+VERSION_LIBCURL := 7.83.1
VERSION_LIBGNURX := 2.5.1
# http://mission-base.com/peter/source/
+# 1.7.0: https://github.com/peterGraf/pbl/releases
VERSION_LIBPBL := 1_04
+# Git-20170304
VERSION_LIBCF := CVS-20130415
# https://github.com/libexpat/libexpat
-VERSION_LIBEXPAT := 2.2.9
-VERSION_LDG := 2.32
+VERSION_LIBEXPAT := 2.4.8
+VERSION_LDG := 2.35
VERSION_WINDOM := 2.0.1
+# https://github.com/berkus/hermes-pixel-format/archive/refs/tags/v1.3.3.tar.gz
VERSION_HERMES := 1.3.3
# https://www.freetype.org/
-VERSION_FREETYPE := 2.10.1
+VERSION_FREETYPE := 2.12.1
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -189,7 +193,7 @@ endif
touch $@
$(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://zlib.net/$(subst
$(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://zlib.net/$(subst
$(SOURCEDIR)/,,$@)" $@
# libiconv
$(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d
@@ -207,7 +211,7 @@ $(BUILDSTEPS)/libiconv-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libiconv-$(
touch $@
$(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $@
# libgnurx
$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
@@ -227,7 +231,7 @@ $(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libgnurx-$(
touch $@
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz"
$@
# atari cf library
$(BUILDSTEPS)/libcf.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcf-src.d
@@ -245,7 +249,7 @@ $(BUILDSTEPS)/libcf-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libcf-$(VERSIO
touch $@
$(SOURCEDIR)/libcf-$(VERSION_LIBCF).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERSION_LIBCF).tar.bz2"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERSION_LIBCF).tar.bz2"
$@
# atari windom library
$(BUILDSTEPS)/windom.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/windom-src.d
@@ -263,7 +267,7 @@ $(BUILDSTEPS)/windom-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/windom-$(VERS
touch $@
$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip"
$@
# atari ldg library
$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
@@ -280,7 +284,7 @@ $(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LD
touch $@
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/ldg/ldg-$(VERSION_LDG).zip" $@
# hermes bitmap lib
$(BUILDSTEPS)/hermes.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/hermes-src.d
@@ -319,7 +323,7 @@ endif
touch $@
$(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.gz"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.gz"
$@
# amiga roadshow sdk
$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d
@@ -348,7 +352,7 @@ $(BUILDSTEPS)/libtre-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/tre-$(VERSION
touch $@
$(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $@
# libpbl
$(BUILDSTEPS)/libpbl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libpbl-src.d
@@ -365,7 +369,7 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/pbl_$(VERSION
touch $@
$(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl-src.d
@@ -391,7 +395,7 @@ endif
# get the openssl source tar
$(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@
# libPNG
$(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/libpng-src.d
@@ -408,7 +412,7 @@ $(BUILDSTEPS)/libpng-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libpng-$(VERS
touch $@
$(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $@
# libjpeg
@@ -427,7 +431,7 @@ $(BUILDSTEPS)/libjpeg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/jpegsrc.v$(V
touch $@
$(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@
# libjpegturbo
@@ -446,7 +450,7 @@ $(BUILDSTEPS)/libjpeg-turbo-src.d:
$(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libjpe
touch $@
$(SOURCEDIR)/libjpeg-turbo-src-$(VERSION_LIBJPEG_TURBO).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://sourceforge.net/projects/libjpeg-turbo/files/$(VERSION_LIBJPEG_TURBO)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO).tar.gz/download"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://sourceforge.net/projects/libjpeg-turbo/files/$(VERSION_LIBJPEG_TURBO)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO).tar.gz/download"
$@
# libwebp
@@ -484,7 +488,7 @@ $(BUILDSTEPS)/libcares-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/c-ares-$(VE
touch $@
$(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
# libcurl
@@ -503,7 +507,7 @@ endif
touch $@
$(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
# libexpat
@@ -518,5 +522,5 @@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/expat-$(VER
touch $@
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/expat-$(VERSION_LIBEXPAT).tar.bz2"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/expat-$(VERSION_LIBEXPAT).tar.bz2"
$@
diff --git a/sdk/fetchsrc b/sdk/fetchsrc
index 46b72b0..56745f5 100755
--- a/sdk/fetchsrc
+++ b/sdk/fetchsrc
@@ -6,7 +6,7 @@ set -x
# Usage fetchsrc <target> <source> <upstream> <output>
-NSSRV="http://ci.netsurf-browser.org/toolchain/";
+NSSRV="https://ci.netsurf-browser.org/toolchain/";
wget -q -O ${4} ${NSSRV}/${1}/${2}
if [ $? -ne 0 ];then
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 59 ++++++++++----------
sdk/fetchsrc | 2 +-
.../openssl/Configurations-50-amigaos.conf.p | 2 +-
.../patches/openssl/Configurations-50-atari.conf.p | 2 +-
.../openssl/Configurations-50-riscos.conf.p | 2 +-
.../openssl/Configurations-50-windows.conf.p | 2 +-
sdk/recipes/patches/openssl/Configure.p | 4 +-
sdk/recipes/patches/openssl/apps.s_socket.c.p | 6 +-
sdk/recipes/patches/openssl/apps.speed.c.p | 10 ++--
sdk/recipes/patches/openssl/aps.opt.c.p | 2 +-
.../{bio_lcl.h.p => crypto.bio.bio_local.h.p} | 6 +-
sdk/recipes/patches/openssl/crypto.mem_sec.c.p | 16 ------
.../patches/openssl/crypto.rand.rand_unix.c.p | 15 ++---
sdk/recipes/patches/openssl/e_os.h.p | 16 ++++++
14 files changed, 73 insertions(+), 71 deletions(-)
rename sdk/recipes/patches/openssl/{bio_lcl.h.p => crypto.bio.bio_local.h.p}
(68%)
delete mode 100644 sdk/recipes/patches/openssl/crypto.mem_sec.c.p
create mode 100644 sdk/recipes/patches/openssl/e_os.h.p
diff --git a/sdk/Makefile b/sdk/Makefile
index de5ec55..3e2c7fb 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -24,37 +24,40 @@ endif
# Upstream package versions
# https://zlib.net/
-VERSION_ZLIB := 1.2.11
+VERSION_ZLIB := 1.2.12
# https://www.gnu.org/software/libiconv/
-VERSION_LIBICONV := 1.16
+VERSION_LIBICONV := 1.17
# https://laurikari.net/tre/
VERSION_LIBTRE := 0.8.0
# https://www.openssl.org/
-VERSION_OPENSSL := 1.1.0l
+VERSION_OPENSSL := 1.1.1o
# http://www.libpng.org/pub/png/libpng.html
VERSION_LIBPNG := 1.6.37
# http://libjpeg.sourceforge.net/
VERSION_LIBJPEG := 8d
# https://libjpeg-turbo.org/
-# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.0.2
+# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.1.3
VERSION_LIBJPEG_TURBO := 1.5.3
# https://developers.google.com/speed/webp/
-VERSION_LIBWEBP := 1.0.3
+VERSION_LIBWEBP := 1.2.2
# https://c-ares.haxx.se/
-VERSION_LIBCARES := 1.15.0
+VERSION_LIBCARES := 1.18.1
# https://curl.haxx.se/
-VERSION_LIBCURL := 7.76.1
+VERSION_LIBCURL := 7.83.1
VERSION_LIBGNURX := 2.5.1
# http://mission-base.com/peter/source/
+# 1.7.0: https://github.com/peterGraf/pbl/releases
VERSION_LIBPBL := 1_04
+# Git-20170304
VERSION_LIBCF := CVS-20130415
# https://github.com/libexpat/libexpat
-VERSION_LIBEXPAT := 2.2.9
-VERSION_LDG := 2.32
+VERSION_LIBEXPAT := 2.4.8
+VERSION_LDG := 2.35
VERSION_WINDOM := 2.0.1
+# https://github.com/berkus/hermes-pixel-format/archive/refs/tags/v1.3.3.tar.gz
VERSION_HERMES := 1.3.3
# https://www.freetype.org/
-VERSION_FREETYPE := 2.10.1
+VERSION_FREETYPE := 2.12.1
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -94,7 +97,7 @@ SDK_ITEMS :=
COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libcares.d libcurl.d libexpat.d
-LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps rtsp
telnet gopher tftp pop3 imap smb smtp manual)
+LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps mqtt
rtsp telnet gopher tftp pop3 imap smb smtp manual)
FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config
--cflags) LIBPNG_LDFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --ldflags)
# per target environments
@@ -189,7 +192,7 @@ endif
touch $@
$(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://zlib.net/$(subst
$(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://zlib.net/$(subst
$(SOURCEDIR)/,,$@)" $@
# libiconv
$(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d
@@ -207,7 +210,7 @@ $(BUILDSTEPS)/libiconv-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libiconv-$(
touch $@
$(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $@
# libgnurx
$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
@@ -227,7 +230,7 @@ $(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libgnurx-$(
touch $@
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz"
$@
# atari cf library
$(BUILDSTEPS)/libcf.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcf-src.d
@@ -245,7 +248,7 @@ $(BUILDSTEPS)/libcf-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libcf-$(VERSIO
touch $@
$(SOURCEDIR)/libcf-$(VERSION_LIBCF).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERSION_LIBCF).tar.bz2"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERSION_LIBCF).tar.bz2"
$@
# atari windom library
$(BUILDSTEPS)/windom.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/windom-src.d
@@ -263,7 +266,7 @@ $(BUILDSTEPS)/windom-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/windom-$(VERS
touch $@
$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip"
$@
# atari ldg library
$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
@@ -280,7 +283,7 @@ $(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LD
touch $@
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/ldg/ldg-$(VERSION_LDG).zip" $@
# hermes bitmap lib
$(BUILDSTEPS)/hermes.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/hermes-src.d
@@ -319,7 +322,7 @@ endif
touch $@
$(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.gz"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.gz"
$@
# amiga roadshow sdk
$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d
@@ -348,7 +351,7 @@ $(BUILDSTEPS)/libtre-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/tre-$(VERSION
touch $@
$(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $@
# libpbl
$(BUILDSTEPS)/libpbl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libpbl-src.d
@@ -365,7 +368,7 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/pbl_$(VERSION
touch $@
$(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl-src.d
@@ -391,7 +394,7 @@ endif
# get the openssl source tar
$(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@
# libPNG
$(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/libpng-src.d
@@ -408,7 +411,7 @@ $(BUILDSTEPS)/libpng-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libpng-$(VERS
touch $@
$(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $@
# libjpeg
@@ -427,7 +430,7 @@ $(BUILDSTEPS)/libjpeg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/jpegsrc.v$(V
touch $@
$(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@
# libjpegturbo
@@ -446,7 +449,7 @@ $(BUILDSTEPS)/libjpeg-turbo-src.d:
$(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libjpe
touch $@
$(SOURCEDIR)/libjpeg-turbo-src-$(VERSION_LIBJPEG_TURBO).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://sourceforge.net/projects/libjpeg-turbo/files/$(VERSION_LIBJPEG_TURBO)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO).tar.gz/download"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://sourceforge.net/projects/libjpeg-turbo/files/$(VERSION_LIBJPEG_TURBO)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO).tar.gz/download"
$@
# libwebp
@@ -484,12 +487,12 @@ $(BUILDSTEPS)/libcares-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/c-ares-$(VE
touch $@
$(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
# libcurl
$(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d
- cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS=""
$(LIBCURL_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET)
--host=$(TARGET) --disable-shared --without-libidn ${EXTRAARGS_LIBCURL}
+ cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS=""
$(LIBCURL_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET)
--host=$(TARGET) --disable-shared --with-openssl --without-libidn2
${EXTRAARGS_LIBCURL}
cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install
touch $@
@@ -503,7 +506,7 @@ endif
touch $@
$(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
# libexpat
@@ -518,5 +521,5 @@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/expat-$(VER
touch $@
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/expat-$(VERSION_LIBEXPAT).tar.bz2"
$@
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/expat-$(VERSION_LIBEXPAT).tar.bz2"
$@
diff --git a/sdk/fetchsrc b/sdk/fetchsrc
index 46b72b0..56745f5 100755
--- a/sdk/fetchsrc
+++ b/sdk/fetchsrc
@@ -6,7 +6,7 @@ set -x
# Usage fetchsrc <target> <source> <upstream> <output>
-NSSRV="http://ci.netsurf-browser.org/toolchain/";
+NSSRV="https://ci.netsurf-browser.org/toolchain/";
wget -q -O ${4} ${NSSRV}/${1}/${2}
if [ $? -ne 0 ];then
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 3012ad2..53b266e 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2017-10-10 15:19:45.611896396 +0100
+++ Configurations/50-amigaos.conf 2017-10-17 15:42:25.304921197 +0100
@@ -0,0 +1,31 @@
-+%targets = (
++my %targets = (
+
+ "ppc-amigaos" => {
+ inherit_from => [ "BASE_unix", asm("ppc32_asm") ],
diff --git a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
index b5a55dd..d9c51be 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2018-06-01 10:46:49.956110101 +0200
+++ Configurations/50-atari.conf 2018-06-03 03:10:55.000000000 +0200
@@ -0,0 +1,42 @@
-+%targets = (
++my %targets = (
+ "atari-common" => {
+ inherit_from => [ "BASE_unix" ],
+ template => 1,
diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
index 128d400..c05a4ad 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2017-10-10 15:19:45.611896396 +0100
+++ Configurations/50-riscos.conf 2017-10-17 15:42:25.304921197 +0100
@@ -0,0 +1,14 @@
-+%targets = (
++my %targets = (
+
+ "arm-unknown-riscos" => {
+ inherit_from => [ "BASE_unix" ],
diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
index c492c01..6a15f5d 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p
@@ -1,7 +1,7 @@
--- /dev/null 2017-10-10 15:19:45.611896396 +0100
+++ Configurations/50-windows.conf 2017-10-17 15:42:25.304921197 +0100
@@ -0,0 +1,25 @@
-+%targets = (
++my %targets = (
+
+ "i686-w64-mingw32" => {
+ inherit_from => [ "BASE_unix", asm("x86_asm"),
diff --git a/sdk/recipes/patches/openssl/Configure.p
b/sdk/recipes/patches/openssl/Configure.p
index c26e08b..5a21528 100644
--- a/sdk/recipes/patches/openssl/Configure.p
+++ b/sdk/recipes/patches/openssl/Configure.p
@@ -1,10 +1,10 @@
--- Configure.orig 2017-10-17 14:53:18.369801491 +0100
+++ Configure 2017-10-17 15:11:04.312242542 +0100
-@@ -946,6 +946,7 @@
+@@ -1143,6 +1143,7 @@
$target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
|| $config{target} =~ /^(?:Cygwin|mingw)/);
$target{exe_extension}=".pm" if ($config{target} =~ /vos/);
+$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos");
($target{shared_extension_simple}=$target{shared_extension})
- =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\)||;
+ =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
diff --git a/sdk/recipes/patches/openssl/apps.s_socket.c.p
b/sdk/recipes/patches/openssl/apps.s_socket.c.p
index f4c8e1c..cc6f582 100644
--- a/sdk/recipes/patches/openssl/apps.s_socket.c.p
+++ b/sdk/recipes/patches/openssl/apps.s_socket.c.p
@@ -1,6 +1,6 @@
--- apps/s_socket.c.orig 2019-02-13 18:04:36.643334493 +0000
+++ apps/s_socket.c 2019-02-13 18:04:46.271279170 +0000
-@@ -160,6 +160,7 @@
+@@ -239,6 +239,7 @@
sock_protocol = BIO_ADDRINFO_protocol(res);
sock_address = BIO_ADDRINFO_address(res);
next = BIO_ADDRINFO_next(res);
@@ -8,11 +8,11 @@
if (sock_family == AF_INET6)
sock_options |= BIO_SOCK_V6_ONLY;
if (next != NULL
-@@ -174,6 +175,7 @@
+@@ -257,6 +258,7 @@
sock_options &= ~BIO_SOCK_V6_ONLY;
}
}
+#endif
asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);
- if (asock == INVALID_SOCKET
+ if (asock == INVALID_SOCKET && sock_family_fallback != AF_UNSPEC) {
diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p
b/sdk/recipes/patches/openssl/apps.speed.c.p
index 88ae1c3..20d455e 100644
--- a/sdk/recipes/patches/openssl/apps.speed.c.p
+++ b/sdk/recipes/patches/openssl/apps.speed.c.p
@@ -1,6 +1,6 @@
--- apps/speed.c.orig 2017-11-22 08:07:53.851790744 +0000
+++ apps/speed.c 2017-11-22 08:15:49.608768064 +0000
-@@ -111,6 +111,12 @@
+@@ -99,6 +99,12 @@
#endif
#include <openssl/modes.h>
@@ -11,11 +11,9 @@
+#endif
+
#ifndef HAVE_FORK
- # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+ # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) ||
defined(OPENSSL_SYS_VXWORKS)
# define HAVE_FORK 0
---- apps/speed.c.orig 2017-11-22 08:33:02.137445746 +0000
-+++ apps/speed.c 2017-11-22 08:36:00.833790589 +0000
-@@ -345,8 +345,10 @@
+@@ -220,8 +226,10 @@
static double Time_F(int s)
{
double ret = app_tminterval(s, usertime);
@@ -25,4 +23,4 @@
+ #endif
return ret;
}
- #endif
+
diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p
b/sdk/recipes/patches/openssl/aps.opt.c.p
index 531cf76..7c6bab2 100644
--- a/sdk/recipes/patches/openssl/aps.opt.c.p
+++ b/sdk/recipes/patches/openssl/aps.opt.c.p
@@ -1,6 +1,6 @@
--- apps/opt.c.orig 2017-11-22 08:42:07.605882648 +0000
+++ apps/opt.c 2017-11-22 08:48:31.712843519 +0000
-@@ -353,6 +353,11 @@
+@@ -374,6 +374,11 @@
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
defined(INTMAX_MAX) && defined(UINTMAX_MAX)
diff --git a/sdk/recipes/patches/openssl/bio_lcl.h.p
b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
similarity index 68%
rename from sdk/recipes/patches/openssl/bio_lcl.h.p
rename to sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
index feae76f..6caa72f 100644
--- a/sdk/recipes/patches/openssl/bio_lcl.h.p
+++ b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p
@@ -1,6 +1,6 @@
---- crypto/bio/bio_lcl.h.orig 2017-10-17 16:19:36.908150231 +0100
-+++ crypto/bio/bio_lcl.h 2017-10-17 16:19:52.056631064 +0100
-@@ -36,7 +36,7 @@
+--- crypto/bio/bio_local.h.orig 2017-10-17 16:19:36.908150231 +0100
++++ crypto/bio/bio_local.h 2017-10-17 16:19:52.056631064 +0100
+@@ -37,7 +37,7 @@
/*
* Undefine AF_UNIX on systems that define it but don't support it.
*/
diff --git a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
deleted file mode 100644
index 271d571..0000000
--- a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
+++ /dev/null
@@ -1,16 +0,0 @@
---- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000
-+++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000
-@@ -25,7 +25,12 @@
- #include <string.h>
-
- /* e_os.h includes unistd.h, which defines _POSIX_VERSION */
--#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
-+#if !defined(OPENSSL_NO_SECURE_MEMORY) \
-+ && !defined(OPENSSL_SYS_RISCOS) \
-+ && !defined(OPENSSL_SYS_AMIGAOS3) \
-+ && !defined(OPENSSL_SYS_AMIGAOS4) \
-+ && !defined(OPENSSL_SYS_MINT) \
-+ && defined(OPENSSL_SYS_UNIX) \
- && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
- || defined(__sun) || defined(__hpux) || defined(__sgi) \
- || defined(__osf__) )
diff --git a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
index a4513f2..b517fd8 100644
--- a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
+++ b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p
@@ -1,11 +1,12 @@
--- crypto/rand/rand_unix.c.orig 2017-11-22 11:25:03.096636507 +0000
+++ crypto/rand/rand_unix.c 2017-11-22 11:25:52.649406308 +0000
-@@ -15,7 +15,7 @@
- #include <openssl/rand.h>
- #include "rand_lcl.h"
+@@ -122,7 +122,8 @@
--#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) ||
defined(OPENSSL_SYS_UEFI))
-+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) ||
defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) ||
defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) ||
defined(OPENSSL_SYS_AMIGAOS4))
+ #if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) \
+ || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) \
+- || defined(OPENSSL_SYS_UEFI))
++ || defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) \
++ || defined(OPENSSL_SYS_AMIGAOS4))
+
+ # if defined(OPENSSL_SYS_VOS)
- # include <sys/types.h>
- # include <sys/time.h>
diff --git a/sdk/recipes/patches/openssl/e_os.h.p
b/sdk/recipes/patches/openssl/e_os.h.p
new file mode 100644
index 0000000..6c91409
--- /dev/null
+++ b/sdk/recipes/patches/openssl/e_os.h.p
@@ -0,0 +1,16 @@
+--- e_os.h.orig 2019-02-13 14:25:17.725058588 +0000
++++ e_os.h 2019-02-13 14:35:39.790029062 +0000
+@@ -350,7 +350,12 @@
+ # endif
+
+ /* unistd.h defines _POSIX_VERSION */
+-# if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
++# if !defined(OPENSSL_NO_SECURE_MEMORY) \
++ && !defined(OPENSSL_SYS_RISCOS) \
++ && !defined(OPENSSL_SYS_AMIGAOS3) \
++ && !defined(OPENSSL_SYS_AMIGAOS4) \
++ && !defined(OPENSSL_SYS_MINT) \
++ && defined(OPENSSL_SYS_UNIX) \
+ && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
+ || defined(__sun) || defined(__hpux) || defined(__sgi) \
+ || defined(__osf__) )
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
