diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2012-09-12 03:51:54 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-12 23:26:15 +0200 |
| commit | fcc1b0cca0e19a8f32d519be3d38cdcdf1de63e8 (patch) | |
| tree | d870cd8975c73a6bd46d4b559e5bcfaf07c76da1 | |
| parent | b98ccc4ea277031851826540d5b6a5a8874e19a2 (diff) | |
| download | buildroot-novena-fcc1b0cca0e19a8f32d519be3d38cdcdf1de63e8.tar.gz buildroot-novena-fcc1b0cca0e19a8f32d519be3d38cdcdf1de63e8.zip | |
hiawatha: bump to version 8.5
[Peter: license is explictly GPLv2, not GPLv2+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/hiawatha/hiawatha-support-for-external-polarssl.patch | 26 | ||||
| -rw-r--r-- | package/hiawatha/hiawatha.mk | 4 |
2 files changed, 16 insertions, 14 deletions
diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch index edc774b7d..5441a524a 100644 --- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch +++ b/package/hiawatha/hiawatha-support-for-external-polarssl.patch @@ -9,22 +9,22 @@ This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in addition to ENABLE_SSL, tells Hiawatha's build system to link against the already existing PolarSSL library instead of building its own. -[Gustavo]: Update for version 8.3 +[Gustavo]: Update for version 8.5 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt ---- hiawatha-8.3.orig//CMakeLists.txt 2012-05-23 14:22:26.000000000 -0300 -+++ hiawatha-8.3/CMakeLists.txt 2012-05-24 08:13:00.007107500 -0300 -@@ -10,6 +10,7 @@ - option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off) - option(ENABLE_RPROXY "Enable reverse proxy support in Hiawatha." on) - option(ENABLE_SSL "Enable SSL (PolarSSL) support in Hiawatha." on) +diff -Nura hiawatha-8.5.orig/CMakeLists.txt hiawatha-8.5/CMakeLists.txt +--- hiawatha-8.5.orig/CMakeLists.txt 2012-09-12 09:29:34.347994799 -0300 ++++ hiawatha-8.5/CMakeLists.txt 2012-09-12 09:33:15.983118183 -0300 +@@ -9,6 +9,7 @@ + option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off) + option(ENABLE_RPROXY "Enable reverse proxy support in Hiawatha." on) + option(ENABLE_SSL "Enable SSL (PolarSSL) support in Hiawatha." on) +option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off) - option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on) - option(ENABLE_XSLT "Enable XSLT support in Hiawatha." on) - -@@ -85,19 +86,23 @@ + option(ENABLE_TOMAHAWK "Enable Tomahawk in Hiawatha" off) + option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on) + option(ENABLE_XSLT "Enable XSLT support in Hiawatha." on) +@@ -88,19 +89,23 @@ # PolarSSL if(ENABLE_SSL) @@ -49,7 +49,7 @@ diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt # Configure files configure_file(config.h.in config.h) foreach (configfile ${config_files_in}) -@@ -118,7 +123,9 @@ +@@ -121,7 +126,9 @@ target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY}) if(ENABLE_SSL) target_link_libraries(hiawatha ${POLARSSL_LIBRARY}) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index db5b27787..79546e397 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -1,5 +1,7 @@ -HIAWATHA_VERSION = 8.4 +HIAWATHA_VERSION = 8.5 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/ +HIAWATHA_LICENSE = GPLv2 +HIAWATHA_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPT += -DENABLE_SSL_EXTERNAL=ON -DENABLE_SSL=ON |