From ce0703bd0fa9c75a075574413c8f68ff8ce48c28 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 28 Mar 2013 01:34:07 +0000 Subject: [PATCH] polarssl: security bump to version 1.2.6 Fixes CVE-2013-0169. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/polarssl/polarssl-shared-and-static-library.patch | 4 ++-- package/polarssl/polarssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch index 8f7ce5f5b8..f4f4746306 100644 --- a/package/polarssl/polarssl-shared-and-static-library.patch +++ b/package/polarssl/polarssl-shared-and-static-library.patch @@ -9,7 +9,7 @@ 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.5] +[Gustavo: update for polarssl 1.2.6] Signed-off-by: Thomas Petazzoni Signed-off-by: Gustavo Zacarias @@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa +if(USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.2.5 SOVERSION 2) + set_target_properties(polarssl PROPERTIES VERSION 1.2.6 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 0478f8a3de..c05a307696 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.5 +POLARSSL_VERSION = 1.2.6 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz POLARSSL_CONF_OPT = \ -DUSE_SHARED_POLARSSL_LIBRARY=ON \ -- 2.30.2