[openssl.org #1958] [PATCH] qnx diffs against HEAD and OpenSSL_1_0_0-stable

[Sean Boudreau via RT]

Hi:

The following patch provides better qnx6 support against the
HEAD and OpenSSL_1_0_0-stable branches.

Regards,

-seanb


diff -ur openssl/Configure openssl_work/Configure
--- openssl/Configure   2009-06-16 18:17:28.000000000 -0500
+++ openssl_work/Configure      2009-06-16 18:18:56.000000000 -0500
@@ -400,7 +400,8 @@
 
 # QNX
 "qnx4",        "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} 
${x86_gcc_opts}:",
-"qnx6",        "cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} 
${x86_gcc_opts}:",
+"QNX6",       
"gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"QNX6-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} 
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # BeOS
 "beos-x86-r5",   "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer 
-mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} 
${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so",
diff -ur openssl/config openssl_work/config
--- openssl/config      2009-06-16 18:17:28.000000000 -0500
+++ openssl_work/config 2009-06-16 18:18:56.000000000 -0500
@@ -798,6 +798,8 @@
   j90-cray-unicos) OUT="cray-j90" ;;
   nsr-tandem-nsk) OUT="tandem-c89" ;;
   beos-*) OUT="$GUESSOS" ;;
+  x86pc-*-qnx6) OUT="QNX6-i386" ;;
+  *-*-qnx6) OUT="QNX6" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
diff -ur openssl/ssl/dtls1.h openssl_work/ssl/dtls1.h
--- openssl/ssl/dtls1.h 2009-06-16 14:06:23.000000000 -0500
+++ openssl_work/ssl/dtls1.h    2009-06-16 18:29:12.000000000 -0500
@@ -67,6 +67,8 @@
 #include <winsock.h>
 #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
 #include <sys/timeval.h>
+#else
+#include <sys/time.h>
 #endif
 
 #ifdef  __cplusplus
diff -ur openssl/util/shlib_wrap.sh openssl_work/util/shlib_wrap.sh
--- openssl/util/shlib_wrap.sh  2009-06-16 18:18:05.000000000 -0500
+++ openssl_work/util/shlib_wrap.sh     2009-06-16 18:18:56.000000000 -0500
@@ -80,7 +80,7 @@
        # it into a script makes it possible to do so on multi-ABI
        # platforms.
        case "$SYSNAME" in
-       *BSD)   LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD
+       *BSD|QNX)       LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD, QNX
        *)      LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;  # SunOS, Linux, ELF 
HP-UX
        esac
        _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"      # Tru64, o32 IRIX