From 0582232b32f7dc04346639c51ceb1e2e0121ccf2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 3 Dec 2007 23:05:27 +0000 Subject: [PATCH] - Update to 2.21.3 --- .cvsignore | 2 +- ...ion-data-server-1.7.91-maybe-fix-crash.patch | 12 ++++++------ ...ution-data-server-1.8.0-fix-ldap-query.patch | 13 +++++++------ evolution-data-server.spec | 17 ++++++++++------- sources | 2 +- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7ee45ab..16a8d55 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-2.21.2.tar.bz2 +evolution-data-server-2.21.3.tar.bz2 diff --git a/evolution-data-server-1.7.91-maybe-fix-crash.patch b/evolution-data-server-1.7.91-maybe-fix-crash.patch index a2ce99e..fa82e53 100644 --- a/evolution-data-server-1.7.91-maybe-fix-crash.patch +++ b/evolution-data-server-1.7.91-maybe-fix-crash.patch @@ -1,15 +1,15 @@ ---- evolution-data-server-1.7.91/camel/providers/imap/camel-imap-search.c.maybe-fix-crash 2006-08-16 15:56:44.000000000 -0400 -+++ evolution-data-server-1.7.91/camel/providers/imap/camel-imap-search.c 2006-08-16 15:57:09.000000000 -0400 -@@ -342,8 +342,6 @@ sync_match(CamelImapSearch *is, struct _ +diff -up evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c.maybe-fix-crash evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c +--- evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c.maybe-fix-crash 2007-11-29 07:53:34.000000000 -0500 ++++ evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c 2007-12-03 11:51:26.000000000 -0500 +@@ -344,7 +344,6 @@ sync_match(CamelImapSearch *is, struct _ } g_string_append_c (search, '"'); } - camel_search_words_free (words); -- + /* We only try search using utf8 if its non us-ascii text? */ if ((words->type & CAMEL_SEARCH_WORD_8BIT) && (store->capabilities & IMAP_CAPABILITY_utf8_search)) { - response = camel_imap_command (store, folder, NULL, -@@ -352,6 +350,8 @@ sync_match(CamelImapSearch *is, struct _ +@@ -354,6 +353,8 @@ sync_match(CamelImapSearch *is, struct _ if (response == NULL) store->capabilities &= ~IMAP_CAPABILITY_utf8_search; } diff --git a/evolution-data-server-1.8.0-fix-ldap-query.patch b/evolution-data-server-1.8.0-fix-ldap-query.patch index ee05ae0..bcece94 100644 --- a/evolution-data-server-1.8.0-fix-ldap-query.patch +++ b/evolution-data-server-1.8.0-fix-ldap-query.patch @@ -1,6 +1,7 @@ ---- evolution-data-server-1.8.0/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query 2006-09-02 02:36:49.000000000 -0400 -+++ evolution-data-server-1.8.0/addressbook/backends/ldap/e-book-backend-ldap.c 2007-07-02 14:21:14.000000000 -0400 -@@ -3209,22 +3209,28 @@ +diff -up evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c +--- evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query 2007-11-29 07:53:49.000000000 -0500 ++++ evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c 2007-12-03 16:12:33.000000000 -0500 +@@ -3339,22 +3339,28 @@ func_and(struct _ESExp *f, int argc, str char ** strings; if (argc > 0) { @@ -10,7 +11,7 @@ strings = g_new0(char*, argc+3); strings[0] = g_strdup ("(&"); strings[argc+3 - 2] = g_strdup (")"); - + + empty = 0; for (i = 0; i < argc; i ++) { GList *list_head = ldap_data->list; @@ -31,7 +32,7 @@ for (i = 0 ; i < argc + 2; i ++) g_free (strings[i]); -@@ -3246,22 +3252,28 @@ +@@ -3376,22 +3382,28 @@ func_or(struct _ESExp *f, int argc, stru char ** strings; if (argc > 0) { @@ -62,7 +63,7 @@ for (i = 0 ; i < argc + 2; i ++) g_free (strings[i]); -@@ -3410,6 +3422,7 @@ +@@ -3540,6 +3552,7 @@ func_beginswith(struct _ESExp *f, int ar char *ldap_attr = query_prop_to_ldap(propname); if (strlen (str) == 0) { diff --git a/evolution-data-server.spec b/evolution-data-server.spec index eeed0a4..9f63d8d 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -25,8 +25,8 @@ ### Abstract ### Name: evolution-data-server -Version: 2.21.2 -Release: 2%{?dist} +Version: 2.21.3 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -140,11 +140,11 @@ This package contains developer documentation for %{name}. %patch11 -p1 -b .no-gnome-common %patch12 -p1 -b .maybe-fix-crash %patch14 -p1 -b .fix-ldap-query -%patch15 -p1 -b .kill-ememory -#%patch16 -p1 -b .e-passwords -%patch18 -p1 -b .camel-folder-summary-crash -%patch19 -p1 -b .fix-64bit-acinclude -%patch20 -p1 -b .base64 +#%patch15 -p1 -b .kill-ememory +##%patch16 -p1 -b .e-passwords +#%patch18 -p1 -b .camel-folder-summary-crash +#%patch19 -p1 -b .fix-64bit-acinclude +#%patch20 -p1 -b .base64 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon Dec 03 2007 Matthew Barnes - 2.21.3-1.fc9 +- Update to 2.21.3 + * Thu Nov 15 2007 Matthew Barnes - 2.21.2-2.fc9 - Add patch for RH bug #384741 (authentication crash). diff --git a/sources b/sources index 05df8ea..f6de626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -48b902384ff830d522b3e3716a96bdb9 evolution-data-server-2.21.2.tar.bz2 +552a5af823c3bdf166c1229359acf07b evolution-data-server-2.21.3.tar.bz2