diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-10-15 12:32:43 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-12-14 11:50:16 +0000 |
| commit | a3a79ab3221a6484e89cd1321402f40395a05178 (patch) | |
| tree | 2210bcb6e380cd07d7e0977fc7308793315de039 | |
| parent | 59cf75435d45a678c81df246c1e8283dc60c4c39 (diff) | |
| download | openssl-new-a3a79ab3221a6484e89cd1321402f40395a05178.tar.gz | |
Fix VMS installation - Define the logical name OSSL$MODULES
Also, the modules installation directory is version agnostic on other
platforms, there's no real reason why it shouldn't be on VMS.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
(cherry picked from commit a4f1e23e6cffdf2ef1aadf96572c251e07869787)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 12 | ||||
| -rw-r--r-- | VMS/openssl_shutdown.com.in | 1 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 99fa5cc825..55d0c34275 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -356,7 +356,7 @@ OPENSSLDIR_C={- platform->osslprefix() -}DATAROOT:[000000] # Where installed ENGINE modules reside, for C ENGINESDIR_C={- platform->osslprefix() -}ENGINES{- $sover_dirname.$target{pointer_size} -}: # Where modules reside, for C -MODULESDIR_C={- platform->osslprefix() -}MODULES{- $sover_dirname.$target{pointer_size} -}: +MODULESDIR_C={- platform->osslprefix() -}MODULES{- $target{pointer_size} -}: ##### User defined commands and flags ################################ @@ -570,10 +570,10 @@ uninstall_docs : uninstall_html_docs {- output_off() if $disabled{fips}; "" -} install_fips : build_sw $(INSTALL_FIPSMODULECONF) @ WRITE SYS$OUTPUT "*** Installing FIPS module" - - CREATE/DIR ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch'] + - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch'] - CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[000000] COPY/PROT=W:RE $(INSTALL_FIPSMODULES) - - ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME) + ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']$(FIPSMODULENAME) @ WRITE SYS$OUTPUT "*** Installing FIPS module configuration" COPY/PROT=W:RE $(INSTALL_FIPSMODULECONF) OSSL_DATAROOT:[000000] @@ -581,7 +581,7 @@ uninstall_fips : @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration" DELETE OSSL_DATAROOT:[000000]fipsmodule.cnf;* @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module" - DELETE ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME);* + DELETE ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']$(FIPSMODULENAME);* {- output_on() if $disabled{fips}; "" -} install_ssldirs : check_INSTALLTOP @@ -629,9 +629,9 @@ install_engines : check_INSTALLTOP install_runtime_libs build_modules install_modules : check_INSTALLTOP install_runtime_libs build_modules @ {- output_off() unless scalar @install_modules; "" -} ! @ WRITE SYS$OUTPUT "*** Installing modules" - - CREATE/DIR ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch'] + - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch'] {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[MODULES$sover_dirname$target{pointer_size}.'arch']" } + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[MODULES$target{pointer_size}.'arch']" } @install_modules) -} @ {- output_on() unless scalar @install_modules; "" -} ! diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index 42f9ec074d..7e850520d3 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -35,6 +35,7 @@ $ DEAS OSSL$INCLUDE $ DEAS OSSL$LIB $ DEAS OSSL$SHARE $ DEAS OSSL$ENGINES'sv' +$ DEAS OSSL$MODULES'pz' $ DEAS OSSL$EXE $ DEAS OSSL$LIBCRYPTO'pz' $ DEAS OSSL$LIBSSL'pz' diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index e17e923f46..351282ae39 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -15,7 +15,8 @@ $ ! are located $ ! OSSL$SHARE Where the shareable image files $ ! are located $ ! OSSL$EXE Where the executables are located -$ ! OSSL$ENGINESnnn Where the shareable images are located +$ ! OSSL$ENGINESnnn Where the engines modules are located +$ ! OSSL$MODULES Where the non-engine modules are located $ ! OSSL$LIBCRYPTO The static crypto library $ ! OSSL$LIBSSL The static ssl library $ ! OSSL$LIBCRYPTOnnn_SHR The shareable crypto image @@ -97,6 +98,7 @@ $ DEFT OSSL$INCLUDE 'INSTALLTOP_'INCLUDE.] $ DEF OSSL$LIB OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$SHARE OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$ENGINES'sv''pz' OSSL$INSTROOT:[ENGINES'sv''pz'.'arch'] +$ DEF OSSL$MODULES'pz' OSSL$INSTROOT:[MODULES'pz'.'arch'] $ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch'],- OSSL$INSTROOT:[EXE] $ DEF OSSL$LIBCRYPTO'pz' OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB |