[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  cb37af461dd3cb20dc38fb3710dd010046a3047e (commit)
       via  07b8c0a18658354356870e2d42da9875aa299d9b (commit)
      from  42cf25fcb6ea3c9e5998a1c4f55eedaad53b346f (commit)


- Log -----------------------------------------------------------------
commit cb37af461dd3cb20dc38fb3710dd010046a3047e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 15 18:50:55 2021 +0200

    TEST: Skip test/recipes/01-test_symbol_presence.t on MacOS
    
    It renames symbols, so we can a false negative
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15776)

commit 07b8c0a18658354356870e2d42da9875aa299d9b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 15 18:15:52 2021 +0200

    TEST: Display the correct shared library name
    
    In test/recipes/01-test_symbol_presence.t
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15776)

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

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

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index e979c18f46..edcac23978 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -21,6 +21,8 @@ use lib bldtop_dir('.');
 use platform;
 
 plan skip_all => "Test is disabled on NonStop" if config('target') =~ m|^nonstop|;
+# MacOS arranges symbol names differently
+plan skip_all => "Test is disabled on MacOS" if config('target') =~ m|^darwin|;
 plan skip_all => "Only useful when building shared libraries"
     if disabled("shared");
 
@@ -39,7 +41,8 @@ note
 foreach my $libname (@libnames) {
  SKIP:
     {
-        my $shlibpath = bldtop_file(platform->sharedlib("lib$libname"));
+        my $shlibname = platform->sharedlib("lib$libname");
+        my $shlibpath = bldtop_file($shlibname);
         *OSTDERR = *STDERR;
         *OSTDOUT = *STDOUT;
         open STDERR, ">", devnull();
@@ -107,18 +110,18 @@ foreach my $libname (@libnames) {
         }
 
         if (scalar @missing) {
-            note "The following symbols are missing in lib$libname.so:";
+            note "The following symbols are missing in ${shlibname}:";
             foreach (@missing) {
                 note "  $_";
             }
         }
         if (scalar @extra) {
-            note "The following symbols are extra in lib$libname.so:";
+            note "The following symbols are extra in ${shlibname}:";
             foreach (@extra) {
                 note "  $_";
             }
         }
         ok(scalar @missing == 0,
-           "check that there are no missing symbols in lib$libname.so");
+           "check that there are no missing symbols in ${shlibname}");
     }
 }