1
0
forked from pool/hiawatha

Accepting request 577640 from home:Fisiu:branches:server:http

- Fix build with mbedtls 2.7.0.

OBS-URL: https://build.opensuse.org/request/show/577640
OBS-URL: https://build.opensuse.org/package/show/server:http/hiawatha?expand=0&rev=91
This commit is contained in:
Mariusz Fik 2018-02-19 16:08:54 +00:00 committed by Git OBS Bridge
parent 84086b69eb
commit cb12335eb0
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 17 20:21:12 UTC 2018 - fisiu@opensuse.org
- Fix build with mbedtls 2.7.0.
-------------------------------------------------------------------
Tue Oct 24 19:48:10 UTC 2017 - fisiu@opensuse.org

View File

@ -1,8 +1,8 @@
#
# spec file for package hiawatha
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013-2017 Mariusz Fik <fisiu@opensuse.org>.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013-2018 Mariusz Fik <fisiu@opensuse.org>.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,6 +18,7 @@
%define webroot /srv/www
%define mbedtls_version %(rpm -q mbedtls-devel --qf "%%{VERSION}")
Name: hiawatha
Version: 10.7
@ -60,6 +61,11 @@ pipelining, keep alive connections, URL rewriting and many more.
# Remove bundled source for mbedtls, we use system version
rm -rv mbedtls
# mbedtls 2.7.0 and its backward comaptybility...
%if "%{mbedtls_version}" >= "2.7.0"
sed -i 's/MBEDTLS_DHM_RFC5114_MODP_2048_P/MBEDTLS_DHM_RFC5114_MODP_P/' src/tls.c
%endif
%build
%cmake \
-DCONFIG_DIR="%{_sysconfdir}/hiawatha" \