diff options
author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2014-07-11 18:06:28 -0300 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-07-12 11:48:55 +0200 |
commit | d296361aa8900ca06f2c426365fc1fed5a869b0e (patch) | |
tree | 8f572b3d1852826108152f02b87334904bcd7d28 /package/polarssl/polarssl-shared-and-static-library.patch | |
parent | d0c4261bd1b7eae75782667d237b2ae216bc6828 (diff) | |
download | buildroot-d296361aa8900ca06f2c426365fc1fed5a869b0e.tar.gz buildroot-d296361aa8900ca06f2c426365fc1fed5a869b0e.zip |
polarssl: security bump to version 1.2.11
Fixes CVE-2014-4911 and a few other issues that don't have a CVE assigned
(backports from 1.3.x branch).
The no programs & shared/static patches are now upstream albeit in a
slightly different form.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/polarssl/polarssl-shared-and-static-library.patch')
-rw-r--r-- | package/polarssl/polarssl-shared-and-static-library.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch deleted file mode 100644 index 7e41745d36..0000000000 --- a/package/polarssl/polarssl-shared-and-static-library.patch +++ /dev/null @@ -1,55 +0,0 @@ -Allow both shared and static PolarSSL library - -By default, PolarSSL is built as a static library. If the option -USE_SHARED_POLARSSL_LIBRARY is set, then it is build as a shared -library. But there is no way of building both the shared and static -versions. - -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.10] -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -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) - - set(src - aes.c -@@ -50,19 +51,23 @@ - set(libs ws2_32) - endif(WIN32) - --if(NOT USE_SHARED_POLARSSL_LIBRARY) -- --add_library(polarssl STATIC ${src}) -- --else(NOT USE_SHARED_POLARSSL_LIBRARY) -+if(USE_SHARED_POLARSSL_LIBRARY) - - add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.2.10 SOVERSION 3) -+set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl) -+ -+endif(USE_SHARED_POLARSSL_LIBRARY) -+ -+if(USE_STATIC_POLARSSL_LIBRARY) -+ -+add_library(polarssl-static STATIC ${src}) -+set_target_properties(polarssl-static PROPERTIES OUTPUT_NAME polarssl) - --endif(NOT USE_SHARED_POLARSSL_LIBRARY) -+endif(USE_STATIC_POLARSSL_LIBRARY) - - target_link_libraries(polarssl ${libs}) - --install(TARGETS polarssl -+install(TARGETS polarssl polarssl-static - DESTINATION ${LIB_INSTALL_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) |