diff --git a/.gitignore b/.gitignore index 7b64900..09206f9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ /geary-0.6.0.tar.xz /geary-0.6.1.tar.xz /geary-0.6.2.tar.xz -/geary-0.7.1.tar.xz +/geary-0.7.2.tar.xz diff --git a/geary-0.7.1-ownership-transfer.patch b/geary-0.7.1-ownership-transfer.patch deleted file mode 100644 index 34288a8..0000000 --- a/geary-0.7.1-ownership-transfer.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 67a5a9f7fc7c34dd01cc2a464a709d67b7c3145d Mon Sep 17 00:00:00 2001 -From: Jim Nelson -Date: Thu, 21 Aug 2014 13:42:00 -0700 -Subject: [PATCH] Fix set_default_icon_list() ownership transfer bug - -Ownership of the GList is transferred in this call, so a copy should -be passed instead. This will be fixed in a future version of Vala. - -https://mail.gnome.org/archives/vala-list/2014-August/msg00022.html ---- - src/client/components/main-window.vala | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala -index ebdade2..0736f80 100644 ---- a/src/client/components/main-window.vala -+++ b/src/client/components/main-window.vala -@@ -61,7 +61,10 @@ public class MainWindow : Gtk.ApplicationWindow { - - GLib.List pixbuf_list = new GLib.List(); - pixbuf_list.append(IconFactory.instance.application_icon); -- set_default_icon_list(pixbuf_list); -+ // Use copy() because set_default_icon_list() actually accepts an owned reference -+ // If we didn't hold the pixbufs in memory, would need to use copy_deep() -+ // See https://mail.gnome.org/archives/vala-list/2014-August/msg00022.html -+ set_default_icon_list(pixbuf_list.copy()); - - delete_event.connect(on_delete_event); - key_press_event.connect(on_key_press_event); --- -1.9.3 - diff --git a/geary.spec b/geary.spec index eca3208..695975b 100644 --- a/geary.spec +++ b/geary.spec @@ -1,13 +1,11 @@ Name: geary -Version: 0.7.1 +Version: 0.7.2 Release: 1%{?dist} Summary: A lightweight email program designed around conversations License: LGPLv2+ URL: http://yorba.org/geary/ Source0: https://download.gnome.org/sources/geary/0.7/%{name}-%{version}.tar.xz Patch0: geary-0.5.3-vapigen.patch -# upstream commit 67a5a9f -Patch1: geary-0.7.1-ownership-transfer.patch BuildRequires: vala >= 0.22.1 BuildRequires: vala-tools >= 0.22.1 BuildRequires: cmake @@ -25,6 +23,7 @@ BuildRequires: pkgconfig(libcanberra) >= 0.28 BuildRequires: pkgconfig(sqlite3) >= 3.7.4 BuildRequires: pkgconfig(gmime-2.6) >= 2.6.0 BuildRequires: pkgconfig(libsecret-1) >= 0.11 +BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.10.0 BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8 BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -50,7 +49,6 @@ all kinds of nifty features in a modular way. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build @@ -104,6 +102,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Wed Sep 3 2014 Michel Alexandre Salim - 0.7.2-1 +- Update to 0.7.2 (fixes CVE-2014-5444) +- Drop upstreamed patch for vala 0.25.x support + * Wed Aug 27 2014 Thomas Moschny - 0.7.1-1 - Update to 0.7.1. - Update patches. diff --git a/sources b/sources index efc3a15..7940d03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59e6cd386e5e0b4971a57dd38bd93a7e geary-0.7.1.tar.xz +086b693a9568dc2934dd031bb0be52da geary-0.7.2.tar.xz