[oe-commits] Stanislav Brabec : viking: Potential fix of curl crashes.

[git version control]

Module: openembedded.git
Branch: master
Commit: 4d527f4c48ca5c3a0cf7e1c4145f1950b8762fdf
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4d527f4c48ca5c3a0cf7e1c4145f1950b8762fdf

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Sat Apr 16 22:45:50 2011 +0000

viking: Potential fix of curl crashes.

Signed-off-by: Stanislav Brabec <utx at penguin.cz>

---

 .../viking/viking-0.9.6/viking-curl-crash.patch    |   20 ++++++++++++++++++++
 recipes/viking/viking_0.9.6.bb                     |    5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/recipes/viking/viking-0.9.6/viking-curl-crash.patch b/recipes/viking/viking-0.9.6/viking-curl-crash.patch
new file mode 100644
index 0000000..dd6437a
--- /dev/null
+++ b/recipes/viking/viking-0.9.6/viking-curl-crash.patch
@@ -0,0 +1,20 @@
+commit 8cd9c9918dad02c1682887e0cbe0269a6717b47d
+Author: Rob Norris <rw_norris at hotmail.com>
+Date:   Wed Apr 6 00:24:44 2011 +0100
+
+    Fix crashing due to incorrect usage of libcurl - SF#3206628.
+    
+    Tell curl we are a multi-threaded program - i.e. it can not use signals.
+
+Index: viking-0.9.6/src/curl_download.c
+===================================================================
+--- viking-0.9.6.orig/src/curl_download.c
++++ viking-0.9.6/src/curl_download.c
+@@ -120,6 +120,7 @@ int curl_download_uri ( const char *uri,
+     {
+       if (vik_verbose)
+         curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 );
++      curl_easy_setopt ( curl, CURLOPT_NOSIGNAL, 1 ); // Yep, we're a multi-threaded program so don't let signals mess it up!
+       curl_easy_setopt ( curl, CURLOPT_URL, uri );
+       curl_easy_setopt ( curl, CURLOPT_FILE, f );
+       curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func);
diff --git a/recipes/viking/viking_0.9.6.bb b/recipes/viking/viking_0.9.6.bb
index 13d9801..5795f5f 100644
--- a/recipes/viking/viking_0.9.6.bb
+++ b/recipes/viking/viking_0.9.6.bb
@@ -4,11 +4,12 @@ SECTION = "x11/applications"
 DEPENDS = "curl gpsd gtk+ intltool-native"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/viking/viking-${PV}.tar.gz \
 	file://viking-openaerialmap.patch \
-	file://viking-parallel-build.patch"
+	file://viking-parallel-build.patch \
+	file://viking-curl-crash.patch"
 
 EXTRA_OECONF = "--disable-realtime-gps-tracking"