From patchwork Thu May 24 11:25:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 161121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D1F75B6FC8 for ; Thu, 24 May 2012 21:25:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 268A0101323; Thu, 24 May 2012 11:25:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t6qshvFIqwVI; Thu, 24 May 2012 11:25:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5AFF110177F; Thu, 24 May 2012 11:25:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 96DE18F753 for ; Thu, 24 May 2012 11:25:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 82F738D16C for ; Thu, 24 May 2012 11:25:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hsBdni92u3ti for ; Thu, 24 May 2012 11:25:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id D0EFE8D05C for ; Thu, 24 May 2012 11:25:25 +0000 (UTC) Received: from asgard (host31.190-224-150.telecom.net.ar [190.224.150.31]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q4OBPJ5c031206 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 May 2012 08:25:21 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1337858723; bh=UdBBu974QjHQFlKC7V0B+qRsHpO4jIjzLPdf+xV7x8U=; h=From:To:Cc:Subject:Date:Message-Id; b=EvWMaEdSKqHhvAdUiyq9LoBsxSKs2bs1pWT1rRaz6NBAlKtJ9k/7Bx0t/mfhICBys Q9rPqd3GGeUyKg9HpyD9A3MWf85pdpGUQocbx2mrfP/bsV3FpHg/B/ByJ6185/gbvf +EfGUw+FYX05+zSw9ZDiQZ9AIbAVknlW0aMFvDGA= Received: by asgard (sSMTP sendmail emulation); Thu, 24 May 2012 08:25:18 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 24 May 2012 08:25:18 -0300 Message-Id: <1337858718-26784-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] hiawatha: bump to version 8.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Bump hiawatha to version 8.3 - adds reverse proxy functionality. Also define WORK_DIR to /var/lib/hiawatha instead of the uncommon /usr/var/lib/hiawatha - missed it in the last path fixes. Signed-off-by: Gustavo Zacarias --- .../hiawatha-support-for-external-polarssl.patch | 27 ++++++++++--------- package/hiawatha/hiawatha.mk | 5 ++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch index e6033b9..edc774b 100644 --- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch +++ b/package/hiawatha/hiawatha-support-for-external-polarssl.patch @@ -9,21 +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 Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias -Index: hiawatha-8.1/CMakeLists.txt -=================================================================== ---- hiawatha-8.1.orig/CMakeLists.txt -+++ hiawatha-8.1/CMakeLists.txt -@@ -9,6 +9,7 @@ - option(ENABLE_IPV6 "Enable IPv6 support in Hiawatha." ON) - option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." OFF) - 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) +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) ++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) -@@ -86,19 +87,23 @@ +@@ -85,19 +86,23 @@ # PolarSSL if(ENABLE_SSL) @@ -48,7 +49,7 @@ Index: hiawatha-8.1/CMakeLists.txt # Configure files configure_file(config.h.in config.h) foreach (configfile ${config_files_in}) -@@ -119,7 +124,9 @@ +@@ -118,7 +123,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 4600c11..647c1e1 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -1,4 +1,4 @@ -HIAWATHA_VERSION = 8.2 +HIAWATHA_VERSION = 8.3 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/ ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) @@ -12,6 +12,7 @@ HIAWATHA_CONF_OPT += \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha $(eval $(call CMAKETARGETS))