From: Richard Levitte <levitte@openssl.org>
Date: Mon, 11 Jun 2018 08:33:09 +0000 (+0200)
Subject: VMS: have mkdef.pl parse lettered versions properly
X-Git-Tag: OpenSSL_1_1_1-pre8~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2285c0f624b2f5fd16b590511dc35f427053f89f;p=oweals%2Fopenssl.git

VMS: have mkdef.pl parse lettered versions properly

Fixes #6449

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6450)

(cherry picked from commit 9a236d5a7158d38b933656cacc31dfd4ff4fcc08)
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 669589c801..b7cf9b2852 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1288,7 +1288,7 @@ EOF
 	} elsif ($VMS) {
             print OUT ")\n";
             (my $libvmaj, my $libvmin, my $libvedit) =
-                $currversion =~ /^(\d+)_(\d+)_(\d+)$/;
+                $currversion =~ /^(\d+)_(\d+)_(\d+)[a-z]{0,2}$/;
             # The reason to multiply the edit number with 100 is to make space
             # for the possibility that we want to encode the patch letters
             print OUT "GSMATCH=LEQUAL,",($libvmaj * 100 + $libvmin),",",($libvedit * 100),"\n";