https://github.com/openssl/openssl/releases/tag/openssl-3.5.0
* Forward patches with line adjustments. Signed-off-by: Christian Melki <[email protected]> --- .../0001-debian-targets.patch | 0 .../0002-pic.patch | 14 +++++++------- ...llow-to-enable-ktls-if-target-does-not-st.patch | 4 ++-- ...nf-Serialize-allocation-free-of-ssl_names.patch | 0 ...rop-fzero-call-used-regs-used-gpr-from-De.patch | 0 patches/{openssl-3.4.1 => openssl-3.5.0}/series | 0 rules/openssl.make | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename patches/{openssl-3.4.1 => openssl-3.5.0}/0001-debian-targets.patch (100%) rename patches/{openssl-3.4.1 => openssl-3.5.0}/0002-pic.patch (94%) rename patches/{openssl-3.4.1 => openssl-3.5.0}/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch (95%) rename patches/{openssl-3.4.1 => openssl-3.5.0}/0004-conf-Serialize-allocation-free-of-ssl_names.patch (100%) rename patches/{openssl-3.4.1 => openssl-3.5.0}/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch (100%) rename patches/{openssl-3.4.1 => openssl-3.5.0}/series (100%) diff --git a/patches/openssl-3.4.1/0001-debian-targets.patch b/patches/openssl-3.5.0/0001-debian-targets.patch similarity index 100% rename from patches/openssl-3.4.1/0001-debian-targets.patch rename to patches/openssl-3.5.0/0001-debian-targets.patch diff --git a/patches/openssl-3.4.1/0002-pic.patch b/patches/openssl-3.5.0/0002-pic.patch similarity index 94% rename from patches/openssl-3.4.1/0002-pic.patch rename to patches/openssl-3.5.0/0002-pic.patch index 840819211..0978e8fce 100644 --- a/patches/openssl-3.4.1/0002-pic.patch +++ b/patches/openssl-3.5.0/0002-pic.patch @@ -110,10 +110,10 @@ index ef09e0fd297a..fe6ff45d1804 100644 &mov("eax", &DWP($data_off,"esp","",0)); # get return &mov("ebx", &DWP($data_off+4,"esp","",0)); # diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl -index 1b2b27c02286..a62c01b175a2 100644 +index f3c01ea89b4b..2fba3d831c74 100644 --- a/crypto/perlasm/x86gas.pl +++ b/crypto/perlasm/x86gas.pl -@@ -171,6 +171,7 @@ sub ::file_end +@@ -172,6 +172,7 @@ sub ::file_end if ($::macosx) { push (@out,"$tmp,2\n"); } elsif ($::elf) { push (@out,"$tmp,4\n"); } else { push (@out,"$tmp\n"); } @@ -121,7 +121,7 @@ index 1b2b27c02286..a62c01b175a2 100644 } push(@out,$initseg) if ($initseg); if ($::elf) { -@@ -249,8 +250,23 @@ ___ +@@ -250,8 +251,23 @@ ___ elsif ($::elf) { $initseg.=<<___; .section .init @@ -146,7 +146,7 @@ index 1b2b27c02286..a62c01b175a2 100644 elsif ($::coff) { $initseg.=<<___; # applies to both Cygwin and Mingw diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl -index a7bcb27e262d..6688a1fc4464 100644 +index 35e2c5b0a540..282058ce87f3 100644 --- a/crypto/x86cpuid.pl +++ b/crypto/x86cpuid.pl @@ -16,6 +16,8 @@ $output = pop and open STDOUT,">$output"; @@ -158,7 +158,7 @@ index a7bcb27e262d..6688a1fc4464 100644 &function_begin("OPENSSL_ia32_cpuid"); &xor ("edx","edx"); &pushf (); -@@ -161,9 +163,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } +@@ -185,9 +187,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &set_label("nocpuid"); &function_end("OPENSSL_ia32_cpuid"); @@ -169,7 +169,7 @@ index a7bcb27e262d..6688a1fc4464 100644 &xor ("eax","eax"); &xor ("edx","edx"); &picmeup("ecx","OPENSSL_ia32cap_P"); -@@ -177,7 +177,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } +@@ -201,7 +201,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host], # but it's safe to call it on any [supported] 32-bit platform... # Just check for [non-]zero return value... @@ -178,7 +178,7 @@ index a7bcb27e262d..6688a1fc4464 100644 &picmeup("ecx","OPENSSL_ia32cap_P"); &bt (&DWP(0,"ecx"),4); &jnc (&label("nohalt")); # no TSC -@@ -244,7 +244,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } +@@ -268,7 +268,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &ret (); &function_end_B("OPENSSL_far_spin"); diff --git a/patches/openssl-3.4.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch b/patches/openssl-3.5.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch similarity index 95% rename from patches/openssl-3.4.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch rename to patches/openssl-3.5.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch index 0a90f252a..9f941b880 100644 --- a/patches/openssl-3.4.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch +++ b/patches/openssl-3.5.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch @@ -41,10 +41,10 @@ index cba57b41273f..7fa3eeae412f 100644 "linux-latomic" => { inherit_from => [ "linux-generic32" ], diff --git a/Configure b/Configure -index fff97bd6fc82..2f6f7271f94e 100755 +index 15054f94034a..fcb1d4cfefb4 100755 --- a/Configure +++ b/Configure -@@ -1813,7 +1813,7 @@ unless ($disabled{devcryptoeng}) { +@@ -1835,7 +1835,7 @@ unless ($disabled{devcryptoeng}) { unless ($disabled{ktls}) { $config{ktls}=""; my $cc = $config{CROSS_COMPILE}.$config{CC}; diff --git a/patches/openssl-3.4.1/0004-conf-Serialize-allocation-free-of-ssl_names.patch b/patches/openssl-3.5.0/0004-conf-Serialize-allocation-free-of-ssl_names.patch similarity index 100% rename from patches/openssl-3.4.1/0004-conf-Serialize-allocation-free-of-ssl_names.patch rename to patches/openssl-3.5.0/0004-conf-Serialize-allocation-free-of-ssl_names.patch diff --git a/patches/openssl-3.4.1/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch b/patches/openssl-3.5.0/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch similarity index 100% rename from patches/openssl-3.4.1/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch rename to patches/openssl-3.5.0/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch diff --git a/patches/openssl-3.4.1/series b/patches/openssl-3.5.0/series similarity index 100% rename from patches/openssl-3.4.1/series rename to patches/openssl-3.5.0/series diff --git a/rules/openssl.make b/rules/openssl.make index 7ff3f8086..f2e985b58 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl # # Paths and names # -OPENSSL_VERSION := 3.4.1 -OPENSSL_MD5 := fb7a747ac6793a7ad7118eaba45db379 +OPENSSL_VERSION := 3.5.0 +OPENSSL_MD5 := 51da7d2bdf7f4f508cb024f562eb9b03 OPENSSL := openssl-$(OPENSSL_VERSION) OPENSSL_SUFFIX := tar.gz OPENSSL_URL := \ -- 2.34.1
