From: Richard Levitte <levitte@openssl.org>
Date: Wed, 1 Jul 2020 22:08:45 +0000 (+0200)
Subject: Configure: fix handling of build.info attributes with value
X-Git-Tag: openssl-3.0.0-alpha5~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea4ee152a7aa022dd87f193cc6e16a7ffbfb455a;p=thirdparty%2Fopenssl.git

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@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12344)
---

diff --git a/Configure b/Configure
index 3a86e74fdc6..b8dfeec4775 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) {