diff options
| author |   Stanislav Brabec <utx@penguin.cz> | 2011-04-16 22:45:50 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2011-04-16 22:45:50 +0000 |
| commit | 4d527f4c48ca5c3a0cf7e1c4145f1950b8762fdf (patch) | |
| tree | 20d28e4b2cef6ce73e3e829c4e7fce296410053f /recipes/viking | |
| parent | 0f07712e6d276c9a0c82458a89ec1f0b00d4377a (diff) | |
| download | openembedded-4d527f4c48ca5c3a0cf7e1c4145f1950b8762fdf.tar.gz | |
viking: Potential fix of curl crashes.
Signed-off-by: Stanislav Brabec <utx@penguin.cz>
Diffstat (limited to 'recipes/viking')
| -rw-r--r-- | recipes/viking/viking-0.9.6/viking-curl-crash.patch | 20 | ||||
| -rw-r--r-- | 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 0000000000..dd6437aa41 --- /dev/null +++ b/recipes/viking/viking-0.9.6/viking-curl-crash.patch @@ -0,0 +1,20 @@ +commit 8cd9c9918dad02c1682887e0cbe0269a6717b47d +Author: Rob Norris <rw_norris@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 13d98015c0..5795f5fb3b 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" |