[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ea4ee152a7aa022dd87f193cc6e16a7ffbfb455a (commit)
      from  e7869ef137491213753166edd23f7ba33fb34446 (commit)


- Log -----------------------------------------------------------------
commit ea4ee152a7aa022dd87f193cc6e16a7ffbfb455a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jul 2 00:08:45 2020 +0200

    Configure: fix handling of build.info attributes with value
    
    This line wasn't properly handled:
    
        SCRIPTS{misc,linkname=tsget}=tsget.pl
    
    It generated an attribute "linkname=tsget" with the value 1, instead of
    what it should have, an attribute "linkname" with the value "tsget".
    
    Fixes #12341
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12344)

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

Summary of changes:
 Configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configure b/Configure
index 3a86e74fdc..b8dfeec477 100755
--- a/Configure
+++ b/Configure
@@ -1978,10 +1978,10 @@ if ($builder eq "unified") {
                 my $ac = 1;
                 my $ak = $a;
                 my $av = 1;
-                if ($a =~ m|^(!)?(.*?)\s* = \s*(.*?)$|) {
+                if ($a =~ m|^(!)?(.*?)\s* = \s*(.*?)$|x) {
                     $ac = ! $1;
-                    $ak = $1;
-                    $av = $2;
+                    $ak = $2;
+                    $av = $3;
                 }
                 foreach my $g (@goals) {
                     if ($ac) {