[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Thu Jul 7 13:07:37 UTC 2016
The branch master has been updated
via e78884d79cec20ae61606421188d8540541a58f3 (commit)
via 3ffb060ee2ca13992d356a9a61c153fb82e8088e (commit)
via 794ad95269589ef7617f98925b6d521ab0d5b0f7 (commit)
via e8fb12957a68c8bf550ae9f5c96c6cc14fa47ee1 (commit)
via b2de11c58b57e7f0d58c6f8a1d4177705650647e (commit)
via ee0a61cfb827097d510f3ef09d00d0382d9ff46d (commit)
from d20841c414bf62527f016cd4903d8d23451f24a5 (commit)
- Log -----------------------------------------------------------------
commit e78884d79cec20ae61606421188d8540541a58f3
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jul 6 21:54:47 2016 +0200
VMS: correct post-install instructions
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 3ffb060ee2ca13992d356a9a61c153fb82e8088e
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jul 6 19:43:59 2016 +0200
Windows: make some vars in windows-makefile.tmpl reachable again
$openssldir and $enginesdir were mistakenly made unavailable to other
perl fragments. They are still needed in the definition of CFLAGS.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 794ad95269589ef7617f98925b6d521ab0d5b0f7
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jul 6 19:04:55 2016 +0200
VMS: defined the logical name OPENSSL at all times
This logical names permits '#include <openssl/foo.h>' to work properly.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit e8fb12957a68c8bf550ae9f5c96c6cc14fa47ee1
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jul 6 18:53:56 2016 +0200
Versioning engines default location: the VMS case
OpenSSL engines are tied to the OpenSSL shared library versions,
starting with OpenSSL 1.1. We therefore need to install them in
directories which have the shared library version in it's name, to
easily allow multiple OpenSSL versions to be installed at the same
time.
For VMS, the change is a bit more involved, primarly because the top
installation directory was already versioned, *as well as* some of the
files inside. That's a bit too much. Version numbering in files is
also a bit different on VMS. The engines for shared library version
1.1 will therefore end up in OSSL$INSTROOT:[ENGINES0101.'arch']
('arch' is the architecture we build for)
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit b2de11c58b57e7f0d58c6f8a1d4177705650647e
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jul 6 18:50:47 2016 +0200
Versioning engines default location: the Unix case
OpenSSL engines are tied to the OpenSSL shared library versions,
starting with OpenSSL 1.1. We therefore need to install them in
directories which have the shared library version in it's name, to
easily allow multiple OpenSSL versions to be installed at the same
time.
For Unix, the default installation directory is changed from
$PREFIX/lib/engines to $PREFIX/lib/engines-${major}_${minor} (mingw)
or $PREFIX/lib/engines-${major}.${minor} (all but mingw)
($PREFIX is the directory given for the configuration option --prefix,
and ${major} and ${minor} are the major and minor shared library
version numbers)
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit ee0a61cfb827097d510f3ef09d00d0382d9ff46d
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jul 6 18:37:52 2016 +0200
Versioning engines default location: the Windows case
OpenSSL engines are tied to the OpenSSL shared library versions,
starting with OpenSSL 1.1. We therefore need to install them in
directories which have the shared library version in it's name, to
easily allow multiple OpenSSL versions to be installed at the same
time.
For windows, the default installation directory is changed from
$PREFIX/lib/engines to $PREFIX/lib/engines-${major}_${minor}
($PREFIX is the directory given for the configuration option --prefix,
and ${major} and ${minor} are the major and minor shared library
version numbers)
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 38 +++++++++++++++++++++---------------
Configurations/unix-Makefile.tmpl | 24 +++++++++++++----------
Configurations/windows-makefile.tmpl | 6 ++++--
VMS/openssl_shutdown.com.in | 27 ++++++++++---------------
VMS/openssl_startup.com.in | 33 ++++++++++++-------------------
5 files changed, 63 insertions(+), 65 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index de25c81..c53c500 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -9,6 +9,9 @@
our $osslprefix = 'OSSL$';
(our $osslprefix_q = $osslprefix) =~ s/\$/\\\$/;
+ our $sover = sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor};
+ our $osslver = sprintf "%02d%02d", split(/\./, $config{version});
+
our $sourcedir = $config{sourcedir};
our $builddir = $config{builddir};
sub sourcefile {
@@ -141,9 +144,8 @@ MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl
DESTDIR=
# Do not edit this manually. Use Configure --prefix=DIR to change this!
-INSTALLTOP={- my $x = sprintf "%02d%02d", split(/\./, $config{version});
- our $installtop =
- catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL$x]";
+INSTALLTOP={- our $installtop =
+ catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL]";
$installtop -}
SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -}
# This is the standard central area to store certificates, private keys...
@@ -151,7 +153,7 @@ OPENSSLDIR={- catdir($config{openssldir}) ||
$config{prefix} ? catdir($config{prefix},"COMMON")
: "SYS\$COMMON:[OPENSSL-COMMON]" -}
# Where installed engines reside
-ENGINESDIR={- $osslprefix -}ENGINES:
+ENGINESDIR={- $osslprefix -}ENGINES{- $sover -}:
CC= {- $target{cc} -}
CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -}
@@ -284,8 +286,8 @@ install : install_sw install_ssldirs install_docs
@ IF "$(DESTDIR)" .EQS. "" THEN -
PIPE ( WRITE SYS$OUTPUT "Installation complete" ; -
WRITE SYS$OUTPUT "" ; -
- WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup to set up logical names" ; -
- WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_setup to define commands" ; -
+ 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 "" )
@ IF "$(DESTDIR)" .NES. "" THEN -
PIPE ( WRITE SYS$OUTPUT "Staging installation complete" ; -
@@ -298,12 +300,12 @@ install : install_sw install_ssldirs install_docs
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 to set up logical names" ; -
- WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils to define commands" ; -
+ 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 "" )
check_install :
- spawn/nolog @ossl_installroot:[SYSTEST]openssl_ivp.com
+ spawn/nolog @ossl_installroot:[SYSTEST]openssl_ivp{- $osslver -}.com
uninstall : uninstall_docs uninstall_sw
@@ -392,7 +394,7 @@ install_runtime : check_INSTALLTOP
@ ! Install the main program
- CREATE/DIR ossl_installroot:[EXE.'arch']
COPY/PROT=W:RE [.APPS]openssl.EXE -
- ossl_installroot:[EXE.'arch']openssl{- sprintf "%02d%02d", split(/\./, $config{version}) -}.EXE
+ ossl_installroot:[EXE.'arch']openssl{- $osslver -}.EXE
@ ! Install scripts
- CREATE/DIR ossl_installroot:[EXE]
COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]
@@ -401,22 +403,26 @@ install_runtime : check_INSTALLTOP
install_engines : check_INSTALLTOP
@ {- output_off() unless scalar @{$unified_info{engines}}; "" -} !
@ WRITE SYS$OUTPUT "*** Installing engines"
- - CREATE/DIR ossl_installroot:[ENGINES.'arch']
+ - CREATE/DIR ossl_installroot:[ENGINES{- $sover -}.'arch']
{- join("\n ",
- map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES.'arch']" }
+ map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover.'arch']" }
grep(!m|ossltest$|i, @{$unified_info{engines}})) -}
@ {- output_on() unless scalar @{$unified_info{engines}}; "" -} !
install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
[.VMS]openssl_utils.com, check_INSTALLTOP
- CREATE/DIR ossl_installroot:[SYS$STARTUP]
- COPY/PROT=W:RE [.VMS]openssl_startup.com ossl_installroot:[SYS$STARTUP]
- COPY/PROT=W:RE [.VMS]openssl_shutdown.com ossl_installroot:[SYS$STARTUP]
- COPY/PROT=W:RE [.VMS]openssl_utils.com ossl_installroot:[SYS$STARTUP]
+ COPY/PROT=W:RE [.VMS]openssl_startup.com -
+ ossl_installroot:[SYS$STARTUP]openssl_startup{- $osslver -}.com
+ COPY/PROT=W:RE [.VMS]openssl_shutdown.com -
+ ossl_installroot:[SYS$STARTUP]openssl_shutdown{- $osslver -}.com
+ COPY/PROT=W:RE [.VMS]openssl_utils.com -
+ ossl_installroot:[SYS$STARTUP]openssl_utils{- $osslver -}.com
install_ivp : [.VMS]openssl_ivp.com check_INSTALLTOP
- CREATE/DIR ossl_installroot:[SYSTEST]
- COPY/PROT=W:RE [.VMS]openssl_ivp.com ossl_installroot:[SYSTEST]
+ COPY/PROT=W:RE [.VMS]openssl_ivp.com -
+ ossl_installroot:[SYSTEST]openssl_ivp{- $osslver -}.com
[.VMS]openssl_startup.com : vmsconfig.pm {- sourcefile("VMS", "openssl_startup.com.in") -}
- CREATE/DIR [.VMS]
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 9898961..af7a5e7 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -14,6 +14,10 @@
sub windowsdll { $config{target} =~ /^(?:Cygwin|mingw)/ }
+ our $sover = $config{target} =~ /^mingw/
+ ? $config{shlib_major}."_".$config{shlib_minor}
+ : $config{shlib_major}.".".$config{shlib_minor};
+
# shlib and shlib_simple both take a static library name and figure
# out what the shlib name should be.
#
@@ -144,7 +148,7 @@ LIBDIR={- #
our $libdir = $config{libdir} || "lib$multilib";
$libdir -}
ENGINESDIR={- use File::Spec::Functions;
- catdir($prefix,$libdir,"engines") -}
+ catdir($prefix,$libdir,"engines-$sover") -}
MANDIR=$(INSTALLTOP)/share/man
DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
@@ -433,7 +437,7 @@ uninstall_dev:
install_engines:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
- @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
@echo "*** Installing engines"
@set -e; for e in dummy $(ENGINES); do \
if [ "$$e" = "dummy" ]; then continue; fi; \
@@ -441,11 +445,11 @@ install_engines:
if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
continue; \
fi; \
- echo "install $$e -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
- cp $$e $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
- chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
- mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new \
- $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
+ echo "install $$e -> $(DESTDIR)$(ENGINESDIR)/$$fn"; \
+ cp $$e $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
+ chmod 755 $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
+ mv -f $(DESTDIR)$(ENGINESDIR)/$$fn.new \
+ $(DESTDIR)$(ENGINESDIR)/$$fn; \
done
uninstall_engines:
@@ -456,10 +460,10 @@ uninstall_engines:
if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
continue; \
fi; \
- echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
- $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
+ echo "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \
+ $(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \
done
- -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines
+ -$(RMDIR) $(DESTDIR)$(ENGINESDIR)
install_runtime:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 70fec0a..c9a7a26 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -11,6 +11,8 @@
our $shlibextimport = $target{shared_import_extension} || ".lib";
our $dsoext = $target{dso_extension} || ".dll";
+ our $sover = $config{shlib_major}."_".$config{shlib_minor};
+
my $win_installenv =
$target{build_scheme}->[2] eq "VC-W32" ?
"ProgramFiles(x86)" : "ProgramW6432";
@@ -105,7 +107,7 @@ OPENSSLDIR_dev={- #
# value appended as a subdirectory.
#
use File::Spec::Functions qw(:DEFAULT splitpath);
- my $openssldir =
+ our $openssldir =
$config{openssldir} ?
(file_name_is_absolute($config{openssldir}) ?
$config{openssldir}
@@ -118,7 +120,7 @@ OPENSSLDIR_dir={- $openssldir_dir -}
LIBDIR={- our $libdir = $config{libdir} || "lib";
$libdir -}
ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath);
- my $enginesdir = catdir($prefix,$libdir,"engines");
+ our $enginesdir = catdir($prefix,$libdir,"engines-$sover");
our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
splitpath($enginesdir, 1);
$enginesdir_dev -}
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 01971f3..81cf4ea 100644
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -26,31 +26,24 @@ $ ENDIF
$
$ ! Abbrevs
$ DEAS := DEASSIGN /NOLOG 'P1'
-$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
$ pz := {- $config{pointer_size} -}
$
-$ DEAS OSSL$ROOT'v'
-$ DEAS OSSL$INCLUDE'v'
-$ DEAS OSSL$LIB'v'
-$ DEAS OSSL$SHARE'v'
-$ DEAS OSSL$ENGINES'v'
-$ DEAS OSSL$EXE'v'
-$ DEAS OSSL$LIBCRYPTO'pz''v'
-$ DEAS OSSL$LIBSSL'pz''v'
+$ DEAS OSSL$INSTROOT
+$ DEAS OSSL$INCLUDE
+$ DEAS OSSL$LIB
+$ DEAS OSSL$SHARE
+$ DEAS OSSL$ENGINES'sv'
+$ DEAS OSSL$EXE
+$ DEAS OSSL$LIBCRYPTO'pz'
+$ DEAS OSSL$LIBSSL'pz'
$ DEAS OSSL$LIBCRYPTO'sv'_SHR'pz'
$ DEAS OSSL$LIBSSL'sv'_SHR'pz'
+$ DEAS OPENSSL
+$
$ IF P2 .NES. "NOALIASES"
$ THEN
-$ DEAS OSSL$ROOT
-$ DEAS OSSL$INCLUDE
-$ DEAS OSSL$LIB
-$ DEAS OSSL$SHARE
$ DEAS OSSL$ENGINES
-$ DEAS OSSL$EXE
-$ DEAS OPENSSL
-$ DEAS OSSL$LIBCRYPTO'pz'
-$ DEAS OSSL$LIBSSL'pz'
$ DEAS OSSL$LIBCRYPTO_SHR'pz'
$ DEAS OSSL$LIBSSL_SHR'pz'
$ ENDIF
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index b5570ee..ca2220e 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -80,33 +80,26 @@ $
$ ! Abbrevs
$ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
$ DEF := DEFINE /NOLOG 'P1'
-$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
$ pz := {- $config{pointer_size} -}
$
-$ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_']
-$ DEFT OSSL$INCLUDE'v' 'INSTALLTOP_'INCLUDE.]
-$ DEF OSSL$LIB'v' OSSL$INSTROOT'v':[LIB.'arch']
-$ DEF OSSL$SHARE'v' OSSL$INSTROOT'v':[LIB.'arch']
-$ DEF OSSL$ENGINES'v' OSSL$INSTROOT'v':[ENGINES.'arch']
-$ DEF OSSL$EXE'v' OSSL$INSTROOT'v':[EXE.'arch']
-$ DEF OSSL$LIBCRYPTO'pz''v' OSSL$LIB'v':OSSL$LIBCRYPTO'pz'.OLB
-$ DEF OSSL$LIBSSL'pz''v' OSSL$LIB'v':OSSL$LIBSSL'pz'.OLB
-$ DEF OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
-$ DEF OSSL$LIBSSL'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBSSL'sv'_SHR'pz'.EXE
+$ DEFT OSSL$INSTROOT 'INSTALLTOP_']
+$ DEFT OSSL$INCLUDE 'INSTALLTOP_'INCLUDE.]
+$ DEF OSSL$LIB OSSL$INSTROOT:[LIB.'arch']
+$ DEF OSSL$SHARE OSSL$INSTROOT:[LIB.'arch']
+$ DEF OSSL$ENGINES'sv' OSSL$INSTROOT:[ENGINES'sv'.'arch']
+$ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch']
+$ DEF OSSL$LIBCRYPTO'pz' OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB
+$ DEF OSSL$LIBSSL'pz' OSSL$LIB:OSSL$LIBSSL'pz'.OLB
+$ DEF OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
+$ DEF OSSL$LIBSSL'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBSSL'sv'_SHR'pz'.EXE
+$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL]
+$
$ IF P2 .NES. "NOALIASES"
$ THEN
-$ DEF OSSL$INSTROOT OSSL$INSTROOT'v'
-$ DEF OSSL$INCLUDE OSSL$INCLUDE'v'
-$ DEF OSSL$LIB OSSL$LIB'v'
-$ DEF OSSL$SHARE OSSL$SHARE'v'
-$ DEF OSSL$ENGINES OSSL$ENGINES'v'
-$ DEF OSSL$EXE OSSL$EXE'v'
-$ DEF OSSL$LIBCRYPTO'pz' OSSL$LIBCRYPTO'pz''v'
-$ DEF OSSL$LIBSSL'pz' OSSL$LIBSSL'pz''v'
+$ DEF OSSL$ENGINES OSSL$ENGINES'sv'
$ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz'
$ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz'
-$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL]
$ ENDIF
$
$ DEFT OSSL$DATAROOT 'OPENSSLDIR_']
More information about the openssl-commits
mailing list