mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] openssl: Version bump. 3.2.1 -> 3.3
@ 2024-05-29 20:42 Christian Melki
  2024-06-10 19:41 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2024-05-29 20:42 UTC (permalink / raw)
  To: ptxdist

Looks mostly like minor changes.
https://www.openssl.org/news/cl33.txt

* Forward patchset, minor adjustment for offsets.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0001-debian-targets.patch                               | 0
 patches/{openssl-3.2.1 => openssl-3.3.0}/0002-pic.patch     | 0
 ...nfigure-allow-to-enable-ktls-if-target-does-not-st.patch | 6 +++---
 .../0004-conf-Serialize-allocation-free-of-ssl_names.patch  | 0
 ...nfigure-drop-fzero-call-used-regs-used-gpr-from-De.patch | 0
 patches/{openssl-3.2.1 => openssl-3.3.0}/series             | 0
 rules/openssl.make                                          | 4 ++--
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename patches/{openssl-3.2.1 => openssl-3.3.0}/0001-debian-targets.patch (100%)
 rename patches/{openssl-3.2.1 => openssl-3.3.0}/0002-pic.patch (100%)
 rename patches/{openssl-3.2.1 => openssl-3.3.0}/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch (93%)
 rename patches/{openssl-3.2.1 => openssl-3.3.0}/0004-conf-Serialize-allocation-free-of-ssl_names.patch (100%)
 rename patches/{openssl-3.2.1 => openssl-3.3.0}/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch (100%)
 rename patches/{openssl-3.2.1 => openssl-3.3.0}/series (100%)

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 6b518ef22..0c49d752e 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 <m.olbrich@pengutronix.de>
  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 fbc6424e0..8ce6661cc 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		:= \
-- 
2.34.1




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] openssl: Version bump. 3.2.1 -> 3.3
  2024-05-29 20:42 [ptxdist] [PATCH] openssl: Version bump. 3.2.1 -> 3.3 Christian Melki
@ 2024-06-10 19:41 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-06-10 19:41 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki

Thanks, applied as d8c20628dda675405aaef71781fd59b2a7354a35.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:37 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Looks mostly like minor changes.
> https://www.openssl.org/news/cl33.txt
> 
> * Forward patchset, minor adjustment for offsets.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240529204235.3473434-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 <m.olbrich@pengutronix.de>
>   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		:= \



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-06-10 19:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-29 20:42 [ptxdist] [PATCH] openssl: Version bump. 3.2.1 -> 3.3 Christian Melki
2024-06-10 19:41 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox