From patchwork Mon Jun 24 02:19:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 253620 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id DE94B2C03C7 for ; Mon, 24 Jun 2013 12:19:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D3DAFA0151; Mon, 24 Jun 2013 02:19:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MRqRCasK2Q2z; Mon, 24 Jun 2013 02:19:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AE18EA013A; Mon, 24 Jun 2013 02:19:21 +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 F0F918F79E for ; Mon, 24 Jun 2013 02:19:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D200084258 for ; Mon, 24 Jun 2013 02:19:18 +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 0czjwSG6CXXK for ; Mon, 24 Jun 2013 02:19:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 361EE81DCF for ; Mon, 24 Jun 2013 02:19:17 +0000 (UTC) Received: from asgard (host17.190-139-225.telecom.net.ar [190.139.225.17]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r5O2JA97020473 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 24 Jun 2013 02:19:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1372040355; bh=0SfwFQlZH+CcgKUFaGO5ZsGbvwqI3y974OPQMzBeg5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tvIuTnelYUZML1bafqPk6wDD6e0WksBQmvT0ywc5OcS7el+AhBRqzmYGVfEHEiqHd txQ89LUy5SZQQpy5dF9X71CsY5MqlsRlyYVZflLvAjTFWaGOk0C/hEuHJFXOFmyze9 AsB+Jfvr4lEXEI7w8kbULvN+lA1eTVx/A6eAtpuc= Received: by asgard (sSMTP sendmail emulation); Sun, 23 Jun 2013 23:19:10 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sun, 23 Jun 2013 23:19:03 -0300 Message-Id: <1372040343-28255-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1372040343-28255-1-git-send-email-gustavo@zacarias.com.ar> References: <1372040343-28255-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/2] hiawatha: bump to version 9.2 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 Patch dropped since the polarssl external library option is now upstream. Signed-off-by: Gustavo Zacarias --- .../hiawatha-support-for-external-polarssl.patch | 61 ---------------------- package/hiawatha/hiawatha.mk | 6 ++- 2 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 package/hiawatha/hiawatha-support-for-external-polarssl.patch diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch deleted file mode 100644 index 5441a52..0000000 --- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch +++ /dev/null @@ -1,61 +0,0 @@ -Enable linking against an external PolarSSL - -Hiawatha contains its own copy of the PolarSSL source code, and its -build system builds this private copy of PolarSSL and links to it. In -the context of Buildroot, we prefer to link against the PolarSSL built -externally by the polarssl package. - -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.5 -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -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_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) -+ if(NOT ENABLE_SSL_EXTERNAL) - option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." ON) - set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) - set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/hiawatha) -+ include_directories(polarssl/include) - add_subdirectory(polarssl) -+ endif() - set(POLARSSL_LIBRARY "polarssl") - endif() - - # Hiawatha --include_directories(${CMAKE_CURRENT_BINARY_DIR} polarssl/include) - if(ENABLE_XSLT) - include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR}) - endif() - -+include_directories(${CMAKE_CURRENT_BINARY_DIR}) -+ - # Configure files - configure_file(config.h.in config.h) - foreach (configfile ${config_files_in}) -@@ -121,7 +126,9 @@ - target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY}) - if(ENABLE_SSL) - target_link_libraries(hiawatha ${POLARSSL_LIBRARY}) -+ if(NOT ENABLE_SSL_EXTERNAL) - set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) -+ endif() - endif() - if(ENABLE_XSLT) - target_link_libraries(hiawatha ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 1ecb0e8..4be8149 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -4,14 +4,16 @@ # ################################################################################ -HIAWATHA_VERSION = 9.1 +HIAWATHA_VERSION = 9.2 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 +HIAWATHA_CONF_OPT += -DUSE_SYSTEM_POLARSSL=ON HIAWATHA_DEPENDENCIES += polarssl +else +HIAWATHA_CONF_OPT += -DENABLE_SSL=OFF endif HIAWATHA_CONF_OPT += \