[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  05ba94e70554c88cde8a8782db15cc87491f6ab6 (commit)
      from  788a72e92fc0b78c2ca12df90e45cccbaf7a800e (commit)


- Log -----------------------------------------------------------------
commit 05ba94e70554c88cde8a8782db15cc87491f6ab6
Author: Randall S. Becker <rsbecker at nexbridge.com>
Date:   Tue Mar 23 14:42:36 2021 -0600

    Add explicit support in util/shlib_wrap.sh.in for NonStop DLL loading.
    
    The NonStop platform uses a proprietary mechanism for specifying DLL
    locations.
    
    CLA: Permission is granted by the author to the OpenSSL team to use these modifications.
    
    Fixes #14666
    
    Signed-off-by: Randall S. Becker <rsbecker at nexbridge.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14669)

-----------------------------------------------------------------------

Summary of changes:
 util/shlib_wrap.sh.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/util/shlib_wrap.sh.in b/util/shlib_wrap.sh.in
index 7024cafbd3..675d99a836 100755
--- a/util/shlib_wrap.sh.in
+++ b/util/shlib_wrap.sh.in
@@ -84,6 +84,15 @@ SunOS|IRIX*)
 	eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
 	unset rld_var
 	;;
+NONSTOP_KERNEL)
+	# HPE NonStop has a proprietary mechanism for specifying
+	# the location of DLLs. It does not use PATH or variables
+	# commonly used on other platforms. The platform has a limited
+	# environment space keeping extraneous variables to a minimum
+	# is recommended.
+	_RLD_LIB_PATH="${THERE}:$LD_LIBRARY_PATH"
+	export _RLD_LIB_PATH
+	;;
 *)	LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH"	# Linux, ELF HP-UX
 	DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH"	# MacOS X
 	SHLIB_PATH="${THERE}:$SHLIB_PATH"		# legacy HP-UX