cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to empathy-3.2.1.1.

Browse Source
This commit is contained in:
ajacoutot 2011-10-24 20:11:54 +00:00
parent d72e2bdbfd
commit 2036336660
3 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/empathy/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.81 2011/10/21 21:24:32 jasper Exp $
# $OpenBSD: Makefile,v 1.82 2011/10/24 20:11:54 ajacoutot Exp $
COMMENT= telepathy based messenger for GNOME
GNOME_PROJECT= empathy
GNOME_VERSION= 3.2.1
REVISION= 2
GNOME_VERSION= 3.2.1.1
CATEGORIES= net

10
x11/gnome/empathy/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/empathy-3.2.1.tar.xz) = Dy8dWgbgwMbiQ6yOLvqt4g==
RMD160 (gnome/empathy-3.2.1.tar.xz) = vWE34rZ6qMTfdXP01G/AhGWnaBU=
SHA1 (gnome/empathy-3.2.1.tar.xz) = x4IugNPf9f5JOEZN0jyxkyBPGKY=
SHA256 (gnome/empathy-3.2.1.tar.xz) = 1Q6bDjHfDo0TfBIMYcWuqq0G+yS7II0QWxhqAbPx3go=
SIZE (gnome/empathy-3.2.1.tar.xz) = 3195244
MD5 (gnome/empathy-3.2.1.1.tar.xz) = wLUv0FRcmHVM+yJS6oBTcg==
RMD160 (gnome/empathy-3.2.1.1.tar.xz) = IK8RtGR0Tp/BbRDzj7KkqmY53dY=
SHA1 (gnome/empathy-3.2.1.1.tar.xz) = LWzDqIZOp6J2w25JNwD7aKc9DUM=
SHA256 (gnome/empathy-3.2.1.1.tar.xz) = K0zjGE/NjCJgZU+SXkBVp+AlE8Xu+kdFvN+CyQObdoE=
SIZE (gnome/empathy-3.2.1.1.tar.xz) = 3195440

42
x11/gnome/empathy/patches/patch-libempathy-gtk_empathy-theme-adium_c
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-libempathy-gtk_empathy-theme-adium_c,v 1.1 2011/10/21 21:24:32 jasper Exp $
From 739aca418457de752be13721218aaebc74bd9d36 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
--- libempathy-gtk/empathy-theme-adium.c.orig Mon Oct 17 16:22:12 2011
+++ libempathy-gtk/empathy-theme-adium.c Fri Oct 21 23:18:55 2011
@@ -782,7 +782,7 @@ theme_adium_append_message (EmpathyChatView *view,
EmpathyContact *sender;
TpMessage *tp_msg;
TpAccount *account;
- gchar *body_escaped;
+ gchar *body_escaped, *name_escaped;
const gchar *name;
const gchar *contact_id;
EmpathyAvatar *avatar;
@@ -947,8 +947,10 @@ theme_adium_append_message (EmpathyChatView *view,
}
}
+ name_escaped = g_markup_escape_text (name, -1);
+
theme_adium_append_html (theme, func, html, body_escaped,
- avatar_filename, name, contact_id,
+ avatar_filename, name_escaped, contact_id,
service_name, message_classes->str,
timestamp, is_backlog, empathy_contact_is_user (sender));
@@ -961,6 +963,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);
}