[openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  bf07844312caf4ac251f5303993230c254e7c771 (commit)
      from  6b0f7a67f71e03b90b654ed20786acca54d20fae (commit)


- Log -----------------------------------------------------------------
commit bf07844312caf4ac251f5303993230c254e7c771
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Oct 14 18:49:11 2021 +0200

    Fix test/recipes/01-test_symbol_presence.t to disregard version info
    
    The output of 'nm -DPg' contains version info attached to the symbols,
    which makes the test fail.  Simply dropping the version info makes the
    test work again.
    
    Fixes #16810 (followup)
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16840)
    
    (cherry picked from commit 73970cb91fdf8e7b4b434d479b875a47a0aa0dbc)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/01-test_symbol_presence.t | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index 39ed4d447b..e75d2c3e72 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -57,7 +57,17 @@ foreach my $libname (@libnames) {
         note "Number of lines in \@def_lines before massaging: ", scalar @def_lines;
 
         # Massage the nm output to only contain defined symbols
-        @nm_lines = sort map { s| .*||; $_ } grep(m|.* [BCDST] .*|, @nm_lines);
+        @nm_lines =
+            sort
+            map {
+                # Drop the first space and everything following it
+                s| .*||;
+                # Drop OpenSSL dynamic version information if there is any
+                s|\@\@OPENSSL_[0-9._]+[a-z]?$||;
+                # Return the result
+                $_
+            }
+            grep(m|.* [BCDST] .*|, @nm_lines);
 
         # Massage the mkdef.pl output to only contain global symbols
         # The output we got is in Unix .map format, which has a global