Check-in [5445171e45]
Overview
Comment:Fixed issues with TLS package building
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:5445171e4590dda4d23760bed51698fbb119949d
User & Date: rkeene on 2016-09-06 06:46:49
Other Links: manifest | tags
Context
2016-09-06
06:59
More work to make TLS work on more platforms check-in: d940453a88 user: rkeene tags: trunk
06:46
Fixed issues with TLS package building check-in: 5445171e45 user: rkeene tags: trunk
06:41
Updated to not build apps when building LibreSSL check-in: ecd9d4b125 user: rkeene tags: trunk
Changes

Modified tls/build.sh from [9ed7019fb3] to [8520dac550].

    45     45   	) || return 1
    46     46   
    47     47   	SSLDIR="$(pwd)/libressl-${version}/INST"
    48     48   	addlibs_LOCALSSL="$(PKG_CONFIG_PATH="${SSLDIR}/lib/pkgconfig" "${PKG_CONFIG:-pkg-config}" libssl libcrypto --libs --static)"
    49     49   }
    50     50   
    51     51   function preconfigure() {
           52  +	# Disable SSLv2, newer SSL libraries drop support for it entirely
           53  +	CFLAGS="${CFLAGS} -DNO_SSL2=1"
           54  +
           55  +	# Disable SSLv3, newer SSL libraries drop support for it entirely
           56  +	CFLAGS="${CFLAGS} -DNO_SSL3=1"
           57  +
    52     58   	# Determine SSL directory
    53     59   	if [ -z "${CPP}" ]; then
    54     60   		CPP="${CC:-cc} -E"
    55     61   	fi
    56     62   
    57     63   	if [ -n "${KC_TLS_SSLDIR}" ]; then
    58     64   		SSLDIR="${KC_TLS_SSLDIR}"
................................................................................
    70     76   		if [ -z "${SSLDIR}" ]; then
    71     77   			echo "Unable to find OpenSSL, aborting." >&2
    72     78   
    73     79   			return 1
    74     80   		fi
    75     81   	fi
    76     82   
    77         -	# Disable SSLv2, newer SSL libraries drop support for it entirely
    78         -	CFLAGS="${CFLAGS} -DNO_SSL2=1"
    79         -
    80         -	# Disable SSLv3, newer SSL libraries drop support for it entirely
    81         -	CFLAGS="${CFLAGS} -DNO_SSL3=1"
    82         -
           83  +	# Add SSL library to configure options
           84  +	configure_extra=(--with-ssl-dir="${SSLDIR}")
    83     85   }
    84     86   
    85     87   function postconfigure() {
    86     88   	local linkaddfile
    87     89   	local addlibs
    88     90   
    89     91   	# Determine SSL library directory