From 26355374c9e06a34a6f0a51c18f46847fa38570b Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Wed, 25 Oct 2023 13:00:50 +0000 Subject: [PATCH] openssl - update from 3.1.3 to 3.1.4 --- build/openssl/build-3.sh | 2 +- build/openssl/patches-3/libs.patch | 6 +++--- build/openssl/testsuite-3.log | 2 +- doc/packages.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/openssl/build-3.sh b/build/openssl/build-3.sh index f32b0ed9c7..115a982479 100755 --- a/build/openssl/build-3.sh +++ b/build/openssl/build-3.sh @@ -19,7 +19,7 @@ . common.sh PROG=openssl -VER=3.1.3 +VER=3.1.4 PKG=library/security/openssl-3 SUMMARY="Cryptography and SSL/TLS Toolkit" DESC="A toolkit for Secure Sockets Layer and Transport Layer protocols " diff --git a/build/openssl/patches-3/libs.patch b/build/openssl/patches-3/libs.patch index 06600332df..42fb077bd7 100644 --- a/build/openssl/patches-3/libs.patch +++ b/build/openssl/patches-3/libs.patch @@ -17,7 +17,7 @@ debug information which can be converted to CTF. diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a/Configurations/10-main.conf --- a~/Configurations/10-main.conf 1970-01-01 00:00:00 +++ a/Configurations/10-main.conf 1970-01-01 00:00:00 -@@ -210,7 +210,7 @@ my %targets = ( +@@ -213,7 +213,7 @@ my %targets = ( inherit_from => [ "BASE_unix" ], template => 1, lib_cppflags => "-DFILIO_H", @@ -26,7 +26,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a dso_scheme => "dlfcn", thread_scheme => "pthreads", }, -@@ -238,7 +238,7 @@ my %targets = ( +@@ -241,7 +241,7 @@ my %targets = ( CC => "gcc", CFLAGS => add_before(picker(default => "-Wall", debug => "-O0 -g", @@ -35,7 +35,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a cflags => add(threads("-pthread")), lib_cppflags => add("-DL_ENDIAN"), ex_libs => add(threads("-pthread")), -@@ -261,7 +261,7 @@ my %targets = ( +@@ -264,7 +264,7 @@ my %targets = ( CC => "gcc", CFLAGS => add_before(picker(default => "-Wall", debug => "-O0 -g", diff --git a/build/openssl/testsuite-3.log b/build/openssl/testsuite-3.log index 90dce68919..f974a4a863 100644 --- a/build/openssl/testsuite-3.log +++ b/build/openssl/testsuite-3.log @@ -254,5 +254,5 @@ Result: NOTESTS 99-test_fuzz_server.t .............. ok 99-test_fuzz_x509.t ................ ok All tests successful. -Files=252, Tests=3346, +Files=252, Tests=3347, Result: PASS diff --git a/doc/packages.md b/doc/packages.md index 9cbc3ac128..dc7268fb41 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -62,7 +62,7 @@ | library/readline7-patchlvl | 005 | https://ftp.gnu.org/gnu/readline/readline-7.0-patches/ | library/readline8-patchlvl | 002 | https://ftp.gnu.org/gnu/readline/readline-8.1-patches/ | library/security/openssl-11 | 1.1.1w | https://www.openssl.org/source/ -| library/security/openssl-3 | 3.1.3 | https://www.openssl.org/source/ +| library/security/openssl-3 | 3.1.4 | https://www.openssl.org/source/ | library/unixodbc | 2.3.12 | http://www.unixodbc.org/download.html | library/xxhash | 0.8.2 | https://github.com/Cyan4973/xxHash/releases | Currently used solely by rsync | library/zlib | 1.3 | https://www.zlib.net/