Fix VMS installation - consistent program names with version info

The program name version info is supposed to be the major release
version number.  This was forgotten when the versioning scheme was
changed for 3.0, so the minor release version number slipped in as
well.

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

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 9767802e8875bee5f584e8b362af3940a8c0cb73..99fa5cc825cd25f735647f55dc246e79ff192923 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -9,7 +9,7 @@
   (our $osslprefix_q = platform->osslprefix()) =~ s/\$/\\\$/;
 
   our $sover_dirname = platform->shlib_version_as_filename();
-  our $osslver = sprintf "%02d%02d", split(/\./, $config{version});
+  our $osslver = sprintf "%02d", split(/\./, $config{version});
 
   our $sourcedir = $config{sourcedir};
   our $builddir = $config{builddir};

diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in
index 825a699c4f7ec5b672a3784a416f46cc8008fc39..d1b1e7adbfb74d71ee75ca3e42613cf21c5b951e 100644 (file)
--- a/VMS/openssl_ivp.com.in
+++ b/VMS/openssl_ivp.com.in
@@ -14,7 +14,7 @@ $     INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -
 $      OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") -
                     - ".][000000" - "[000000." - "][" - "]A.;" + "."
 $
-$      v    := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
+$      v    := {- sprintf "%02d", split(/\./, $config{version}) -}
 $      pz   := {- $config{pointer_size} -}
 $      
 $      @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v'

diff --git a/VMS/openssl_utils.com.in b/VMS/openssl_utils.com.in
index edd733d7bb18e4d2e8c3a44a73c6fb99a0247d52..900d0462c5a9c2ba8b6054fe052cee0fa6ec301c 100644 (file)
--- a/VMS/openssl_utils.com.in
+++ b/VMS/openssl_utils.com.in
@@ -1,7 +1,7 @@
 $      ! OpenSSL utilities
 $      !
 $
-$      v    := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
+$      v    := {- sprintf "%02d", split(/\./, $config{version}) -}
 $
 $      OPENSSL'v'      :== $OSSL$EXE:OPENSSL'v'
 $      OPENSSL         :== $OSSL$EXE:OPENSSL'v'