Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl - update from 3.0.11 to 3.0.12 (r151046) #3383

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/openssl/build-3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
. common.sh

PROG=openssl
VER=3.0.11
VER=3.0.12
PKG=library/security/openssl-3
SUMMARY="Cryptography and SSL/TLS Toolkit"
DESC="A toolkit for Secure Sockets Layer and Transport Layer protocols "
Expand Down
2 changes: 1 addition & 1 deletion build/openssl/patches-3/cross-aarch64.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/15-illumos-aarch.conf a/Configurations/15-illumos-aarch.conf
diff -wpruN '--exclude=*.orig' a~/Configurations/15-illumos-aarch.conf a/Configurations/15-illumos-aarch.conf
--- a~/Configurations/15-illumos-aarch.conf 1970-01-01 00:00:00
+++ a/Configurations/15-illumos-aarch.conf 1970-01-01 00:00:00
@@ -0,0 +1,17 @@
Expand Down
8 changes: 4 additions & 4 deletions build/openssl/patches-3/libs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ patch the configuration script to stop linking against these two libraries.
We also patch out the desire to omit the frame pointer and add in dwarf-2
debug information which can be converted to CTF.

diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a/Configurations/10-main.conf
diff -wpruN '--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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion build/openssl/testsuite-3.log
Original file line number Diff line number Diff line change
Expand Up @@ -252,5 +252,5 @@ Result: NOTESTS
99-test_fuzz_server.t .............. ok
99-test_fuzz_x509.t ................ ok
All tests successful.
Files=250, Tests=3327,
Files=250, Tests=3328,
Result: PASS
Loading