Commit 9e025b20 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

hiawatha: bump to version 10.0 



Now uses the new mbedtls package, and requires zlib.
Rename the SSL option description to TLS, but keep the same symbol
name to avoid pointless legacy.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6b2df7ec

package/hiawatha/Config.in

+6 −4
Original line number Diff line number Diff line 
comment "hiawatha needs a toolchain w/ threads"

comment "hiawatha needs a toolchain w/ threads, dynamic library"

	depends on BR2_USE_MMU

	depends on !BR2_TOOLCHAIN_HAS_THREADS

	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS



config BR2_PACKAGE_HIAWATHA

	bool "hiawatha"

	# needs fork()

	depends on BR2_USE_MMU

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on !BR2_STATIC_LIBS

	select BR2_PACKAGE_ZLIB

	help

	  Hiawatha is a webserver for Unix and has been built with

	  security in mind. This resulted in a highly secure
@@ -27,7 +29,7 @@ config BR2_PACKAGE_HIAWATHA 
if BR2_PACKAGE_HIAWATHA



config BR2_PACKAGE_HIAWATHA_SSL

	bool "hiawatha SSL support"

	select BR2_PACKAGE_POLARSSL

	bool "hiawatha TLS support"

	select BR2_PACKAGE_MBEDTLS



endif

package/hiawatha/hiawatha.hash

+1 −1
Original line number Diff line number Diff line 
# Locally calculated

sha256	5d9cdec51c618bb3efab747030e593d9bd49dfaf3236254c8e0cb60715716dbf	hiawatha-9.2.tar.gz
 
sha256	a39d1f771d818025538bd1231f42001bf29a1ebf55ce3d82afb7305cc251dd0e	hiawatha-10.0.tar.gz

package/hiawatha/hiawatha.mk

+5 −4
Original line number Diff line number Diff line
@@ -4,16 +4,17 @@ 
#

################################################################################



HIAWATHA_VERSION = 9.2

HIAWATHA_VERSION = 10.0

HIAWATHA_SITE = http://www.hiawatha-webserver.org/files

HIAWATHA_DEPENDENCIES = zlib

HIAWATHA_LICENSE = GPLv2

HIAWATHA_LICENSE_FILES = LICENSE



ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)

HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_POLARSSL=ON

HIAWATHA_DEPENDENCIES += polarssl

HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON

HIAWATHA_DEPENDENCIES += mbedtls

else

HIAWATHA_CONF_OPTS += -DENABLE_SSL=OFF

HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF

endif



HIAWATHA_CONF_OPTS += \