GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-03-13 06:48:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmp-dont-break-configure' into 'master'

Browse Source 
configure: don't break on ubuntu

See merge request ocserv/ocserv!85
This commit is contained in:
Nikos Mavrogiannopoulos
2018-05-12 05:34:44 +00:00
parent 107b6440ad c1aee4fe9a
commit fefbce19dc
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@@ -32,8 +32,7 @@ Build/Ubuntu:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$UBUNTU_BUILD image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$UBUNTU_BUILD
script: script:
- git submodule update --init && autoreconf -fvi - git submodule update --init && autoreconf -fvi
- "! ./configure" - ./configure --without-nuttcp-tests --without-docker-tests
- ./configure --without-nuttcp-tests --with-broken-gnutls --without-docker-tests
- make -j$(nproc) && make check -j$(nproc) - make -j$(nproc) && make check -j$(nproc)
tags: tags:
- shared - shared

32
configure.ac
View File

@@ -1,5 +1,5 @@
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([ocserv], [0.12.0], [openconnect-devel@lists.infradead.org]) AC_INIT([ocserv], [0.12.1], [openconnect-devel@lists.infradead.org])
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@@ -52,23 +52,13 @@ AC_C_BIGENDIAN
PKG_CHECK_MODULES([LIBNETTLE], [nettle >= 2.7]) PKG_CHECK_MODULES([LIBNETTLE], [nettle >= 2.7])
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.3.0]) PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.3.0])
AC_ARG_WITH(broken-gnutls, warn_leak=no
AS_HELP_STRING([--with-broken-gnutls], [allow the use of gnutls versions which have known bugs]), if $PKG_CONFIG --max-version=3.5.4 gnutls;then
skip_test_for_gnutls=$withval, if $PKG_CONFIG --atleast-version=3.3.99 gnutls || $PKG_CONFIG --max-version=3.3.24 gnutls; then
skip_test_for_gnutls=no) warn_leak=yes
AC_DEFINE([GNUTLS_BROKEN_CERTIFICATE_SET_KEY], [1],
if test "$skip_test_for_gnutls" = "no";then [gnutls has a broken gnutls_certificate_set_key()])
if $PKG_CONFIG --max-version=3.5.4 gnutls;then
if $PKG_CONFIG --atleast-version=3.3.99 gnutls || $PKG_CONFIG --max-version=3.3.24 gnutls; then
AC_MSG_ERROR([[***
*** a broken version of gnutls was found; please update to the latest version of a supported
*** gnutls branch (e.g. as 3.3.x, 3.5.x, or 3.6.x), or compile with --with-broken-gnutls
***]])
fi
fi fi
else
AC_DEFINE([GNUTLS_BROKEN_CERTIFICATE_SET_KEY], [1],
[gnutls has a broken gnutls_certificate_set_key()])
fi fi
if ! $PKG_CONFIG --atleast-version=3.0 nettle; then if ! $PKG_CONFIG --atleast-version=3.0 nettle; then
@@ -618,6 +608,14 @@ Summary of build options:
local http-parser: ${with_local_http_parser} local http-parser: ${with_local_http_parser}
]) ])
if test "${warn_leak}" = "yes";then
AC_MSG_WARN([[***
*** a broken version of gnutls was found; will work around but server will leak memory;
*** please update to the latest version of a supported gnutls branch (e.g. as 3.3.x, 3.5.x, or 3.6.x)
*** for better server performance.
***]])
fi
if test "x${isolation}" = xnone;then if test "x${isolation}" = xnone;then
AC_MSG_WARN([[ AC_MSG_WARN([[
*** ***