[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a85b4de6a6cbe03c46219d4b1c3b2828ca3fd51c (commit)
      from  f087ebcb2eb516a424245fcb93642e57ba024cc4 (commit)


- Log -----------------------------------------------------------------
commit a85b4de6a6cbe03c46219d4b1c3b2828ca3fd51c
Author: Richard Levitte <levi...@openssl.org>
Date:   Wed Oct 13 09:09:05 2021 +0200

    Fix test/recipes/01-test_symbol_presence.t to allow for stripped libraries
    
    It's a small change to the 'nm' call, to have it look at dynamic symbols
    rather than the normal ones.
    
    Fixes #16810
    
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16822)

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

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

diff --git a/test/recipes/01-test_symbol_presence.t 
b/test/recipes/01-test_symbol_presence.t
index 4271ac32a3..12ad278e27 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -48,12 +48,12 @@ foreach my $libname (@libnames) {
         *OSTDOUT = *STDOUT;
         open STDERR, ">", devnull();
         open STDOUT, ">", devnull();
-        my @nm_lines = map { s|\R$||; $_ } `nm -Pg $shlibpath 2> /dev/null`;
+        my @nm_lines = map { s|\R$||; $_ } `nm -DPg $shlibpath 2> /dev/null`;
         close STDERR;
         close STDOUT;
         *STDERR = *OSTDERR;
         *STDOUT = *OSTDOUT;
-        skip "Can't run 'nm -Pg $shlibpath' => $?...  ignoring", 2
+        skip "Can't run 'nm -DPg $shlibpath' => $?...  ignoring", 2
             unless $? == 0;
 
         my $bldtop = bldtop_dir();