Thanks, applied as d8c20628dda675405aaef71781fd59b2a7354a35. Michael
[sent from post-receive hook] On Mon, 10 Jun 2024 21:41:37 +0200, Christian Melki <[email protected]> wrote: > Looks mostly like minor changes. > https://www.openssl.org/news/cl33.txt > > * Forward patchset, minor adjustment for offsets. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/openssl-3.2.1/0001-debian-targets.patch > b/patches/openssl-3.3.0/0001-debian-targets.patch > similarity index 100% > rename from patches/openssl-3.2.1/0001-debian-targets.patch > rename to patches/openssl-3.3.0/0001-debian-targets.patch > diff --git a/patches/openssl-3.2.1/0002-pic.patch > b/patches/openssl-3.3.0/0002-pic.patch > similarity index 100% > rename from patches/openssl-3.2.1/0002-pic.patch > rename to patches/openssl-3.3.0/0002-pic.patch > diff --git > a/patches/openssl-3.2.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > > b/patches/openssl-3.3.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > similarity index 93% > rename from > patches/openssl-3.2.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > rename to > patches/openssl-3.3.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > index 6b518ef22d49..0c49d752ece0 100644 > --- > a/patches/openssl-3.2.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > +++ > b/patches/openssl-3.3.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > @@ -28,7 +28,7 @@ Signed-off-by: Michael Olbrich <[email protected]> > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf > -index 2a047caa7d4a..aa2685be93b9 100644 > +index c9db9aac28eb..d5ea4737494f 100644 > --- a/Configurations/10-main.conf > +++ b/Configurations/10-main.conf > @@ -693,7 +693,7 @@ my %targets = ( > @@ -41,10 +41,10 @@ index 2a047caa7d4a..aa2685be93b9 100644 > "linux-latomic" => { > inherit_from => [ "linux-generic32" ], > diff --git a/Configure b/Configure > -index cca1ac8d162e..c9bbcbbed3e6 100755 > +index 3b6617c17719..eeb36812ae0f 100755 > --- a/Configure > +++ b/Configure > -@@ -1765,7 +1765,7 @@ unless ($disabled{devcryptoeng}) { > +@@ -1778,7 +1778,7 @@ unless ($disabled{devcryptoeng}) { > unless ($disabled{ktls}) { > $config{ktls}=""; > my $cc = $config{CROSS_COMPILE}.$config{CC}; > diff --git > a/patches/openssl-3.2.1/0004-conf-Serialize-allocation-free-of-ssl_names.patch > > b/patches/openssl-3.3.0/0004-conf-Serialize-allocation-free-of-ssl_names.patch > similarity index 100% > rename from > patches/openssl-3.2.1/0004-conf-Serialize-allocation-free-of-ssl_names.patch > rename to > patches/openssl-3.3.0/0004-conf-Serialize-allocation-free-of-ssl_names.patch > diff --git > a/patches/openssl-3.2.1/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > > b/patches/openssl-3.3.0/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > similarity index 100% > rename from > patches/openssl-3.2.1/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > rename to > patches/openssl-3.3.0/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > diff --git a/patches/openssl-3.2.1/series b/patches/openssl-3.3.0/series > similarity index 100% > rename from patches/openssl-3.2.1/series > rename to patches/openssl-3.3.0/series > diff --git a/rules/openssl.make b/rules/openssl.make > index fbc6424e0c56..8ce6661cc037 100644 > --- a/rules/openssl.make > +++ b/rules/openssl.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl > # > # Paths and names > # > -OPENSSL_VERSION := 3.2.1 > -OPENSSL_MD5 := c239213887804ba00654884918b37441 > +OPENSSL_VERSION := 3.3.0 > +OPENSSL_MD5 := c8b063afbea85d867e161ecb8816cfa9 > OPENSSL := openssl-$(OPENSSL_VERSION) > OPENSSL_SUFFIX := tar.gz > OPENSSL_URL := \
