[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d1c87578a29b9b6506ff8c11bdf3e5d63f784965 (commit)
      from  2bafe6cfeda5dc27fbc4c17cd351063872e0c0fd (commit)


- Log -----------------------------------------------------------------
commit d1c87578a29b9b6506ff8c11bdf3e5d63f784965
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 10 11:37:19 2018 +0100

    VMS: fix library compatibility settings in util/mkdef.pl
    
    The regexp to parse the incoming version number was flawed, and since
    we allow ourselves to add missing APIs in PATCH releases, the
    compatibility settings still need to include the PATCH part of the
    version number.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7858)

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

Summary of changes:
 util/mkdef.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 469bc25..189e5b3 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -386,7 +386,9 @@ _____
 _____
 
     if (defined $version) {
-        my ($libvmajor, $libvminor) = $version =~ /^(\d+)_(\d+)$/;
+        $version =~ /^(\d+)\.(\d+)\.(\d+)/;
+        my $libvmajor = $1;
+        my $libvminor = $2 * 100 + $3;
         print <<"_____";
 GSMATCH=LEQUAL,$libvmajor,$libvminor;
 _____