From: Richard Levitte <levitte@openssl.org>
Date: Thu, 23 Apr 2020 16:59:10 +0000 (+0200)
Subject: Configure: Allow quoted values in VERSION
X-Git-Tag: openssl-3.0.0-alpha2~164
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a960a94ccba41420c11ebd3eb82208b4681ee05;p=oweals%2Fopenssl.git

Configure: Allow quoted values in VERSION

Fixes #11618

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11624)
---

diff --git a/Configure b/Configure
index 385dfce191..48ebe4eb83 100755
--- a/Configure
+++ b/Configure
@@ -286,7 +286,13 @@ collect_information(
     qr/\s*(\w+)\s*=\s*(.*?)\s*$/ =>
         sub {
             # Only define it if there is a value at all
-            $version{uc $1} = $2 if $2 ne '';
+            if ($2 ne '') {
+                my $k = $1;
+                my $v = $2;
+                # Some values are quoted.  Trim the quotes
+                $v = $1 if $v =~ /^"(.*)"$/;
+                $version{uc $k} = $v;
+            }
         },
     "OTHERWISE" =>
         sub { die "Something wrong with this line:\n$_\nin $srcdir/VERSION" },