From 21997a5b5d1ea6a29727b947f39e88fc3c8d3119 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 17 Oct 2017 21:23:02 +0100 Subject: update openssl to 1.1.0f --- sdk/Makefile | 2 +- .../openssl/Configurations-50-riscos.conf.p | 17 ++++++++++++ sdk/recipes/patches/openssl/Configure.p | 32 ++++++---------------- sdk/recipes/patches/openssl/bio_lcl.h.p | 11 ++++++++ sdk/recipes/patches/openssl/mem_sec.c.p | 11 ++++++++ 5 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p create mode 100644 sdk/recipes/patches/openssl/bio_lcl.h.p create mode 100644 sdk/recipes/patches/openssl/mem_sec.c.p diff --git a/sdk/Makefile b/sdk/Makefile index 863009b..c224176 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -26,7 +26,7 @@ endif VERSION_ZLIB := 1.2.11 VERSION_LIBICONV := 1.15 VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.0.2k +VERSION_OPENSSL := 1.1.0f VERSION_LIBPNG := 1.6.29 VERSION_LIBJPEG := 8d VERSION_LIBJPEG_TURBO := 1.5.1 diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p new file mode 100644 index 0000000..128d400 --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p @@ -0,0 +1,17 @@ +--- /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 = ( ++ ++ "arm-unknown-riscos" => { ++ inherit_from => [ "BASE_unix" ], ++ cc => "arm-unknown-riscos-gcc", ++ cflags => picker(default => "-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H", ++ debug => "-O0 -g", ++ release => "-O3 ", ++ threads("-D_REENTRANT")), ++ thread_scheme => "(unknown)", ++ sys_id => "RISCOS", ++ bn_ops => "BN_LLONG", ++ }, ++); diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index 3347adf..c26e08b 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,24 +1,10 @@ ---- Configure.old 2010-12-29 02:43:14.000000000 +0000 -+++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -440,6 +440,13 @@ - "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", - "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", +--- Configure.orig 2017-10-17 14:53:18.369801491 +0100 ++++ Configure 2017-10-17 15:11:04.312242542 +0100 +@@ -946,6 +946,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"); -+"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::echo", -+"m68k-atari-mint","m68k-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -m68020 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::bn_m68k.o::::::::::::::::::m68k-atari-mint-ranlib", -+"m5475-atari-mint","m5475-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m5475-atari-mint-ranlib", -+"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS3 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -m68020 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnet -lm:BN_LLONG::bn_m68k.o::::::::::::::::::m68k-unknown-amigaos-ranlib", -+"ppc-amigaos","ppc-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS4 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK:${ppc32_asm}:linux32::::::ppc-amigaos-ranlib", -+"i686-w64-mingw32", "gcc:-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a", -+ - #### SCO/Caldera targets. - # - # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. -@@ -1123,6 +1130,7 @@ - my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; - - $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); -+$exe_ext=",e1f" if ($target eq "arm-unknown-riscos"); - $exe_ext=".nlm" if ($target =~ /netware/); - $exe_ext=".pm" if ($target =~ /vos/); - $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); + ($target{shared_extension_simple}=$target{shared_extension}) + =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\)||; diff --git a/sdk/recipes/patches/openssl/bio_lcl.h.p b/sdk/recipes/patches/openssl/bio_lcl.h.p new file mode 100644 index 0000000..c920bbb --- /dev/null +++ b/sdk/recipes/patches/openssl/bio_lcl.h.p @@ -0,0 +1,11 @@ +--- 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) + # undef AF_UNIX + # endif + diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p b/sdk/recipes/patches/openssl/mem_sec.c.p new file mode 100644 index 0000000..3ec0ef4 --- /dev/null +++ b/sdk/recipes/patches/openssl/mem_sec.c.p @@ -0,0 +1,11 @@ +--- crypto/mem_sec.c.orig 2017-10-17 16:46:24.923285526 +0100 ++++ crypto/mem_sec.c 2017-10-17 16:48:00.358325267 +0100 +@@ -24,7 +24,7 @@ + + #include + +-#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) ++#if ! defined(OPENSSL_SYS_RISCOS) && (defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)) + # define IMPLEMENTED + # include + # include -- cgit v1.2.3