tags 411944 + patch
thanks
Hi,
Attached is the diff for my ekiga 2.0.3-2.1 NMU.
Greetings
Martin
diff -u ekiga-2.0.3/debian/patches/00list ekiga-2.0.3/debian/patches/00list
--- ekiga-2.0.3/debian/patches/00list
+++ ekiga-2.0.3/debian/patches/00list
@@ -2,0 +3 @@
+20_CVE-2007-1006
diff -u ekiga-2.0.3/debian/changelog ekiga-2.0.3/debian/changelog
--- ekiga-2.0.3/debian/changelog
+++ ekiga-2.0.3/debian/changelog
@@ -1,3 +1,10 @@
+ekiga (2.0.3-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * NMU to apply patch from BTS to fix CVE 2007-1006 (Closes: #411944)
+
+ -- Martin Zobel-Helas <[EMAIL PROTECTED]> Mon, 26 Feb 2007 23:35:33 +0100
+
ekiga (2.0.3-2) unstable; urgency=high
* Rebuild with PWLib 1.10.2-2 and OPAL 2.2.3.dfsg-2 to overcome #392522. The
only in patch2:
unchanged:
--- ekiga-2.0.3.orig/debian/patches/20_CVE-2007-1006
+++ ekiga-2.0.3/debian/patches/20_CVE-2007-1006
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_CVE-2007-1006.dpatch by Martin Zobel-Helas <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patch for CVE 2007-1006
+
[EMAIL PROTECTED]@
+
+diff -rNu ekiga-2.0.3/src/endpoints/manager.cpp ekiga-2.0.3.new/src/endpoints/manager.cpp
+--- ekiga-2.0.3/src/endpoints/manager.cpp 2006-08-29 21:23:34.000000000 +0200
++++ ekiga-2.0.3.new/src/endpoints/manager.cpp 2007-02-26 23:27:31.019508250 +0100
+@@ -660,7 +660,7 @@
+ gnomemeeting_threads_enter ();
+ msg = g_strdup_printf (_("Forwarding call to %s"),
+ (const char*) forward_party);
+- gm_main_window_flash_message (main_window, msg);
++ gm_main_window_flash_message (main_window, "%s", msg);
+ gm_history_window_insert (history_window, msg);
+ gnomemeeting_threads_leave ();
+ g_free (msg);
+@@ -814,7 +814,7 @@
+ /* Update the log and status bar */
+ msg = g_strdup_printf (_("Call from %s"), (const char *) utf8_name);
+ gnomemeeting_threads_enter ();
+- gm_main_window_flash_message (main_window, msg);
++ gm_main_window_flash_message (main_window, "%s", msg);
+ gm_chat_window_push_info_message (chat_window, NULL, msg);
+ gm_history_window_insert (history_window, msg);
+ gnomemeeting_threads_leave ();
+@@ -854,7 +854,7 @@
+ /* Display the action message */
+ gnomemeeting_threads_enter ();
+ if (short_reason)
+- gm_main_window_flash_message (main_window, short_reason);
++ gm_main_window_flash_message (main_window, "%s", short_reason);
+ if (long_reason)
+ gm_history_window_insert (history_window, long_reason);
+ gnomemeeting_threads_leave ();
+@@ -1001,7 +1001,7 @@
+ utf8_name, utf8_app);
+ msg = g_strdup_printf (_("Connected with %s"), utf8_name);
+ gm_main_window_set_status (main_window, msg);
+- gm_main_window_flash_message (main_window, msg);
++ gm_main_window_flash_message (main_window, "%s", msg);
+ gm_chat_window_push_info_message (chat_window, NULL, msg);
+ gm_main_window_update_calling_state (main_window, GMManager::Connected);
+ gm_chat_window_update_calling_state (chat_window,
+@@ -1276,7 +1276,7 @@
+ gm_main_window_push_message (main_window,
+ GetMissedCallsNumber (),
+ GetMWI ());
+- gm_main_window_flash_message (main_window, msg_reason);
++ gm_main_window_flash_message (main_window, "%s", msg_reason);
+ gm_chat_window_push_info_message (chat_window, NULL, "");
+ gnomemeeting_threads_leave ();
+
+diff -rNu ekiga-2.0.3/src/endpoints/sip.cpp ekiga-2.0.3.new/src/endpoints/sip.cpp
+--- ekiga-2.0.3/src/endpoints/sip.cpp 2006-06-15 23:08:42.000000000 +0200
++++ ekiga-2.0.3.new/src/endpoints/sip.cpp 2007-02-26 23:28:12.610107500 +0100
+@@ -227,7 +227,7 @@
+ #endif
+
+ gm_history_window_insert (history_window, msg);
+- gm_main_window_flash_message (main_window, msg);
++ gm_main_window_flash_message (main_window, "%s", msg);
+ if (endpoint.GetCallingState() == GMManager::Standby)
+ gm_main_window_set_account_info (main_window,
+ endpoint.GetRegisteredAccounts());
+diff -rNu ekiga-2.0.3/src/endpoints/urlhandler.cpp ekiga-2.0.3.new/src/endpoints/urlhandler.cpp
+--- ekiga-2.0.3/src/endpoints/urlhandler.cpp 2006-05-17 22:32:32.000000000 +0200
++++ ekiga-2.0.3.new/src/endpoints/urlhandler.cpp 2007-02-26 23:24:22.547729500 +0100
+@@ -527,7 +527,7 @@
+
+ if (call_address.Find ("+type=directory") != P_MAX_INDEX) {
+
+- gm_main_window_flash_message (main_window, _("User not found"));
++ gm_main_window_flash_message (main_window, "%s", _("User not found"));
+ gm_calls_history_add_call (PLACED_CALL,
+ NULL,
+ call_address,
+@@ -538,7 +538,7 @@
+ }
+ else {
+
+- gm_main_window_flash_message (main_window, _("Failed to call user"));
++ gm_main_window_flash_message (main_window, "%s", _("Failed to call user"));
+ gm_calls_history_add_call (PLACED_CALL,
+ NULL,
+ call_address,
