summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-11-13 12:28:02 +0000
committerPacho Ramos <pacho@gentoo.org>2014-11-13 12:28:02 +0000
commit4cc8e4da17ee7329585f58bc77d4bf72b317bb28 (patch)
tree3a373f8100973e42eee9567ac940599746680ba9 /net-im/empathy/files
parentDrop old (#508854) (diff)
downloadgentoo-2-4cc8e4da17ee7329585f58bc77d4bf72b317bb28.tar.gz
gentoo-2-4cc8e4da17ee7329585f58bc77d4bf72b317bb28.tar.bz2
gentoo-2-4cc8e4da17ee7329585f58bc77d4bf72b317bb28.zip
Drop old (#508854)
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-im/empathy/files')
-rw-r--r--net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch70
-rw-r--r--net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch24
-rw-r--r--net-im/empathy/files/empathy-2.34.0-missing-include.patch10
3 files changed, 0 insertions, 104 deletions
diff --git a/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch b/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch
deleted file mode 100644
index 6040778e73d5..000000000000
--- a/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 192ce4dacc108f1b62e8ef752eeb5a2bee3d337f Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Tue, 18 Oct 2011 18:32:52 +0200
-Subject: [PATCH] theme_adium_append_message: escape alias before displaying
- it
-
-Not doing so can lead to nasty HTML injection from hostile users.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662035
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32, and for
- good measure, escape alias on /me-type events too]
----
- libempathy-gtk/empathy-theme-adium.c | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
-index 8c6301e..08f79b4 100644
---- a/libempathy-gtk/empathy-theme-adium.c
-+++ b/libempathy-gtk/empathy-theme-adium.c
-@@ -436,7 +436,7 @@ theme_adium_append_message (EmpathyChatView *view,
- EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
- EmpathyContact *sender;
- TpAccount *account;
-- gchar *body_escaped;
-+ gchar *body_escaped, *name_escaped;
- const gchar *body;
- const gchar *name;
- const gchar *contact_id;
-@@ -468,17 +468,19 @@ theme_adium_append_message (EmpathyChatView *view,
- body = empathy_message_get_body (msg);
- body_escaped = theme_adium_parse_body (body);
- name = empathy_contact_get_alias (sender);
-+ name_escaped = g_markup_escape_text (name, -1);
- contact_id = empathy_contact_get_id (sender);
-
- /* If this is a /me, append an event */
- if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
- gchar *str;
-
-- str = g_strdup_printf ("%s %s", name, body_escaped);
-+ str = g_strdup_printf ("%s %s", name_escaped, body_escaped);
- theme_adium_append_event_escaped (view, str);
-
- g_free (str);
- g_free (body_escaped);
-+ g_free (name_escaped);
- return;
- }
-
-@@ -600,7 +602,7 @@ theme_adium_append_message (EmpathyChatView *view,
-
- if (html != NULL) {
- theme_adium_append_html (theme, func, html, len, body_escaped,
-- avatar_filename, name, contact_id,
-+ avatar_filename, name_escaped, contact_id,
- service_name, message_classes->str,
- timestamp, is_backlog);
- } else {
-@@ -616,6 +618,7 @@ theme_adium_append_message (EmpathyChatView *view,
- priv->last_is_backlog = is_backlog;
-
- g_free (body_escaped);
-+ g_free (name_escaped);
- g_string_free (message_classes, TRUE);
- }
-
---
-1.7.7
-
diff --git a/net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch b/net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch
deleted file mode 100644
index 3770b36a79d4..000000000000
--- a/net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 73d8a18c6def748d78e91f0dda1145771c620b53 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Mon, 04 Apr 2011 08:23:53 +0000
-Subject: event_manager_add: don't crash if approval is NULL (#646555)
-
-When adding a "subscription request" event there is no EventManagerApproval
-associated with the event.
----
-diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
-index 5b2174a..041d22a 100644
---- a/src/empathy-event-manager.c
-+++ b/src/empathy-event-manager.c
-@@ -233,7 +233,8 @@ event_manager_add (EmpathyEventManager *manager,
- event->public.header = g_strdup (header);
- event->public.message = g_strdup (message);
- event->public.must_ack = (func != NULL);
-- event->public.handler_instance = approval->handler_instance;
-+ if (approval != NULL)
-+ event->public.handler_instance = approval->handler_instance;
- event->inhibit = FALSE;
- event->func = func;
- event->user_data = user_data;
---
-cgit v0.9
diff --git a/net-im/empathy/files/empathy-2.34.0-missing-include.patch b/net-im/empathy/files/empathy-2.34.0-missing-include.patch
deleted file mode 100644
index e8d3a8d3c8ec..000000000000
--- a/net-im/empathy/files/empathy-2.34.0-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libempathy/empathy-auth-factory.c 2011-10-22 00:53:39.480665258 +0300
-+++ libempathy/empathy-auth-factory.c 2011-10-22 00:55:22.726535188 +0300
-@@ -20,6 +20,7 @@
-
- #include "empathy-auth-factory.h"
-
-+#include <telepathy-glib/channel-dispatch-operation.h>
- #include <telepathy-glib/interfaces.h>
- #include <telepathy-glib/simple-handler.h>
- #include <telepathy-glib/util.h>