[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3bf7c3a166f20f3deac8d4730aa54bcce466c10a (commit)
      from  8f81e3a1848819b3e2bf57d7bc810e440e29d8a5 (commit)


- Log -----------------------------------------------------------------
commit 3bf7c3a166f20f3deac8d4730aa54bcce466c10a
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 29 12:23:40 2021 +0200

    Unix build file template: symlink "simple" to "full" shlib selectively
    
    On Unix-like platforms where the shared library comes in a form with
    and a form without SO version number, the one without is symbolically
    linked to the one with.
    
    However, we have Unix-like platforms where we don't deal with SO
    version numbers, and where the "simple" shlib thereby ends up being
    symbolically linked to itself.  A simple check of the two shlib file
    names is enough to ensure that we only do the symbolic link when
    actually necessary.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14726)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index d0192aa32e..8a2b2353ab 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1607,7 +1607,7 @@ EOF
 
       my $recipe = '';
 
-      if (defined $simple) {
+      if (defined $simple && $simple ne $full) {
           if (sharedaix()) {
               $recipe .= <<"EOF";
 $simple: $full