Thanks, applied as 6aeb9adc04a4c44b7cc59567e21de1f870827e42.
Michael
[sent from post-receive hook]
On Thu, 08 Feb 2024 17:02:55 +0100, Steffen Trumtrar
<s.trumt...@pengutronix.de> wrote:
> Signed-off-by: Steffen Trumtrar <s.trumt...@pengutronix.de>
> Message-Id:
> <20240122-v2024-01-0-topic-openssl-v1-1-88a1234c0...@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
>
> diff --git a/patches/openssl-3.1.4/0001-debian-targets.patch
> b/patches/openssl-3.2.0/0001-debian-targets.patch
> similarity index 100%
> rename from patches/openssl-3.1.4/0001-debian-targets.patch
> rename to patches/openssl-3.2.0/0001-debian-targets.patch
> diff --git a/patches/openssl-3.1.4/0002-pic.patch
> b/patches/openssl-3.2.0/0002-pic.patch
> similarity index 100%
> rename from patches/openssl-3.1.4/0002-pic.patch
> rename to patches/openssl-3.2.0/0002-pic.patch
> diff --git
> a/patches/openssl-3.1.4/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
>
> b/patches/openssl-3.2.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> similarity index 92%
> rename from
> patches/openssl-3.1.4/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> rename to
> patches/openssl-3.2.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> index 60e2da3efec3..6275de7089d7 100644
> ---
> a/patches/openssl-3.1.4/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> +++
> b/patches/openssl-3.2.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> @@ -28,10 +28,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
> -index aedfa370ca15..dfc3a431559a 100644
> +index d1a15a115274..d15d28499a21 100644
> --- a/Configurations/10-main.conf
> +++ b/Configurations/10-main.conf
> -@@ -700,7 +700,7 @@ my %targets = (
> +@@ -693,7 +693,7 @@ my %targets = (
> shared_target => "linux-shared",
> shared_cflag => "-fPIC",
> shared_ldflag => sub { $disabled{pinshared} ? () :
> "-Wl,-znodelete" },
> @@ -41,10 +41,10 @@ index aedfa370ca15..dfc3a431559a 100644
> "linux-latomic" => {
> inherit_from => [ "linux-generic32" ],
> diff --git a/Configure b/Configure
> -index 227e5daea228..e1531d59e517 100755
> +index cbba1749b5a3..a69068121949 100755
> --- a/Configure
> +++ b/Configure
> -@@ -1699,7 +1699,7 @@ unless ($disabled{devcryptoeng}) {
> +@@ -1765,7 +1765,7 @@ unless ($disabled{devcryptoeng}) {
> unless ($disabled{ktls}) {
> $config{ktls}="";
> my $cc = $config{CROSS_COMPILE}.$config{CC};
> diff --git
> a/patches/openssl-3.1.4/0004-conf-Serialize-allocation-free-of-ssl_names.patch
>
> b/patches/openssl-3.2.0/0004-conf-Serialize-allocation-free-of-ssl_names.patch
> similarity index 100%
> rename from
> patches/openssl-3.1.4/0004-conf-Serialize-allocation-free-of-ssl_names.patch
> rename to
> patches/openssl-3.2.0/0004-conf-Serialize-allocation-free-of-ssl_names.patch
> diff --git
> a/patches/openssl-3.1.4/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
>
> b/patches/openssl-3.2.0/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
> similarity index 100%
> rename from
> patches/openssl-3.1.4/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
> rename to
> patches/openssl-3.2.0/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
> diff --git a/patches/openssl-3.1.4/series b/patches/openssl-3.2.0/series
> similarity index 100%
> rename from patches/openssl-3.1.4/series
> rename to patches/openssl-3.2.0/series
> diff --git a/rules/openssl.make b/rules/openssl.make
> index 4e03c95aab89..6e7111c70bab 100644
> --- a/rules/openssl.make
> +++ b/rules/openssl.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
> #
> # Paths and names
> #
> -OPENSSL_VERSION := 3.1.4
> -OPENSSL_MD5 := 653ad58812c751b887e8ec37e02bba70
> +OPENSSL_VERSION := 3.2.0
> +OPENSSL_MD5 := 7903549a14abebc5c323ce4e85f2cbb2
> OPENSSL := openssl-$(OPENSSL_VERSION)
> OPENSSL_SUFFIX := tar.gz
> OPENSSL_URL := \
