[polarssl] Fix for #1161948

[Morten Stevens]

commit acc0218869adacdbdfd625d1a2d6e5ef6bef7f7e
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Mon Nov 10 14:54:27 2014 +0100

    Fix for #1161948

 fix-debuginfo.patch |   23 +++++++++++++++++++++++
 polarssl.spec       |    7 ++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/fix-debuginfo.patch b/fix-debuginfo.patch
new file mode 100644
index 0000000..41e777a
--- /dev/null
+++ b/fix-debuginfo.patch
@@ -0,0 +1,23 @@
+From 5ed24892285b670fc94c38804500a6af2e63d3ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Sun, 9 Nov 2014 18:55:56 +0200
+Subject: [PATCH] Don't throw away user set CFLAGS
+
+This was apparently accidentally broken in commit 39141fed.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9e1158c..0dae417 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(POLARSSL C)
+ string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
+ 
+ if(CMAKE_COMPILER_IS_GNUCC)
+-  set(CMAKE_C_FLAGS "-Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
+   set(CMAKE_C_FLAGS_RELEASE "-O2")
+   set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
+   set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 --coverage")
diff --git a/polarssl.spec b/polarssl.spec
index 21d0904..9eb383b 100644
--- a/polarssl.spec
+++ b/polarssl.spec
@@ -1,11 +1,12 @@
 Name: polarssl
 Version: 1.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Light-weight cryptographic and SSL/TLS library
 Group: System Environment/Libraries
 License: GPLv2+
 URL: http://polarssl.org/
 Source0: http://polarssl.org/download/%{name}-%{version}-gpl.tgz
+Patch0: fix-debuginfo.patch
 
 BuildRequires: cmake
 BuildRequires: doxygen
@@ -36,6 +37,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-debuginfo
 
 %build
 %cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_POLARSSL_LIBRARY:BOOL=1 .
@@ -67,6 +69,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/polarssl
 %{_libdir}/*.a
 
 %changelog
+* Mon Nov 10 2014 Morten Stevens <mstevens at imt-systems.com> - 1.3.9-2
+- Add upstream patch to fix #1161948
+
 * Mon Nov 03 2014 Morten Stevens <mstevens at imt-systems.com> - 1.3.9-1
 - Update to 1.3.9 (#1157506, #1159847)