From df93db51077012a1fa9276b6698924af0cdfa0cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Mar 2008 17:20:53 +0000 Subject: [PATCH] - Update to 2.22.0 - Remove patch for CVE-2008-0072 (fixed upstream). --- .cvsignore | 2 +- evolution.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8863ebd..34f3d5d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.92.tar.bz2 +evolution-2.22.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 1694539..6f8f290 100644 --- a/evolution.spec +++ b/evolution.spec @@ -7,7 +7,7 @@ %define gnome_pilot_version 2.0.15 %define gnomevfs2_version 2.4 %define gtk2_version 2.12.0 -%define gtkhtml_version 3.17.3 +%define gtkhtml_version 3.17.5 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.21.92 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -81,9 +81,6 @@ Patch14: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch -# RH bug #436082 / CVE-2008-0072 -Patch16: evolution-2.21.92-CVE-2008-0072.patch - ## Dependencies ### Requires(post): GConf2 @@ -226,7 +223,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset -%patch16 -p1 -b .CVE-2008-0072 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -654,6 +650,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Mar 10 2008 Matthew Barnes - 2.22.0-1.fc9 +- Update to 2.22.0 +- Remove patch for CVE-2008-0072 (fixed upstream). + * Tue Mar 04 2008 Matthew Barnes - 2.21.92-2.fc9 - Add patch for CVE-2008-0072 (format string vulnerability). diff --git a/sources b/sources index eeb48fe..1c39e75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8635bc402bf3ba6f57bb3a7635bafd5c evolution-2.21.92.tar.bz2 +22567465cfba2658fd0a9be03f8c854f evolution-2.22.0.tar.bz2