From 87c67e7b68d9264a2e56ec291594f88ca0ec7736c7cff56d0ee07e9afa4638d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 15 Jan 2015 02:06:53 +0000 Subject: [PATCH] Accepting request 281013 from home:dimstar:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/281013 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=208 --- evolution-data-server-3.12.10.tar.xz | 3 + evolution-data-server-3.12.9.tar.xz | 3 - ...ution-data-server-fix-use-after-free.patch | 100 ------------------ evolution-data-server.changes | 11 ++ evolution-data-server.spec | 9 +- 5 files changed, 17 insertions(+), 109 deletions(-) create mode 100644 evolution-data-server-3.12.10.tar.xz delete mode 100644 evolution-data-server-3.12.9.tar.xz delete mode 100644 evolution-data-server-fix-use-after-free.patch diff --git a/evolution-data-server-3.12.10.tar.xz b/evolution-data-server-3.12.10.tar.xz new file mode 100644 index 0000000..3383799 --- /dev/null +++ b/evolution-data-server-3.12.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52466d16487474787f879b57f0b2de2aad0554e5c5161b366a597fc522ce673d +size 5286312 diff --git a/evolution-data-server-3.12.9.tar.xz b/evolution-data-server-3.12.9.tar.xz deleted file mode 100644 index 852d2cb..0000000 --- a/evolution-data-server-3.12.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f6cb7fe315cdc20938e08e2c724fe9364d9a72801a41b05f77367b6790aaee0 -size 5395276 diff --git a/evolution-data-server-fix-use-after-free.patch b/evolution-data-server-fix-use-after-free.patch deleted file mode 100644 index ddb5bf1..0000000 --- a/evolution-data-server-fix-use-after-free.patch +++ /dev/null @@ -1,100 +0,0 @@ -From fe77982c952af27348f9c6d6d5a1952b8eeb3236 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 12 Dec 2014 11:30:08 +0100 -Subject: Bug 695754 - Use-after-free in - source_registry_source_notify_enabled_idle_cb() - - -diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c -index 22b46a7..3b6f806 100644 ---- a/libedataserver/e-source-registry.c -+++ b/libedataserver/e-source-registry.c -@@ -445,24 +445,6 @@ source_registry_service_restart_table_steal_all (ESourceRegistry *registry) - return list; - } - --static void --source_registry_sources_insert (ESourceRegistry *registry, -- ESource *source) --{ -- const gchar *uid; -- -- uid = e_source_get_uid (source); -- g_return_if_fail (uid != NULL); -- -- g_mutex_lock (®istry->priv->sources_lock); -- -- g_hash_table_insert ( -- registry->priv->sources, -- g_strdup (uid), g_object_ref (source)); -- -- g_mutex_unlock (®istry->priv->sources_lock); --} -- - static gboolean - source_registry_sources_remove (ESourceRegistry *registry, - ESource *source) -@@ -746,9 +728,11 @@ source_registry_add_source (ESourceRegistry *registry, - G_CALLBACK (source_registry_source_notify_enabled_cb), - registry); - -- g_mutex_unlock (®istry->priv->sources_lock); -+ g_hash_table_insert ( -+ registry->priv->sources, -+ g_strdup (uid), g_object_ref (source)); - -- source_registry_sources_insert (registry, source); -+ g_mutex_unlock (®istry->priv->sources_lock); - } - - static gboolean -@@ -1263,11 +1247,6 @@ source_registry_dispose (GObject *object) - priv->thread_closure = NULL; - } - -- if (priv->main_context != NULL) { -- g_main_context_unref (priv->main_context); -- priv->main_context = NULL; -- } -- - if (priv->dbus_object_manager != NULL) { - g_object_unref (priv->dbus_object_manager); - priv->dbus_object_manager = NULL; -@@ -1282,6 +1261,14 @@ source_registry_dispose (GObject *object) - - g_hash_table_remove_all (priv->sources); - -+ if (priv->main_context != NULL) { -+ while (g_main_context_pending (priv->main_context)) { -+ g_main_context_iteration (priv->main_context, FALSE); -+ } -+ g_main_context_unref (priv->main_context); -+ priv->main_context = NULL; -+ } -+ - if (priv->settings != NULL) { - g_signal_handlers_disconnect_by_data (priv->settings, object); - g_object_unref (priv->settings); --- -cgit v0.10.1 - -From 234791233b71ae24d020ec5379069f5dd8c1f15d Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 12 Dec 2014 14:11:04 +0100 -Subject: Bug 741434 - Use-after-free after error in GPG signature verification - - -diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c -index 8c3104b..ea2cb84 100644 ---- a/camel/camel-gpg-context.c -+++ b/camel/camel-gpg-context.c -@@ -1889,6 +1889,7 @@ gpg_verify_sync (CamelCipherContext *context, - - g_object_unref (filter); - g_object_unref (istream); -+ istream = NULL; - - g_seekable_seek (G_SEEKABLE (canon_stream), 0, G_SEEK_SET, NULL, NULL); - --- -cgit v0.10.1 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 4ff0675..71e4985 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 13 11:53:59 UTC 2015 - dimstar@opensuse.org + +- Update to version 3.10.10: + + Fix "may be used uninitialized" warning. + + EDataBook/Cal: Complete Refresh operation in IDLE. + + Bugs fixed: bgo#695754, bgo#741434, bgo#741557, bgo#741699, + bgo#741786, bgo#741787. +- Drop evolution-data-server-fix-use-after-free.patch: fixed + upstream. + ------------------------------------------------------------------- Sun Dec 14 06:05:51 UTC 2014 - badshah400@gmail.com diff --git a/evolution-data-server.spec b/evolution-data-server.spec index dbe8f2a..dbb2694 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,7 +1,7 @@ # # spec file for package evolution-data-server # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ Name: evolution-data-server %define _evo_version 3.12 -Version: 3.12.9 +Version: 3.12.10 Release: 0 Summary: Evolution Data Server License: LGPL-2.1+ @@ -40,8 +40,6 @@ Group: Development/Libraries/GNOME Url: http://www.gnome.org Source0: http://download.gnome.org/sources/evolution-data-server/3.12/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM evolution-data-server-fix-use-after-free.patch bgo#695754 bgo#741434 badshah400@gmail.com -- Fix errors resulting from use-after-free; patch taken from upstream git -Patch0: evolution-data-server-fix-use-after-free.patch BuildRequires: db-devel %if %USE_EVOLDAP BuildRequires: evoldap2-devel @@ -65,7 +63,7 @@ BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream -BuildRequires: vala +BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(gcr-base-3) >= 3.4 BuildRequires: pkgconfig(goa-1.0) >= 3.8 BuildRequires: pkgconfig(gtk+-3.0) @@ -256,7 +254,6 @@ This package contains developer documentation. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build