[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian-experimental, updated. debian/0.17.1-3-6-g29a1b1a

Laurent Bigonville bigon at bigon.be
Sun Mar 10 12:18:04 UTC 2013 

The following commit has been merged in the debian-experimental branch:
commit e596899808ea312f374d97ff182a3e0ca3a2b48c
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Mar 9 20:10:09 2013 +0100

    New upstream release
    
    * New upstream release
      - drop all patches, applied upstream
      - fixes a remotely-triggerable DoS (CVE-2013-1769, Closes: #702252)
      - debian/shlibs.local: Bump version

diff --git a/debian/changelog b/debian/changelog
index 6663831..82d2f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+telepathy-gabble (0.17.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - drop all patches, applied upstream
+    - fixes a remotely-triggerable DoS (CVE-2013-1769, Closes: #702252)
+    - debian/shlibs.local: Bump version
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 10 Mar 2013 12:52:29 +0100
+
 telepathy-gabble (0.17.1-3) experimental; urgency=low
 
   * Remove .la files from telepathy-gabble-tests
diff --git a/debian/patches/Don-t-reset-the-capabilities-in-UpdateCap.patch b/debian/patches/Don-t-reset-the-capabilities-in-UpdateCap.patch
deleted file mode 100644
index 3f247bf..0000000
--- a/debian/patches/Don-t-reset-the-capabilities-in-UpdateCap.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From e4c126a0ded1eb0c68bdf03d86acd64728c7beb0 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi at gnu.org>
-Date: Fri, 19 Oct 2012 16:17:35 +0200
-Subject: [PATCH] connection: Don't reset the capabilities in
- UpdateCapabilities
-
-This ensures that a running Gabble process will always create Call1
-channels once it has seen such a client in its lifetime.
-
-Remove gabble_caps_channel_manager_reset_capabilities and its
-implementation in GabbleMediaFactory, since it is not used anymore.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=56181
-Reviewed-by: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
----
- gabble/caps-channel-manager.h |    3 ---
- src/caps-channel-manager.c    |   15 ---------------
- src/connection.c              |   15 ++-------------
- src/media-factory.c           |    9 ---------
- 4 files changed, 2 insertions(+), 40 deletions(-)
-
-diff --git a/gabble/caps-channel-manager.h b/gabble/caps-channel-manager.h
-index a432839..fce6026 100644
---- a/gabble/caps-channel-manager.h
-+++ b/gabble/caps-channel-manager.h
-@@ -72,9 +72,6 @@ typedef void (*GabbleCapsChannelManagerRepresentClientFunc) (
-     GabbleCapabilitySet *cap_set,
-     GPtrArray *data_forms);
- 
--void gabble_caps_channel_manager_reset_capabilities (
--    GabbleCapsChannelManager *caps_manager);
--
- void gabble_caps_channel_manager_get_contact_capabilities (
-     GabbleCapsChannelManager *caps_manager,
-     TpHandle handle,
-diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
-index c6b7e16..ec18975 100644
---- a/src/caps-channel-manager.c
-+++ b/src/caps-channel-manager.c
-@@ -40,21 +40,6 @@ gabble_caps_channel_manager_default_init (
- 
- /* Virtual-method wrappers */
- void
--gabble_caps_channel_manager_reset_capabilities (
--    GabbleCapsChannelManager *caps_manager)
--{
--  GabbleCapsChannelManagerInterface *iface =
--    GABBLE_CAPS_CHANNEL_MANAGER_GET_INTERFACE (caps_manager);
--  GabbleCapsChannelManagerResetCapsFunc method = iface->reset_caps;
--
--  if (method != NULL)
--    {
--      method (caps_manager);
--    }
--  /* ... else assume there is no need to reset the caps */
--}
--
--void
- gabble_caps_channel_manager_get_contact_capabilities (
-     GabbleCapsChannelManager *caps_manager,
-     TpHandle handle,
-diff --git a/src/connection.c b/src/connection.c
-index 107dacc..0a72e78 100644
---- a/src/connection.c
-+++ b/src/connection.c
-@@ -3507,25 +3507,12 @@ gabble_connection_update_capabilities (
-   GabbleConnection *self = GABBLE_CONNECTION (iface);
-   TpBaseConnection *base = (TpBaseConnection *) self;
-   GabbleCapabilitySet *old_caps = NULL;
--  TpChannelManagerIter iter;
--  TpChannelManager *manager;
-   guint i;
- 
-   /* Now that someone has told us our *actual* capabilities, we can stop
-    * advertising spurious caps in initial presence */
-   gabble_capability_set_clear (self->priv->bonus_caps);
- 
--  tp_base_connection_channel_manager_iter_init (&iter, base);
--
--  while (tp_base_connection_channel_manager_iter_next (&iter, &manager))
--    {
--      if (GABBLE_IS_CAPS_CHANNEL_MANAGER (manager))
--        {
--          gabble_caps_channel_manager_reset_capabilities (
--              GABBLE_CAPS_CHANNEL_MANAGER (manager));
--        }
--    }
--
-   DEBUG ("enter");
- 
-   for (i = 0; i < clients->len; i++)
-@@ -3536,6 +3523,8 @@ gabble_connection_update_capabilities (
-       const gchar * const * cap_tokens = g_value_get_boxed (va->values + 2);
-       GabbleCapabilitySet *cap_set;
-       GPtrArray *data_forms;
-+      TpChannelManagerIter iter;
-+      TpChannelManager *manager;
- 
-       g_hash_table_remove (self->priv->client_caps, client_name);
-       g_hash_table_remove (self->priv->client_data_forms, client_name);
-diff --git a/src/media-factory.c b/src/media-factory.c
-index 848cb71..8ccfc9b 100644
---- a/src/media-factory.c
-+++ b/src/media-factory.c
-@@ -1124,14 +1124,6 @@ _gabble_media_factory_typeflags_to_caps (TpChannelMediaCapabilities flags,
- }
- 
- static void
--gabble_media_factory_reset_caps (GabbleCapsChannelManager *manager)
--{
--  GabbleMediaFactory *self = GABBLE_MEDIA_FACTORY (manager);
--
--  self->priv->use_call_channels = FALSE;
--}
--
--static void
- gabble_media_factory_get_contact_caps (GabbleCapsChannelManager *manager,
-     TpHandle handle,
-     const GabbleCapabilitySet *caps,
-@@ -1342,7 +1334,6 @@ caps_channel_manager_iface_init (gpointer g_iface,
- {
-   GabbleCapsChannelManagerInterface *iface = g_iface;
- 
--  iface->reset_caps = gabble_media_factory_reset_caps;
-   iface->get_contact_caps = gabble_media_factory_get_contact_caps;
-   iface->represent_client = gabble_media_factory_represent_client;
- }
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index be3145d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Don-t-reset-the-capabilities-in-UpdateCap.patch
diff --git a/debian/shlibs.local b/debian/shlibs.local
index 69eed5e..84c98e5 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1,2 +1,2 @@
-libwocky-telepathy-gabble 0.17.1 telepathy-gabble (= ${binary:Version})
-libgabble-plugins 0.17.1 telepathy-gabble (= ${binary:Version})
+libwocky-telepathy-gabble 0.17.3 telepathy-gabble (= ${binary:Version})
+libgabble-plugins 0.17.3 telepathy-gabble (= ${binary:Version})

-- 
telepathy-gabble packaging

More information about the Pkg-telepathy-commits mailing list