up to 3.2.1 (fixes CVE-2024-0727 CVE-2023-6237 CVE-2023-6129 CVE-2023-5678)

diff --git a/duplicate-symbols-test.patch b/duplicate-symbols-test.patch
deleted file mode 100644 (file)
index db8a316..0000000
--- a/duplicate-symbols-test.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 38cf48b3044749fd5b37e36e5d9b2dc9fe7056ff Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Thu, 30 Nov 2023 08:48:33 +0100
-Subject: [PATCH 1/3] test/recipes/01-test_symbol_presence.t: Ignore symbols
- starting with '__'
-
-On some platforms, the compiler may add symbols that aren't ours and that we
-should ignore.
-
-They are generally expected to start with a double underscore, and thereby
-easy to detect.
-
-Fixes #22869 (partially)
----
- test/recipes/01-test_symbol_presence.t | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
-index 9efa9f8d2d6eb..66e5669e193c7 100644
---- a/test/recipes/01-test_symbol_presence.t
-+++ b/test/recipes/01-test_symbol_presence.t
-@@ -124,7 +124,13 @@ foreach (sort keys %stlibname) {
-                 # Return the result
-                 $_
-             }
--            grep(m|.* [BCDST] .*|, @$_);
-+            # Drop any symbol starting with a double underscore, they
-+            # are reserved for the compiler / system ABI and are none
-+            # of our business
-+            grep !m|^__|,
-+            # Only look at external definitions
-+            grep m|.* [BCDST] .*|,
-+            @$_ ),
-     }
- 
-     # Massage the mkdef.pl output to only contain global symbols
-
-From feead62eb7873c6a8a95e75ad5ca3ac7b9ed8bcd Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Thu, 30 Nov 2023 09:02:25 +0100
-Subject: [PATCH 2/3] test/recipes/01-test_symbol_presence.t: Treat common
- symbols specially
-
-Common symbols (type 'C' in the 'nm' output) are allowed to be defined more
-than once.  This makes test/recipes/01-test_symbol_presence.t reflect that.
-
-Fixes #22869 (partially)
-Fixes #22837
----
- test/recipes/01-test_symbol_presence.t | 45 +++++++++++++++++---------
- 1 file changed, 30 insertions(+), 15 deletions(-)
-
-diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
-index 66e5669e193c7..cd3ac48bae5e7 100644
---- a/test/recipes/01-test_symbol_presence.t
-+++ b/test/recipes/01-test_symbol_presence.t
-@@ -114,23 +114,38 @@ foreach (sort keys %stlibname) {
-     my @arrays = ( \@stlib_lines );
-     push @arrays, \@shlib_lines unless disabled('shared');
-     foreach (@arrays) {
-+        my %commons;
-+        foreach (@$_) {
-+            if (m|^(.*) C .*|) {
-+                $commons{$1}++;
-+            }
-+        }
-+        foreach (sort keys %commons) {
-+            note "Common symbol: $_";
-+        }
-+
-         @$_ =
-             sort
--            map {
--                # Drop the first space and everything following it
--                s| .*||;
--                # Drop OpenSSL dynamic version information if there is any
--                s|\@\@.+$||;
--                # Return the result
--                $_
--            }
--            # Drop any symbol starting with a double underscore, they
--            # are reserved for the compiler / system ABI and are none
--            # of our business
--            grep !m|^__|,
--            # Only look at external definitions
--            grep m|.* [BCDST] .*|,
--            @$_ ),
-+            ( map {
-+                  # Drop the first space and everything following it
-+                  s| .*||;
-+                  # Drop OpenSSL dynamic version information if there is any
-+                  s|\@\@.+$||;
-+                  # Drop any symbol starting with a double underscore, they
-+                  # are reserved for the compiler / system ABI and are none
-+                  # of our business
-+                  s|^__||;
-+                  # Return the result
-+                  $_
-+              }
-+              # Drop any symbol starting with a double underscore, they
-+              # are reserved for the compiler / system ABI and are none
-+              # of our business
-+              grep !m|^__|,
-+              # Only look at external definitions
-+              grep m|.* [BDST] .*|,
-+              @$_ ),
-+            keys %commons;
-     }
- 
-     # Massage the mkdef.pl output to only contain global symbols
-
-From 1055cefa6718167759e51165324b10345f8e7a99 Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Thu, 30 Nov 2023 10:09:41 +0100
-Subject: [PATCH 3/3] fixup! test/recipes/01-test_symbol_presence.t: Treat
- common symbols specially
-
----
- test/recipes/01-test_symbol_presence.t | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
-index cd3ac48bae5e7..222b1886aec01 100644
---- a/test/recipes/01-test_symbol_presence.t
-+++ b/test/recipes/01-test_symbol_presence.t
-@@ -131,10 +131,6 @@ foreach (sort keys %stlibname) {
-                   s| .*||;
-                   # Drop OpenSSL dynamic version information if there is any
-                   s|\@\@.+$||;
--                  # Drop any symbol starting with a double underscore, they
--                  # are reserved for the compiler / system ABI and are none
--                  # of our business
--                  s|^__||;
-                   # Return the result
-                   $_
-               }

diff --git a/openssl.spec b/openssl.spec
index e46913b85e00a182d01ca90e2a50961d6edaa9a9..ad932d94bfb51f308a010c6c560cdf70ffc6a901 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -13,12 +13,12 @@ Summary(pt_BR.UTF-8):       Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):     Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
-Version:       3.2.0
+Version:       3.2.1
 Release:       1
 License:       Apache v2.0
 Group:         Libraries
 Source0:       https://www.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 7903549a14abebc5c323ce4e85f2cbb2
+# Source0-md5: c239213887804ba00654884918b37441
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
 Source4:       %{name}-c_rehash.sh
@@ -27,7 +27,6 @@ Patch1:               %{name}-ca-certificates.patch
 Patch2:                %{name}-find.patch
 Patch3:                pic.patch
 Patch4:                engines-dir.patch
-Patch5:                duplicate-symbols-test.patch
 URL:           http://www.openssl.org/
 %ifarch %{arm} ppc mips sparc sparcv9
 BuildRequires: libatomic-devel
@@ -213,7 +212,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 # fails with enable-sctp as of 1.1.1
 %{__rm} test/recipes/80-test_ssl_new.t