- update telepathy-gabble to 0.10.5

(this must've been the first telepathy update in years that didn't
require the latest linux kernel apis...what a breeze!)
This commit is contained in:
jasper 2011-04-05 18:55:42 +00:00
parent 5ec076ceb6
commit bb721813ee
3 changed files with 9 additions and 41 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.32 2011/03/02 14:41:18 jasper Exp $
# $OpenBSD: Makefile,v 1.33 2011/04/05 18:55:42 jasper Exp $
COMMENT= flexible communications framework, xmpp component
DISTNAME= telepathy-gabble-0.10.4
REVISION= 0
DISTNAME= telepathy-gabble-0.10.5
MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-gabble/}
@ -24,7 +23,8 @@ LIB_DEPENDS= devel/libsoup \
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-ca-certificates=/etc/ssl/cert.pem \
--disable-gtk-doc
--disable-gtk-doc \
--enable-plugins
CONFIGURE_ENV+= ac_cv_prog_PYTHON="${MODPY_BIN}"
USE_GROFF= Yes

View File

@ -1,5 +1,5 @@
MD5 (telepathy/telepathy-gabble-0.10.4.tar.gz) = u/hVkP/Gr9X9xIem5dgqDg==
RMD160 (telepathy/telepathy-gabble-0.10.4.tar.gz) = 2ZGqmXREf5gjihGYUdoFR3MjkZk=
SHA1 (telepathy/telepathy-gabble-0.10.4.tar.gz) = RJP6jS5TfZHOqCplsRr4VAYwios=
SHA256 (telepathy/telepathy-gabble-0.10.4.tar.gz) = q98H6DO5NPp80MnjSJShHaA3rfA6T93k3HgY7ZkKZiw=
SIZE (telepathy/telepathy-gabble-0.10.4.tar.gz) = 2936168
MD5 (telepathy/telepathy-gabble-0.10.5.tar.gz) = bT4HNU+20+pfg3Xnz3dqJw==
RMD160 (telepathy/telepathy-gabble-0.10.5.tar.gz) = CCs0DKkr9Mo7dGLPpjRlTkdm22c=
SHA1 (telepathy/telepathy-gabble-0.10.5.tar.gz) = AIkhenHWTP79m04W2Uln+dhVP6s=
SHA256 (telepathy/telepathy-gabble-0.10.5.tar.gz) = 0Yts2wvSuupT4MEBcA5gm82zniLU5ldCRMiWYMc/CZs=
SIZE (telepathy/telepathy-gabble-0.10.5.tar.gz) = 2923925

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_jingle-factory_c,v 1.1 2011/03/02 14:41:18 jasper Exp $
Security fix for CVE-2011-1000,
Telepathy Gabble Audio and Video Calls Hijacking Vulnerability
Fix from upstream bz #34048.
--- src/jingle-factory.c.orig Tue Nov 2 13:01:47 2010
+++ src/jingle-factory.c Wed Mar 2 15:02:34 2011
@@ -254,6 +254,22 @@ got_jingle_info_stanza (GabbleJingleFactory *fac,
GabbleJingleFactoryPrivate *priv = fac->priv;
LmMessageSubType sub_type;
LmMessageNode *query_node, *node;
+ const gchar *from = wocky_stanza_get_from (message);
+
+ if (from != NULL)
+ {
+ TpBaseConnection *base_conn = TP_BASE_CONNECTION (priv->conn);
+ TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
+ base_conn, TP_HANDLE_TYPE_CONTACT);
+ TpHandle sender = tp_handle_lookup (contact_repo, from, NULL, NULL);
+
+ if (sender != base_conn->self_handle)
+ {
+ DEBUG ("ignoring jingleinfo from '%s', not ourself nor the server",
+ from);
+ return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
+ }
+ }
query_node = lm_message_node_get_child_with_namespace (
wocky_stanza_get_top_node (message), "query", NS_GOOGLE_JINGLE_INFO);