@@ -15,7 +15,7 @@ diff --git a/crypto/build.info b/crypto/build.info
index 2c619c6..49ca6ab 100644
--- a/crypto/build.info
+++ b/crypto/build.info
-@@ -111,7 +111,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
+@@ -115,7 +115,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
DEPEND[info.o]=buildinf.h
DEPEND[cversion.o]=buildinf.h
@@ -21,9 +21,9 @@ diff --git a/Configure b/Configure
index 5a699836f3..f9152b1702 100755
--- a/Configure
+++ b/Configure
-@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX}
- ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
- : ();
+@@ -1549,6 +1549,10 @@ unless ($disabled{asm}) {
+ }
+ }
+if ($target eq "linux-ppc64" && !$disabled{asm}) {
+ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
@@ -31,7 +31,7 @@ index 5a699836f3..f9152b1702 100755
+
# Check for makedepend capabilities.
if (!$disabled{makedepend}) {
- if ($config{target} =~ /^(VC|vms)-/) {
+ # If the attribute makedep_scheme is defined, then we assume that the
--
2.25.0
@@ -16,7 +16,7 @@ diff --git a/Configure b/Configure
index 2c17f4186b..94cab4c3c4 100755
--- a/Configure
+++ b/Configure
-@@ -1438,10 +1438,6 @@ foreach (keys %useradd) {
+@@ -1377,10 +1377,6 @@ foreach (keys %useradd) {
# At this point, we can forget everything about %user and %useradd,
# because it's now all been merged into the corresponding $config entry
@@ -27,7 +27,7 @@ index 2c17f4186b..94cab4c3c4 100755
# Allow overriding the build file name
$config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
-@@ -1728,6 +1724,10 @@ if ($strict_warnings)
+@@ -1671,6 +1667,10 @@ if ($strict_warnings)
}
}
@@ -14,7 +14,7 @@ diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 2200a85b16..bcf54a2a53 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
-@@ -861,6 +861,10 @@ my %targets = (
+@@ -868,6 +868,10 @@ my %targets = (
asm_arch => 'x86',
perlasm_scheme => "elf",
},
@@ -1,5 +1,5 @@
-# From https://www.openssl.org/source/openssl-3.0.10.tar.gz.sha256
-sha256 1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323 openssl-3.0.10.tar.gz
+# From https://www.openssl.org/source/openssl-3.1.2.tar.gz.sha256
+sha256 a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 openssl-3.1.2.tar.gz
# License files
sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt
@@ -4,7 +4,7 @@
#
################################################################################
-LIBOPENSSL_VERSION = 3.0.10
+LIBOPENSSL_VERSION = 3.1.2
LIBOPENSSL_SITE = https://www.openssl.org/source
LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
LIBOPENSSL_LICENSE = Apache-2.0
Signed-off-by: Adam Duskett <aduskett@gmail.com> --- ...002-Reproducible-build-do-not-leak-compiler-path.patch | 2 +- ...igure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch | 8 ++++---- package/libopenssl/0005-Revert-Fix-static-builds.patch | 4 ++-- .../libopenssl/0006-Add-linux-x86-latomic-target.patch | 2 +- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)