[Pkg-voip-commits] r8177 - in /qutecom/trunk/debian: changelog control patches/libpurple-glib.patch rules

cavedon at alioth.debian.org cavedon at alioth.debian.org
Tue Mar 9 08:40:06 UTC 2010 

Author: cavedon
Date: Tue Mar  9 08:40:05 2010
New Revision: 8177

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8177
Log:
* Compile against external libpurple (CVE-2010-0423, CVE-2010-0420,
CVE-2010-0277). Closes: #559785, #572946
* Fix libpurple-glib.patch

Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/control
    qutecom/trunk/debian/patches/libpurple-glib.patch
    qutecom/trunk/debian/rules

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=8177&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Tue Mar  9 08:40:05 2010
@@ -3,8 +3,10 @@
   * Add fix-binutils-gold.patch for building with binutils-gold, although it
     may still FTBFS because of #563366. Closes: #556311.
   * Add libpurple-glib.patch for fixing crash with external liburple.
-
- -- Ludovico Cavedon <cavedon at debian.org>  Mon, 08 Mar 2010 18:17:03 +0100
+  * Compile against external libpurple (CVE-2010-0423, CVE-2010-0420,
+    CVE-2010-0277). Closes: #559785, #572946.
+
+ -- Ludovico Cavedon <cavedon at debian.org>  Mon, 08 Mar 2010 18:20:00 +0100
 
 qutecom (2.2~rc3.hg396~dfsg1-5) unstable; urgency=low
 

Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=8177&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Tue Mar  9 08:40:05 2010
@@ -12,7 +12,7 @@
  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-openssl-dev (>= 7.16.1),
- dpkg-dev (>= 1.13.19), libx11-dev, python-dev
+ dpkg-dev (>= 1.13.19), libx11-dev, python-dev, libpurple-dev (>= 2.6.6)
 Build-Conflicts: qt3-dev-tools
 Standards-Version: 3.8.3
 Homepage: http://www.qutecom.org/

Modified: qutecom/trunk/debian/patches/libpurple-glib.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/libpurple-glib.patch?rev=8177&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/libpurple-glib.patch (original)
+++ qutecom/trunk/debian/patches/libpurple-glib.patch Tue Mar  9 08:40:05 2010
@@ -12,13 +12,56 @@
 Index: qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp
 ===================================================================
 --- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2009-05-23 05:49:45.000000000 +0200
-+++ qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2010-03-08 18:12:01.000000000 +0100
-@@ -198,6 +198,20 @@
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2010-03-08 22:37:03.000000000 +0100
+@@ -198,6 +198,63 @@
  	NULL
  };
  
++void MyPurpleIMInit(const gchar* pathToProfile) {
++
++	char * home_dir = g_build_filename(pathToProfile, "purple", NULL);
++	printf("pathToProfile %s\nEND\n", home_dir);
++	// Remove Purple config directory
++	File file(home_dir);
++	file.remove();
++
++	std::string ssl_certificates;
++	std::string ssl_certificates_env("QUTECOM_SSL_CERTIFICATES_DIR=");
++#if defined(OS_WINDOWS) or defined(OS_LINUX)
++	ssl_certificates = Path::getApplicationDirPath() + Path::getPathSeparator() + "ca-certs";
++#elif defined(OS_MACOSX)
++	ssl_certificates = Path::getApplicationResourcesDirPath() + Path::getPathSeparator() +  "ca-certs";
++#endif
++
++	ssl_certificates_env += ssl_certificates;
++
++	putenv((char*)ssl_certificates_env.c_str());
++
++	File::createPath(home_dir + File::getPathSeparator());
++	purple_util_set_user_dir(home_dir);
++
++	if(getenv("OW_PURPLE_DEBUG")) {
++		purple_debug_set_enabled(TRUE);
++	}
++
++	purple_core_set_ui_ops(&core_wg_ops);
++	purple_eventloop_set_ui_ops(&eventloop_wg_ops);
++
++	char * search_path = g_build_filename(Path::getApplicationDirPath().c_str(), "plugins", NULL);
++	purple_plugins_add_search_path(search_path);
++	purple_plugins_add_search_path("plugins");
++	g_free(search_path);
++
++	purple_request_set_ui_ops(&request_wg_ops);
++
++	LOG_DEBUG("CREAT TID %x", pthread_self());
++	if (!purple_core_init("QuteCom PURPLE")) {
++		LOG_WARN("Initialization of the Purple core failed\n");
++	}
++}
++
 +static gboolean purple_wg_init_lib(gpointer data) {
-+	MyPurpleIMInit(*((const std::string *)data));
++	MyPurpleIMInit((const gchar *)data);
 +	return false;
 +}
 +
@@ -34,7 +77,7 @@
  bool PurpleIMFactory::equals(const IMAccount & imAccount, std::string login, EnumIMProtocol::IMProtocol protocol) {
  	return ((imAccount.getLogin() == login) && (imAccount.getProtocol() == protocol));
  }
-@@ -270,7 +284,8 @@
+@@ -270,7 +327,8 @@
  }
  
  void PurpleIMFactory::init(const std::string & pathToProfile) {
@@ -44,7 +87,7 @@
  	PurpleWrapperInit();
  }
  
-@@ -285,12 +300,12 @@
+@@ -285,12 +343,12 @@
  	if (AccountMngr) {
  		AccountMngr->reset();
  	}

Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=8177&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Tue Mar  9 08:40:05 2010
@@ -24,7 +24,7 @@
 	-DSPEEX_INTERNAL=OFF \
 	-DSAMPLERATE_INTERNAL=OFF \
 	-DCURL_INTERNAL=OFF \
-	-DLIBPURPLE_INTERNAL=ON \
+	-DLIBPURPLE_INTERNAL=OFF \
 	-DPHAPI_VIDEO_SUPPORT=ON \
 	-DHAVE_SWSCALE=1

More information about the Pkg-voip-commits mailing list