[openssl] OpenSSL_1_1_1-stable update
Richard Levitte
levitte at openssl.org
Fri Feb 12 14:55:42 UTC 2021
The branch OpenSSL_1_1_1-stable has been updated
via c8c6e7438c03b2fc24e7ead460feeaef04911fb4 (commit)
via 1881643499c4fa149177075bd2255efa6e6ebc56 (commit)
from ee833fe9c325ecacc15b1f4e6c931f69aac0664e (commit)
- Log -----------------------------------------------------------------
commit c8c6e7438c03b2fc24e7ead460feeaef04911fb4
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Jan 11 08:51:43 2021 +0100
VMS documentation fixes
This mostly clarifies details.
Fixes #13789
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13834)
commit 1881643499c4fa149177075bd2255efa6e6ebc56
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Jan 11 08:31:21 2021 +0100
Configurations/descrip.mms.tmpl: avoid enormous PIPE commands
DCL has a total command line limitation that's too easily broken by
them.
We solve them by creating separate message scripts and using them.
Fixes #13789
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13834)
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 36 +++++++++++++++---------------------
INSTALL | 15 ++++++++-------
NOTES.VMS | 12 ++++++++++--
VMS/msg_install.com | 19 +++++++++++++++++++
VMS/msg_staging.com | 37 +++++++++++++++++++++++++++++++++++++
5 files changed, 89 insertions(+), 30 deletions(-)
create mode 100644 VMS/msg_install.com
create mode 100644 VMS/msg_staging.com
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 399f34b3ee..04c93222cc 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -377,8 +377,13 @@ NODEBUG=@
$(NODEBUG) !
$(NODEBUG) ! Installation logical names
$(NODEBUG) !
- $(NODEBUG) installtop = F$PARSE(staging_instdir,"$(INSTALLTOP)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;" + ".]"
- $(NODEBUG) datatop = F$PARSE(staging_datadir,"$(OPENSSLDIR)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;" + ".]"
+ $(NODEBUG) ! This also creates a few DCL variables that are used for
+ $(NODEBUG) ! the "install_msg" target.
+ $(NODEBUG) !
+ $(NODEBUG) installroot = F$PARSE(staging_instdir,"$(INSTALLTOP)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;"
+ $(NODEBUG) installtop = installroot + ".]"
+ $(NODEBUG) dataroot = F$PARSE(staging_datadir,"$(OPENSSLDIR)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;"
+ $(NODEBUG) datatop = dataroot + ".]"
$(NODEBUG) DEFINE ossl_installroot 'installtop'
$(NODEBUG) DEFINE ossl_dataroot 'datatop'
$(NODEBUG) !
@@ -455,30 +460,19 @@ list-tests :
@ WRITE SYS$OUTPUT "Tests are not supported with your chosen Configure options"
@ ! {- output_on() if !$disabled{tests}; "" -}
-install : install_sw install_ssldirs install_docs
+install : install_sw install_ssldirs install_docs install_msg
+ @ !
+
+install_msg :
@ WRITE SYS$OUTPUT ""
@ WRITE SYS$OUTPUT "######################################################################"
@ WRITE SYS$OUTPUT ""
@ IF "$(DESTDIR)" .EQS. "" THEN -
- PIPE ( WRITE SYS$OUTPUT "Installation complete" ; -
- WRITE SYS$OUTPUT "" ; -
- WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; -
- WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; -
- WRITE SYS$OUTPUT "" )
+ @{- sourcefile("VMS", "msg_install.com") -} "$(SYSTARTUP)" "{- $osslver -}"
@ IF "$(DESTDIR)" .NES. "" THEN -
- PIPE ( WRITE SYS$OUTPUT "Staging installation complete" ; -
- WRITE SYS$OUTPUT "" ; -
- WRITE SYS$OUTPUT "Finish or package in such a way that the contents of the directory tree" ; -
- WRITE SYS$OUTPUT staging_instdir ; -
- WRITE SYS$OUTPUT "ends up in $(INSTALLTOP)," ; -
- WRITE SYS$OUTPUT "and that the contents of the contents of the directory tree" ; -
- WRITE SYS$OUTPUT staging_datadir ; -
- WRITE SYS$OUTPUT "ends up in $(OPENSSLDIR)" ; -
- WRITE SYS$OUTPUT "" ; -
- WRITE SYS$OUTPUT "When in its final destination," ; -
- WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; -
- WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; -
- WRITE SYS$OUTPUT "" )
+ @{- sourcefile("VMS", "msg_staging.com") -} -
+ "''installroot']" "''dataroot']" "$(INSTALLTOP)" "$(OPENSSLDIR)" -
+ "$(SYSTARTUP)" "{- $osslver -}"
check_install :
spawn/nolog @ossl_installroot:[SYSTEST]openssl_ivp{- $osslver -}.com
diff --git a/INSTALL b/INSTALL
index f5118428b3..f3ac727183 100644
--- a/INSTALL
+++ b/INSTALL
@@ -106,8 +106,7 @@
This will build and install OpenSSL in the default location, which is:
Unix: normal installation directories under /usr/local
- OpenVMS: SYS$COMMON:[OPENSSL-'version'...], where 'version' is the
- OpenSSL version number with underscores instead of periods.
+ OpenVMS: SYS$COMMON:[OPENSSL]
Windows: C:\Program Files\OpenSSL or C:\Program Files (x86)\OpenSSL
The installation directory should be appropriately protected to ensure
@@ -116,7 +115,9 @@
your Operating System it is recommended that you do not overwrite the system
version and instead install to somewhere else.
- If you want to install it anywhere else, run config like this:
+ If you want to install it anywhere else, run config like this (the options
+ --prefix and --openssldir are explained further down, and the values shown
+ here are mere examples):
On Unix:
@@ -198,7 +199,7 @@
Unix: /usr/local
Windows: C:\Program Files\OpenSSL
or C:\Program Files (x86)\OpenSSL
- OpenVMS: SYS$COMMON:[OPENSSL-'version']
+ OpenVMS: SYS$COMMON:[OPENSSL]
--release
Build OpenSSL without debugging symbols. This is the default.
@@ -961,9 +962,9 @@
share/doc/openssl/html/man7
Contains the HTML rendition of the man-pages.
- OpenVMS ('arch' is replaced with the architecture name, "Alpha"
- or "ia64", 'sover' is replaced with the shared library version
- (0101 for 1.1), and 'pz' is replaced with the pointer size
+ OpenVMS ('arch' is replaced with the architecture name, "ALPHA"
+ or "IA64", 'sover' is replaced with the shared library version
+ (0101 for 1.1.x), and 'pz' is replaced with the pointer size
OpenSSL was built with):
[.EXE.'arch'] Contains the openssl binary.
diff --git a/NOTES.VMS b/NOTES.VMS
index c82e231ad7..bb226da310 100644
--- a/NOTES.VMS
+++ b/NOTES.VMS
@@ -90,9 +90,9 @@
Unix mount point.
The easiest way to check if everything got through as it should is to
- check for one of the following files:
+ check that this file exists:
- [.crypto]opensslconf^.h.in
+ [.include.openssl]opensslconf^.h.in
The best way to get a correct distribution is to download the gzipped
tar file from ftp://ftp.openssl.org/source/, use GZIP -d to uncompress
@@ -105,3 +105,11 @@
Should you need it, you can find UnZip for VMS here:
http://www.info-zip.org/UnZip.html
+
+
+ How the value of 'arch' is determined
+ -------------------------------------
+
+ 'arch' is mentioned in INSTALL. It's value is determined like this:
+
+ arch = f$edit( f$getsyi( "arch_name"), "upcase")
diff --git a/VMS/msg_install.com b/VMS/msg_install.com
new file mode 100644
index 0000000000..d1eec7c982
--- /dev/null
+++ b/VMS/msg_install.com
@@ -0,0 +1,19 @@
+$ ! Used by the main descrip.mms to print the installation complete
+$ ! message.
+$ ! Arguments:
+$ ! P1 startup / setup / shutdown scripts directory
+$ ! P2 distinguishing version number ("major version")
+$
+$ systartup = p1
+$ osslver = p2
+$
+$ WRITE SYS$OUTPUT "Installation complete"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "The following commands need to be executed to enable you to use OpenSSL:"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "- to set up OpenSSL logical names:"
+$ WRITE SYS$OUTPUT " @''systartup'openssl_startup''osslver'"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "- to define the OpenSSL command"
+$ WRITE SYS$OUTPUT " @''systartup'openssl_utils''osslver'"
+$ WRITE SYS$OUTPUT ""
diff --git a/VMS/msg_staging.com b/VMS/msg_staging.com
new file mode 100644
index 0000000000..11cd80870d
--- /dev/null
+++ b/VMS/msg_staging.com
@@ -0,0 +1,37 @@
+$ ! Used by the main descrip.mms to print the statging installation
+$ ! complete
+$ ! message.
+$ ! Arguments:
+$ ! P1 staging software installation directory
+$ ! P2 staging data installation directory
+$ ! P3 final software installation directory
+$ ! P4 final data installation directory
+$ ! P5 startup / setup / shutdown scripts directory
+$ ! P6 distinguishing version number ("major version")
+$
+$ staging_instdir = p1
+$ staging_datadir = p2
+$ final_instdir = p3
+$ final_datadir = p4
+$ systartup = p5
+$ osslver = p6
+$
+$ WRITE SYS$OUTPUT "Staging installation complete"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "Finish or package in such a way that the contents of the following directory"
+$ WRITE SYS$OUTPUT "trees end up being copied:"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "- from ", staging_instdir
+$ WRITE SYS$OUTPUT " to ", final_instdir
+$ WRITE SYS$OUTPUT "- from ", staging_datadir
+$ WRITE SYS$OUTPUT " to ", final_datadir
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "When in its final destination, the following commands need to be executed"
+$ WRITE SYS$OUTPUT "to use OpenSSL:"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "- to set up OpenSSL logical names:"
+$ WRITE SYS$OUTPUT " @''systartup'openssl_startup''osslver'"
+$ WRITE SYS$OUTPUT ""
+$ WRITE SYS$OUTPUT "- to define the OpenSSL command"
+$ WRITE SYS$OUTPUT " @''systartup'openssl_utils''osslver'"
+$ WRITE SYS$OUTPUT ""
More information about the openssl-commits
mailing list