From patchwork Mon Dec 3 14:46:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 203370 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 3C7BD2C007E for ; Tue, 4 Dec 2012 01:47:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8EF9EA01A8; Mon, 3 Dec 2012 14:47:14 +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 lwja2xk7iqL1; Mon, 3 Dec 2012 14:47:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D30E7A0196; Mon, 3 Dec 2012 14:47:04 +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 9D7BA8F74A for ; Mon, 3 Dec 2012 14:47:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A458897DC for ; Mon, 3 Dec 2012 14:47:02 +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 UpBNjY+epKsZ for ; Mon, 3 Dec 2012 14:47:01 +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 39A2F87A8B for ; Mon, 3 Dec 2012 14:47:01 +0000 (UTC) Received: from asgard (host201.201-252-64.telecom.net.ar [201.252.64.201]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qB3Eks7u014770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 3 Dec 2012 14:46:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1354546019; bh=bMW+cWB8zzTPdbLS0xCBNqV2/YYdlOOuMU5AuMczliM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pf6r/NIt/uCt/cm4V4GHAf5ayUmEFDARpeWFrO9NyjRd/yPyyWk3YuxfSqRUtvlni pnCXritp7FJFyKMhP0kXHbvB1oSLz6LzgfRnwRPEsx10GdET66NfCWl8A95ukUZ9vE qigZa/y2leMMoeBRJFgG7llO/GutZdejDKTokneY= Received: by asgard (sSMTP sendmail emulation); Mon, 03 Dec 2012 11:46:54 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 3 Dec 2012 11:46:06 -0300 Message-Id: <1354545972-26783-8-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1354545972-26783-1-git-send-email-gustavo@zacarias.com.ar> References: <1354545972-26783-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 08/14] polarssl: bump to version 1.2.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 Signed-off-by: Gustavo Zacarias --- .../polarssl-shared-and-static-library.patch | 10 +++++----- package/polarssl/polarssl.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch index e11cab3..ec65285 100644 --- a/package/polarssl/polarssl-shared-and-static-library.patch +++ b/package/polarssl/polarssl-shared-and-static-library.patch @@ -9,13 +9,13 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON) in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which defaults to OFF). Both options can be manipulated independently. -[Gustavo: update for polarssl 1.2.0] +[Gustavo: update for polarssl 1.2.3] Signed-off-by: Thomas Petazzoni Signed-off-by: Gustavo Zacarias -diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt ---- polarssl-1.2.0.orig/library/CMakeLists.txt 2012-11-15 15:01:58.239248830 -0300 -+++ polarssl-1.2.0/library/CMakeLists.txt 2012-11-15 15:00:10.310806353 -0300 +diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMakeLists.txt +--- polarssl-1.2.3.orig/library/CMakeLists.txt 2012-11-27 17:16:20.735678722 -0300 ++++ polarssl-1.2.3/library/CMakeLists.txt 2012-11-27 17:18:09.760457733 -0300 @@ -1,4 +1,5 @@ option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF) +option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON) @@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMa +if(USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2) + set_target_properties(polarssl PROPERTIES VERSION 1.2.3 SOVERSION 2) +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl) + +endif(USE_SHARED_POLARSSL_LIBRARY) diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk index edda9bf..c66c633 100644 --- a/package/polarssl/polarssl.mk +++ b/package/polarssl/polarssl.mk @@ -1,5 +1,5 @@ POLARSSL_SITE = https://polarssl.org/download -POLARSSL_VERSION = 1.2.0 +POLARSSL_VERSION = 1.2.3 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz POLARSSL_CONF_OPT = \ -DUSE_SHARED_POLARSSL_LIBRARY=ON \