QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-15 19:09:42 +00:00
Code Issues Projects Releases Wiki Activity

Remove QNX support

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5756)
This commit is contained in:
Rich Salz 2018-03-26 14:10:57 -04:00
parent edc79fc99e
commit faec5c4a8a
5 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -9,6 +9,10 @@
Changes between 1.1.0g and 1.1.1 [xx XXX xxxx] Changes between 1.1.0g and 1.1.1 [xx XXX xxxx]
*) QNX support removed (cannot find contributors to get their approval
for the license change).
[Rich Salz]
*) TLSv1.3 replay protection for early data has been implemented. See the *) TLSv1.3 replay protection for early data has been implemented. See the
SSL_read_early_data() man page for further details. SSL_read_early_data() man page for further details.
[Matt Caswell] [Matt Caswell]

29
Configurations/10-main.conf
View File

@ -1040,35 +1040,6 @@ my %targets = (
thread_scheme => "(unknown)", thread_scheme => "(unknown)",
}, },
# QNX
"qnx4" => {
inherit_from => [ "BASE_unix" ],
CC => "cc",
CFLAGS => "",
lib_cppflags => "-DL_ENDIAN -DTERMIO",
thread_scheme => "(unknown)",
},
"QNX6" => {
inherit_from => [ "BASE_unix" ],
CC => "gcc",
ex_libs => add("-lsocket"),
dso_scheme => "dlfcn",
shared_target => "bsd-gcc-shared",
shared_cflag => "-fPIC",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
},
"QNX6-i386" => {
inherit_from => [ "BASE_unix", asm("x86_elf_asm") ],
CC => "gcc",
CFLAGS => "-O2 -Wall",
lib_cppflags => "-DL_ENDIAN",
ex_libs => add("-lsocket"),
dso_scheme => "dlfcn",
shared_target => "bsd-gcc-shared",
shared_cflag => "-fPIC",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
},
#### SCO/Caldera targets. #### SCO/Caldera targets.
# #
# Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.

17
config
View File

@ -240,21 +240,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
esac esac
;; ;;
QNX:*)
case "$RELEASE" in
4*)
echo "${MACHINE}-whatever-qnx4"
;;
6*)
echo "${MACHINE}-whatever-qnx6"
;;
*)
echo "${MACHINE}-whatever-qnx"
;;
esac
exit 0
;;
Paragon*:*:*:*) Paragon*:*:*:*)
echo "i860-intel-osf1"; exit 0 echo "i860-intel-osf1"; exit 0
;; ;;
@ -831,8 +816,6 @@ case "$GUESSOS" in
# these are all covered by the catchall below # these are all covered by the catchall below
i[3456]86-*-cygwin) OUT="Cygwin-x86" ;; i[3456]86-*-cygwin) OUT="Cygwin-x86" ;;
*-*-cygwin) OUT="Cygwin-${MACHINE}" ;; *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;; x86-*-android|i?86-*-android) OUT="android-x86" ;;
armv[7-9]*-*-android) armv[7-9]*-*-android)
OUT="android-armeabi" OUT="android-armeabi"

4
include/internal/sockets.h
View File

@ -93,10 +93,6 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# include <sys/select.h> # include <sys/select.h>
# endif # endif
# ifdef __QNX__
# include <sys/select.h>
# endif
# ifndef VMS # ifndef VMS
# include <sys/ioctl.h> # include <sys/ioctl.h>
# else # else

2
util/shlib_wrap.sh.in
View File

@ -110,7 +110,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
# it into a script makes it possible to do so on multi-ABI # it into a script makes it possible to do so on multi-ABI
# platforms. # platforms.
case "$SYSNAME" in case "$SYSNAME" in
*BSD|QNX) LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;; # *BSD, QNX *BSD) LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;; # *BSD
*) LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;; # SunOS, Linux, ELF HP-UX *) LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;; # SunOS, Linux, ELF HP-UX
esac esac
_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT" # Tru64, o32 IRIX _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT" # Tru64, o32 IRIX