From bc0ac16417b326abbe295cf359f47922d3b6b05c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 15 Oct 2021 12:22:04 +0200 Subject: [PATCH] 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/16842) (cherry picked from commit 3c9293b4715229dc7ea2116d22c623c2a92ac69a) --- Configurations/descrip.mms.tmpl | 2 +- VMS/openssl_ivp.com.in | 2 +- VMS/openssl_utils.com.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 9767802e88..99fa5cc825 100644 --- 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 825a699c4f..d1b1e7adbf 100644 --- 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 edd733d7bb..900d0462c5 100644 --- 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'