[Pkg-voip-commits] r4265 - in wengophone/trunk/debian: . patches patches/generic
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Fri Aug 24 11:50:14 UTC 2007
Author: cavedon-guest
Date: 2007-08-24 11:50:14 +0000 (Fri, 24 Aug 2007)
New Revision: 4265
Added:
wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/control
wengophone/trunk/debian/patches/series
Log:
* Added patch curl-openssl-mt-fix.patch to fix some crashes inside cURL lib
* reverted dependency on libcurl3-openssl-dev
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2007-08-24 07:06:33 UTC (rev 4264)
+++ wengophone/trunk/debian/changelog 2007-08-24 11:50:14 UTC (rev 4265)
@@ -21,10 +21,12 @@
(lintian info desktop-entry-contains-encoding-key)
* Modified qobjectthreadsafe-fix-qt42.patch to initialize _blockEvents
before calling moveToThread()
- * Changed Build-Depends from libcurl3-openssl-dev to libcurl4-dev (cleaner
- valgrind output!)
+ * Added patch curl-openssl-mt-fix.patch to fix some crashes inside cURL lib:
+ - initialize cURL before stating threads
+ - set CURLOPT_NOSIGNAL to 1, as specified in cURL doc
+ - initialize openssl with locking callbacks for multi-thread applications
- -- Ludovico Cavedon <cavedon at sssup.it> Thu, 23 Aug 2007 16:35:03 +0000
+ -- Ludovico Cavedon <cavedon at sssup.it> Fri, 24 Aug 2007 11:44:50 +0000
wengophone (2.1.1.dfsg0-2) unstable; urgency=low
Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control 2007-08-24 07:06:33 UTC (rev 4264)
+++ wengophone/trunk/debian/control 2007-08-24 11:50:14 UTC (rev 4265)
@@ -13,7 +13,7 @@
libboost-program-options-dev (>= 1.34.0-1), uuid-dev,
libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
- libsndfile1-dev (>= 1.0.12), libcurl4-dev (>= 7.16.1),
+ libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/wengophone/trunk
Added: wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch 2007-08-24 11:50:14 UTC (rev 4265)
@@ -0,0 +1,156 @@
+Index: wengophone-2.1.1.dfsg0/libs/owutil/http/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/CMakeLists.txt 2007-03-01 14:37:00.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/owutil/http/CMakeLists.txt 2007-08-24 11:43:23.000000000 +0000
+@@ -7,6 +7,7 @@
+
+ ow_use_private_libraries(
+ curl
++ httptunnel
+ )
+
+ if (WIN32)
+@@ -18,6 +19,7 @@
+
+ ow_add_sources(
+ src/HttpRequest.cpp
++ src/HttpRequestFactory.cpp
+ src/curl/CurlHttpRequest.cpp
+ #src/null/NullHttpRequest.cpp
+ #src/qt/QtHttpRequest.cpp
+Index: wengophone-2.1.1.dfsg0/libs/owutil/http/HttpRequest.h
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/HttpRequest.h 2007-01-31 17:57:31.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/owutil/http/HttpRequest.h 2007-08-24 11:43:23.000000000 +0000
+@@ -156,6 +156,8 @@
+
+ OWHTTP_API void abort();
+
++ OWHTTP_API static void init();
++
+ private:
+
+ //Inherited from Thread
+Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequest.cpp
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/src/HttpRequest.cpp 2007-01-31 17:57:31.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequest.cpp 2007-08-24 11:43:23.000000000 +0000
+@@ -156,6 +156,10 @@
+ void HttpRequest::run() {
+ }
+
++void HttpRequest::init() {
++ HttpRequestFactory::init();
++}
++
+ void HttpRequest::answerReceivedEventHandler(IHttpRequest * sender, int requestId, const std::string & answer, Error error) {
+ //sender = _httpRequestPrivate
+ //sender now is HttpRequest that will delete _httpRequestPrivate
+Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.cpp 2007-08-24 11:43:23.000000000 +0000
+@@ -0,0 +1,15 @@
++#include "HttpRequestFactory.h"
++
++#include <httptunnel.h>
++
++#include <util/Logger.h>
++
++#include <curl/curl.h>
++
++void HttpRequestFactory::init() {
++ CURLcode ret = curl_global_init(CURL_GLOBAL_ALL);
++ if(ret)
++ LOG_ERROR("initialization of curl failed");
++ http_tunnel_init_ssl();
++}
++
+Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.h
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/src/HttpRequestFactory.h 2007-03-01 12:17:48.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.h 2007-08-24 11:43:59.000000000 +0000
+@@ -36,6 +36,8 @@
+ class HttpRequestFactory : NonCopyable {
+ public:
+
++ static void init();
++
+ static IHttpRequest * create() {
+ //new QtHttpRequest();
+ //new NullHttpRequest();
+Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/curl/CurlHttpRequest.cpp
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/src/curl/CurlHttpRequest.cpp 2007-03-19 17:31:18.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/curl/CurlHttpRequest.cpp 2007-08-24 11:43:23.000000000 +0000
+@@ -205,7 +205,7 @@
+ //curl_easy_setopt(_curl, CURLOPT_WRITEHEADER, this);
+ curl_easy_setopt(_curl, CURLOPT_WRITEDATA, this);
+ curl_easy_setopt(_curl, CURLOPT_PROGRESSDATA, this);
+- curl_easy_setopt(_curl, CURLOPT_NOSIGNAL, 0);
++ curl_easy_setopt(_curl, CURLOPT_NOSIGNAL, 1);
+ curl_easy_setopt(_curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+
+ //Maximum time in seconds that you allow the libcurl transfer operation to take
+Index: wengophone-2.1.1.dfsg0/wengophone/src/model/WengoPhone.cpp
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/wengophone/src/model/WengoPhone.cpp 2007-06-20 08:44:26.000000000 +0000
++++ wengophone-2.1.1.dfsg0/wengophone/src/model/WengoPhone.cpp 2007-08-24 11:43:23.000000000 +0000
+@@ -50,6 +50,7 @@
+ _enableSerialization = true;
+ _startupSettingListener = new StartupSettingListener();
+
++ HttpRequest::init();
+ //set HttpRequest User Agent
+ std::stringstream ss;
+ ss << WengoPhoneBuildId::getSoftphoneName();
+Index: wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.c
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/wifo/httptunnel/httptunnel.c 2007-04-20 14:29:17.000000000 +0000
++++ wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.c 2007-08-24 11:43:23.000000000 +0000
+@@ -93,7 +93,7 @@
+
+ int UseProxy = 0;
+
+-int UseSSL = 0;
++int UseSSL = 1;
+ int sslIsInit = 0;
+
+ #ifdef HT_USE_SSL
+Index: wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.h
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/wifo/httptunnel/httptunnel.h 2007-01-26 13:40:41.000000000 +0000
++++ wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.h 2007-08-24 11:43:23.000000000 +0000
+@@ -88,6 +88,7 @@
+ int http_tunnel_close(void *h_tunnel);
+ void http_tunnel_init_host(const char *hostname, int port, int ssl);
+ void http_tunnel_init_proxy(const char *hostname, int port, const char *username, const char *password);
++void http_tunnel_init_ssl();
+ void http_tunnel_clean_up();
+ #ifdef __cplusplus
+ }
+Index: wengophone-2.1.1.dfsg0/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/CMakeLists.txt 2007-06-21 13:59:17.000000000 +0000
++++ wengophone-2.1.1.dfsg0/CMakeLists.txt 2007-08-24 11:43:23.000000000 +0000
+@@ -26,6 +26,7 @@
+ subdirs(
+ libs/3rdparty
+
++ wifo/httptunnel # Needed by owhttp
+ libs/owutil
+ libs/wenbox
+ libs/qtutil
+Index: wengophone-2.1.1.dfsg0/wifo/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/wifo/CMakeLists.txt 2007-04-24 10:01:04.000000000 +0000
++++ wengophone-2.1.1.dfsg0/wifo/CMakeLists.txt 2007-08-24 11:43:23.000000000 +0000
+@@ -35,7 +35,7 @@
+ endif (PHAPI_CODEC_ILBC_SUPPORT)
+
+ subdirs(
+- httptunnel
++# httptunnel # Moved in ../CMakeLists.txt
+ netlib
+ ortp
+ srtp
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2007-08-24 07:06:33 UTC (rev 4264)
+++ wengophone/trunk/debian/patches/series 2007-08-24 11:50:14 UTC (rev 4265)
@@ -10,6 +10,7 @@
generic/desktop-file-update.patch
generic/phapi-fix-empty-ctype-dos.patch
generic/def-enable-video-fix.patch
+generic/curl-openssl-mt-fix.patch
debian/remove-extra-copying-file.patch
debian/cmake-no-rpath_to_link_path.patch
debian/cmake-force-fpic.patch
More information about the Pkg-voip-commits
mailing list