diff --git a/bnc-301835-itip-formatter-no-organizer-sentby.patch b/bnc-301835-itip-formatter-no-organizer-sentby.patch new file mode 100644 index 0000000..3dbd005 --- /dev/null +++ b/bnc-301835-itip-formatter-no-organizer-sentby.patch @@ -0,0 +1,28 @@ +2007-08-21 Suman Manjunath + + ** Fix for bug #301835 (BNC) + + * itip-formatter.c: (find_from_address): + Fixed crash when no SENTBY parameter present. + +Index: evolution/plugins/itip-formatter.c +=================================================================== +--- evolution/plugins/itip-formatter/itip-formatter.c (revision 34049) ++++ evolution/plugins/itip-formatter/itip-formatter.c (working copy) +@@ -307,11 +307,12 @@ + } + + param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER); +- if (param) ++ if (param) { + organizer_sentby = icalparameter_get_sentby (param); +- if (organizer_sentby) { +- organizer_sentby_clean = g_strdup (itip_strip_mailto (organizer_sentby)); +- organizer_sentby_clean = g_strstrip (organizer_sentby_clean); ++ if (organizer_sentby) { ++ organizer_sentby_clean = g_strdup (itip_strip_mailto (organizer_sentby)); ++ organizer_sentby_clean = g_strstrip (organizer_sentby_clean); ++ } + } + + if (!(organizer_sentby_clean || organizer_clean)) diff --git a/evolution.changes b/evolution.changes index 3163cd5..1217518 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 21 12:51:25 CEST 2007 - sbrabec@suse.cz + +- Fixed crash on appointments with no no SENTBY parameter (#301835, + patch from Suman Manjunath). + ------------------------------------------------------------------- Fri Aug 17 22:44:01 CEST 2007 - jberkman@novell.com diff --git a/evolution.spec b/evolution.spec index 724138f..651e9e5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -18,7 +18,7 @@ Obsoletes: evoltn Provides: evoltn Autoreqprov: on Version: 2.11.6.1 -Release: 10 +Release: 13 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite #Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2 @@ -55,6 +55,7 @@ Patch89: bnc-214647-add-prefer-plain-plugin.patch Patch90: fix-security-gtkhtml-moreui.diff Patch91: evo-2.8.2-build-break.fix Patch92: evo-2.8.2-regression-fix.patch +Patch93: bnc-301835-itip-formatter-no-organizer-sentby.patch Patch100: abuild.patch #Patch101: xsltproc-no-net.patch Patch102: evolution-2.11.6.1-cal-busy-recursion.patch @@ -311,6 +312,7 @@ Authors: # 91 and 92 upsream too #%patch91 # %patch92 +%patch93 -p1 %patch100 -p1 #%patch101 -p1 %patch102 -p1 @@ -440,6 +442,9 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog +* Tue Aug 21 2007 - sbrabec@suse.cz +- Fixed crash on appointments with no no SENTBY parameter (#301835, + patch from Suman Manjunath). * Fri Aug 17 2007 - jberkman@novell.com - fix infinite recursion when used with smartcard auth patches * Mon Aug 06 2007 - maw@suse.de