[Pkg-voip-commits] r6913 - in /qutecom/trunk/debian: changelog patches/debian/purple_perl_tcl_noload.patch patches/generic/accept_certificate.patch patches/generic/libpurple_debug.patch patches/series

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Thu Mar 26 04:49:30 UTC 2009


Author: cavedon-guest
Date: Thu Mar 26 04:49:29 2009
New Revision: 6913

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6913
Log:
* debian/purple_perl_tcl_noload.patch: temporary hack to prevent libpurple
  from loading buggy tcl and perl plugins.
* generic/accept_certificate.patch: accept non-matching SSL certificate by
  default (replicate behavior of libpurple with openssl).
* debian/patches/generic/libpurple_debug.patch: add OW_PURPLE_DEBUG env
  variable to enable libpurple debugging.


Added:
    qutecom/trunk/debian/patches/debian/purple_perl_tcl_noload.patch
    qutecom/trunk/debian/patches/generic/accept_certificate.patch
    qutecom/trunk/debian/patches/generic/libpurple_debug.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/patches/series

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=6913&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Thu Mar 26 04:49:29 2009
@@ -3,13 +3,19 @@
   * Use newer Boost libraries.
   * Update README.Debian about video support. 
   * Add generic/boost_1_37.patch for correct detection of boost libraries.
-  * Use system libpurple.
   * Updating Standards-Version to 3.8.1.
   * Add patch generic/pixelformat.patch: compilation fix, required by newer
     ffmpeg libs.
   * Update debhelper compatibility to 7.
-
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Thu, 19 Mar 2009 21:17:09 -0700
+  * Use system libpurple.
+  * debian/purple_perl_tcl_noload.patch: temporary hack to prevent libpurple
+    from loading buggy tcl and perl plugins.
+  * generic/accept_certificate.patch: accept non-matching SSL certificate by
+    default (replicate behavior of libpurple with openssl).
+  * debian/patches/generic/libpurple_debug.patch: add OW_PURPLE_DEBUG env
+    variable to enable libpurple debugging.
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Wed, 25 Mar 2009 21:44:03 -0700
 
 qutecom (2.2~rc3.dfsg1-4) experimental; urgency=low
 

Added: qutecom/trunk/debian/patches/debian/purple_perl_tcl_noload.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/purple_perl_tcl_noload.patch?rev=6913&op=file
==============================================================================
--- qutecom/trunk/debian/patches/debian/purple_perl_tcl_noload.patch (added)
+++ qutecom/trunk/debian/patches/debian/purple_perl_tcl_noload.patch Thu Mar 26 04:49:29 2009
@@ -1,0 +1,24 @@
+Index: qutecom-2.2~rc3.dfsg2/libs/imwrapper/src/purple/PurpleIMFactory.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg2.orig/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2009-03-25 19:48:25.000000000 -0700
++++ qutecom-2.2~rc3.dfsg2/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2009-03-25 21:26:20.000000000 -0700
+@@ -254,6 +254,19 @@
+ 		purple_debug_set_enabled(TRUE);
+ 	}
+ 
++	// temporary hack to avoid loading buggy plugins: perl and tcl
++	{
++		GList *plugins = purple_plugins_get_all();
++		const char *bad_plugins[] = { "/fake/perl", "/fake/tcl" };
++		size_t i;
++		for(i = 0; i < sizeof(bad_plugins); ++i) {
++			PurplePlugin *plugin = purple_plugin_new(0, bad_plugins[i]);
++                        plugin->info = g_new0(PurplePluginInfo, 1);
++                        plugin->info->type = PURPLE_PLUGIN_UNKNOWN;
++                        purple_plugin_register(plugin);
++		}
++	}
++
+ 	purple_core_set_ui_ops(&core_wg_ops);
+ 	purple_eventloop_set_ui_ops(&eventloop_wg_ops);
+ 

Added: qutecom/trunk/debian/patches/generic/accept_certificate.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/accept_certificate.patch?rev=6913&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/accept_certificate.patch (added)
+++ qutecom/trunk/debian/patches/generic/accept_certificate.patch Thu Mar 26 04:49:29 2009
@@ -1,0 +1,60 @@
+# HG changeset patch
+# User ludovico.cavedon at gmail.com
+# Date 1237671131 25200
+# Branch purple
+# Node ID b69dbf9cad6cdbe1a22e9b5b9bf017c5789ee42c
+# Parent  32f5bb7289293c5efe32a31a10a8bbb548967fca
+Accept SSL certificate with wrong hostname
+
+diff -r 32f5bb728929 -r b69dbf9cad6c libs/imwrapper/src/purple/PurpleIMFactory.cpp
+--- a/libs/imwrapper/src/purple/PurpleIMFactory.cpp	Sat Mar 21 14:27:28 2009 -0700
++++ b/libs/imwrapper/src/purple/PurpleIMFactory.cpp	Sat Mar 21 14:32:11 2009 -0700
+@@ -140,6 +140,19 @@
+ 	return closure->result;
+ }
+ 
++static void* purple_wg_request_action(const char *title, const char *primary,
++		const char *secondary, int default_action,
++		PurpleAccount *account, const char *who,
++		PurpleConversation *conv, void *user_data, size_t action_count,
++		va_list actions) {
++	const char *text = va_arg(actions, const char *);
++	PurpleRequestActionCb callback = va_arg(actions, PurpleRequestActionCb);
++
++	LOG_WARN("requested action: %s: %s, %s. Default action: %s", title, primary, secondary, text);
++	callback(user_data, 0);
++        return NULL;
++}
++
+ gpointer PurpleMainEventLoop(gpointer data) {
+ 	if (gMainLoop) {
+ 		LOG_FATAL("gMainLoop already created");
+@@ -170,6 +183,19 @@
+ 	g_source_remove,
+ 	purple_wg_input_add,
+ 	g_source_remove
++};
++
++static PurpleRequestUiOps request_wg_ops = {
++	NULL,
++	NULL,
++	purple_wg_request_action,
++	NULL,
++	NULL,
++	NULL,
++	NULL,
++	NULL,
++	NULL,
++	NULL
+ };
+ 
+ bool PurpleIMFactory::equals(const IMAccount & imAccount, std::string login, EnumIMProtocol::IMProtocol protocol) {
+@@ -236,6 +262,8 @@
+ 	purple_plugins_add_search_path("plugins");
+ 	g_free(search_path);
+ 
++	purple_request_set_ui_ops(&request_wg_ops);
++
+ 	if (!purple_core_init("Wengo PURPLE")) {
+ 		LOG_WARN("Initialization of the Purple core failed\n");
+ 	}

Added: qutecom/trunk/debian/patches/generic/libpurple_debug.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/libpurple_debug.patch?rev=6913&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/libpurple_debug.patch (added)
+++ qutecom/trunk/debian/patches/generic/libpurple_debug.patch Thu Mar 26 04:49:29 2009
@@ -1,0 +1,30 @@
+# HG changeset patch
+# User ludovico.cavedon at gmail.com
+# Date 1237670848 25200
+# Branch purple
+# Node ID 32f5bb7289293c5efe32a31a10a8bbb548967fca
+# Parent  5f156076cafd67e51468989c007149439372dbbf
+Add OW_PURPLE_DEBUG for libpurple debugging
+
+diff -r 5f156076cafd -r 32f5bb728929 libs/imwrapper/src/purple/PurpleIMFactory.cpp
+--- a/libs/imwrapper/src/purple/PurpleIMFactory.cpp	Thu Mar 19 21:31:18 2009 +0100
++++ b/libs/imwrapper/src/purple/PurpleIMFactory.cpp	Sat Mar 21 14:27:28 2009 -0700
+@@ -23,6 +23,8 @@
+ 	#include <winsock2.h>
+ 	#include <windows.h>
+ #endif
++
++#include <stdlib.h>
+ 
+ //#ifndef CC_MSVC8
+ //extern "C" {
+@@ -222,6 +224,10 @@
+ 	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);

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6913&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Thu Mar 26 04:49:29 2009
@@ -6,6 +6,9 @@
 generic/wengophone-thread-destruction.patch
 generic/boost_1_37.patch
 generic/pixelfromat.patch
+generic/libpurple_debug.patch
+generic/accept_certificate.patch
 debian/cmake-noavformat.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch
+debian/purple_perl_tcl_noload.patch




More information about the Pkg-voip-commits mailing list