[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f159b83a75c8d5e5c43ae4b2dec62086a5e36189 (commit)
       via  1bbe13fce5be8eee6fe2854b79dfbd38c028077c (commit)
      from  0007ff257c95f5cd046799e492436f41caf4ecb2 (commit)


- Log -----------------------------------------------------------------
commit f159b83a75c8d5e5c43ae4b2dec62086a5e36189
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jul 8 19:05:34 2021 +0200

    Configurations/unix-Makefile.tmpl: use platform->sharedlib() as fallback
    
    If platform->sharedlib_simple() and platform->sharedlib_import()
    return undefined, try platform->sharedlib() as a fallback before
    platform->staticlib().
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16023)

commit 1bbe13fce5be8eee6fe2854b79dfbd38c028077c
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jul 8 05:18:25 2021 +0200

    platform->sharedlib_simple(): return undef when same as platform->sharedlib()
    
    On some Unix-like platforms, there is no such thing as versioned shared
    libraries.  In this case, platform->sharedlib_simple() should simply
    return undef.  Among others, this avoids the shared libraries to be
    installed as symlinks on themselves.
    
    Fixes #16012
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16023)

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

Summary of changes:
 Configurations/platform/Unix.pm   | 1 +
 Configurations/unix-Makefile.tmpl | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Configurations/platform/Unix.pm b/Configurations/platform/Unix.pm
index 80963adc30..c7d7d9eb80 100644
--- a/Configurations/platform/Unix.pm
+++ b/Configurations/platform/Unix.pm
@@ -63,6 +63,7 @@ sub sharedname_simple {
 }
 
 sub sharedlib_simple {
+    return undef if $_[0]->shlibext() eq $_[0]->shlibextsimple();
     return platform::BASE::__concat($_[0]->sharedname_simple($_[1]),
                                     $_[0]->shlibextsimple());
 }
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b82166f70a..0fb80f1968 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1392,7 +1392,7 @@ FORCE:
 
 # Building targets ###################################################
 
-libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // () } @{$unified_info{libraries}}) -}
+libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // platform->sharedlib($_) // () } @{$unified_info{libraries}}) -}
 libcrypto.pc:
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
@@ -1484,6 +1484,7 @@ reconfigure reconf:
       # On Unix platforms, we depend on {shlibname}.so
       return map { platform->sharedlib_simple($_)
                    // platform->sharedlib_import($_)
+                   // platform->sharedlib($_)
                    // platform->staticlib($_)
                  } @_;
   }