rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 1.11.2

Browse Source 
- Bump eds_base_version to 1.12.
- Add patch to fix implicit function declarations.
- Remove patch for RH bug #203058 (fixed upstream).
- Remove patch for RH bug #210142 (fixed upstream).
- Remove patch for RH bug #235290 (fixed upstream).
- Remove patch for GNOME bug #360240 (fixed upstream).
- Remove patch for GNOME bug #360619 (fixed upstream).
- Remove patch for GNOME bug #373117 (fixed upstream).
- Revise patch for GNOME bug #415891 (partially fixed upstream).
This commit is contained in:
Matthew Barnes 2007-05-18 17:39:14 +00:00
parent cf61009472
commit 8edc3aba21
13 changed files with 295 additions and 1244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-data-server-1.10.1.tar.bz2
evolution-data-server-1.11.2.tar.bz2

33
evolution-data-server-1.10.1-apop-auth-vulnerability.patch
View File

@ -1,33 +0,0 @@
--- evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability 2007-04-09 08:42:37.000000000 -0400
+++ evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c 2007-04-30 16:42:12.000000000 -0400
@@ -34,6 +34,7 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
+#include <ctype.h>
#include "camel-operation.h"
@@ -489,7 +490,21 @@
} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
char *secret, md5asc[33], *d;
unsigned char md5sum[16], *s;
-
+
+ d = store->engine->apop;
+
+ while (*d != '\0') {
+ if (!isascii((int)*d)) {
+
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
+ _("Unable to connect to POP server %s: "),
+ CAMEL_SERVICE (store)->url->host);
+
+ return FALSE;
+ }
+ d++;
+ }
+
secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
sprintf(secret, "%s%s", store->engine->apop, service->url->passwd);
md5_get_digest(secret, strlen (secret), md5sum);

10
evolution-data-server-1.10.1-e-source-group.patch
View File

@ -1,10 +0,0 @@
--- evolution-data-server-1.10.1/libedataserver/e-source-group.c.e-source-group 2007-05-07 15:28:33.000000000 -0400
+++ evolution-data-server-1.10.1/libedataserver/e-source-group.c 2007-05-07 15:28:49.000000000 -0400
@@ -230,6 +230,7 @@
if (new_source == NULL) {
g_object_unref (new);
+ new = NULL;
goto done;
}
e_source_group_add_source (new, new_source, -1);

10
evolution-data-server-1.11.2-implicit-function-declarations.patch Normal file
View File

@ -0,0 +1,10 @@
--- evolution-data-server-1.11.2/calendar/libical/src/libical/icalvalue.c.implicit-function-declarations 2007-05-18 11:37:00.000000000 -0400
+++ evolution-data-server-1.11.2/calendar/libical/src/libical/icalvalue.c 2007-05-18 11:38:53.000000000 -0400
@@ -47,6 +47,7 @@
#include <stdlib.h> /* for atoi and atof */
#include <limits.h> /* for SHRT_MAX */
#include <locale.h>
+#include <ctype.h> /* for isspace and isdigit */
#ifdef WIN32
#define snprintf _snprintf

28
evolution-data-server-1.8.1-warn-unused-variable.patch
View File

@ -1,28 +0,0 @@
--- evolution-data-server-1.8.1/camel/providers/groupwise/camel-groupwise-folder.c.warn-unused-variable 2006-09-02 02:36:55.000000000 -0400
+++ evolution-data-server-1.8.1/camel/providers/groupwise/camel-groupwise-folder.c 2006-10-08 22:09:18.000000000 -0400
@@ -1137,7 +1137,6 @@
CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER(folder);
CamelGroupwiseStorePrivate *priv = gw_store->priv;
EGwConnection *cnc = cnc_lookup (priv);
- GSList *attach_list = NULL;
guint32 item_status, status_flags = 0;
CamelFolderChangeInfo *changes = NULL;
gboolean exists = FALSE;
@@ -1369,7 +1368,6 @@
{
CamelGroupwiseMessageInfo *mi = NULL;
CamelGroupwiseStore *gw_store = CAMEL_GROUPWISE_STORE (folder->parent_store);
- GSList *attach_list = NULL;
guint32 item_status, status_flags = 0;
CamelFolderChangeInfo *changes = NULL;
gboolean exists = FALSE;
--- evolution-data-server-1.8.1/camel/camel-stream-vfs.c.warn-unused-variable 2006-09-02 02:36:54.000000000 -0400
+++ evolution-data-server-1.8.1/camel/camel-stream-vfs.c 2006-10-08 22:09:18.000000000 -0400
@@ -121,7 +121,6 @@
{
CamelStreamVFS *stream_vfs;
off_t offset;
- GnomeVFSResult result;
if (!handle)
return NULL;

85
evolution-data-server-1.9.1-kill-ememory.patch
View File

@ -1,5 +1,5 @@
--- evolution-data-server-1.9.1/camel/camel-text-index.c.kill-ememory 2006-10-25 23:02:26.000000000 -0400
+++ evolution-data-server-1.9.1/camel/camel-text-index.c 2006-10-25 23:03:35.000000000 -0400
--- evolution-data-server-1.11.2/camel/camel-text-index.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-text-index.c 2007-05-18 10:59:21.000000000 -0400
@@ -70,7 +70,7 @@
struct _CamelTextIndexNamePrivate {
GString *buffer;
@ -45,9 +45,9 @@
p->nameid = nameid;
return idn;
--- evolution-data-server-1.9.1/camel/camel-mime-parser.c.kill-ememory 2006-04-12 15:14:13.000000000 -0400
+++ evolution-data-server-1.9.1/camel/camel-mime-parser.c 2006-10-25 23:03:35.000000000 -0400
@@ -122,7 +122,7 @@
--- evolution-data-server-1.11.2/camel/camel-mime-parser.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-mime-parser.c 2007-05-18 10:59:21.000000000 -0400
@@ -120,7 +120,7 @@
camel_mime_parser_state_t savestate; /* state at invocation of this part */
#ifdef MEMPOOL
@ -56,7 +56,7 @@
#endif
struct _camel_header_raw *headers; /* headers for this part */
@@ -1001,7 +1001,8 @@
@@ -999,7 +999,8 @@
s->parts = h->parent;
g_free(h->boundary);
#ifdef MEMPOOL
@ -66,7 +66,7 @@
#else
camel_header_raw_clear(&h->headers);
#endif
@@ -1109,20 +1110,16 @@
@@ -1107,20 +1108,16 @@
content = strchr(header, ':');
if (content) {
register int len;
@ -90,7 +90,7 @@
n->offset = offset;
@@ -1180,7 +1177,7 @@
@@ -1178,7 +1175,7 @@
h = g_malloc0(sizeof(*h));
#ifdef MEMPOOL
@ -99,22 +99,9 @@
#endif
if (s->parts)
--- evolution-data-server-1.9.1/camel/camel-vee-folder.c.kill-ememory 2006-04-12 15:14:13.000000000 -0400
+++ evolution-data-server-1.9.1/camel/camel-vee-folder.c 2006-10-25 23:03:35.000000000 -0400
@@ -28,10 +28,6 @@
#include "libedataserver/md5-utils.h"
-#if defined (DOEPOOLV) || defined (DOESTRV)
-#include "libedataserver/e-memory.h"
-#endif
-
#include "camel-debug.h"
#include "camel-exception.h"
#include "camel-folder-search.h"
--- evolution-data-server-1.9.1/camel/camel-folder.c.kill-ememory 2006-10-25 23:02:26.000000000 -0400
+++ evolution-data-server-1.9.1/camel/camel-folder.c 2006-10-25 23:03:35.000000000 -0400
@@ -1890,7 +1890,7 @@
--- evolution-data-server-1.11.2/camel/camel-folder.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-folder.c 2007-05-18 10:59:24.000000000 -0400
@@ -1894,7 +1894,7 @@
struct _CamelFolderChangeInfoPrivate {
GHashTable *uid_stored; /* what we have stored, which array they're in */
GHashTable *uid_source; /* used to create unique lists */
@ -123,7 +110,7 @@
};
@@ -1917,7 +1917,7 @@
@@ -1921,7 +1921,7 @@
info->priv = g_malloc0(sizeof(*info->priv));
info->priv->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
info->priv->uid_source = NULL;
@ -132,7 +119,7 @@
return info;
}
@@ -1943,7 +1943,7 @@
@@ -1947,7 +1947,7 @@
p->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
if (g_hash_table_lookup(p->uid_source, uid) == NULL)
@ -141,7 +128,7 @@
}
@@ -1972,7 +1972,7 @@
@@ -1976,7 +1976,7 @@
char *uid = list->pdata[i];
if (g_hash_table_lookup(p->uid_source, uid) == NULL)
@ -150,7 +137,7 @@
}
}
@@ -2132,7 +2132,7 @@
@@ -2136,7 +2136,7 @@
return;
}
@ -159,7 +146,7 @@
g_ptr_array_add(info->uid_added, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
}
@@ -2166,7 +2166,7 @@
@@ -2170,7 +2170,7 @@
return;
}
@ -168,7 +155,7 @@
g_ptr_array_add(info->uid_removed, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
}
@@ -2195,7 +2195,7 @@
@@ -2199,7 +2199,7 @@
return;
}
@ -177,7 +164,7 @@
g_ptr_array_add(info->uid_changed, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
}
@@ -2221,7 +2221,7 @@
@@ -2225,7 +2225,7 @@
/* always add to recent, but dont let anyone else know */
if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
@ -186,7 +173,7 @@
}
g_ptr_array_add(info->uid_recent, olduid);
}
@@ -2270,7 +2270,8 @@
@@ -2274,7 +2274,8 @@
}
g_hash_table_destroy(p->uid_stored);
p->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
@ -196,7 +183,7 @@
}
@@ -2293,7 +2294,7 @@
@@ -2297,7 +2298,7 @@
g_hash_table_destroy(p->uid_source);
g_hash_table_destroy(p->uid_stored);
@ -205,8 +192,8 @@
g_free(p);
g_ptr_array_free(info->uid_added, TRUE);
--- evolution-data-server-1.9.1/camel/camel-folder-summary.c.kill-ememory 2006-07-24 09:40:46.000000000 -0400
+++ evolution-data-server-1.9.1/camel/camel-folder-summary.c 2006-10-25 23:03:35.000000000 -0400
--- evolution-data-server-1.11.2/camel/camel-folder-summary.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-folder-summary.c 2007-05-18 10:59:24.000000000 -0400
@@ -134,10 +134,6 @@
s->message_info_chunks = NULL;
s->content_info_chunks = NULL;
@ -232,8 +219,8 @@
g_ptr_array_add(s->messages, info);
g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
s->flags |= CAMEL_SUMMARY_DIRTY;
--- evolution-data-server-1.9.1/camel/providers/local/camel-maildir-summary.c.kill-ememory 2005-08-31 00:26:06.000000000 -0400
+++ evolution-data-server-1.9.1/camel/providers/local/camel-maildir-summary.c 2006-10-25 23:03:35.000000000 -0400
--- evolution-data-server-1.11.2/camel/providers/local/camel-maildir-summary.c.kill-ememory 2007-05-09 00:09:30.000000000 -0400
+++ evolution-data-server-1.11.2/camel/providers/local/camel-maildir-summary.c 2007-05-18 10:59:24.000000000 -0400
@@ -129,10 +129,6 @@
s->message_info_size = sizeof(CamelMaildirMessageInfo);
s->content_info_size = sizeof(CamelMaildirMessageContentInfo);
@ -365,9 +352,9 @@
}
g_free(name);
g_free(dest);
--- evolution-data-server-1.9.1/camel/camel-folder-search.c.kill-ememory 2006-06-08 21:21:50.000000000 -0400
+++ evolution-data-server-1.9.1/camel/camel-folder-search.c 2006-10-25 23:03:35.000000000 -0400
@@ -52,7 +52,7 @@
--- evolution-data-server-1.11.2/camel/camel-folder-search.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-folder-search.c 2007-05-18 10:59:24.000000000 -0400
@@ -53,7 +53,7 @@
#define r(x)
struct _CamelFolderSearchPrivate {
@ -376,7 +363,7 @@
CamelException *ex;
CamelFolderThread *threads;
@@ -122,23 +122,23 @@
@@ -123,23 +123,23 @@
obj->sexp = e_sexp_new();
@ -407,7 +394,7 @@
}
static void
@@ -153,8 +153,8 @@
@@ -154,8 +154,8 @@
g_hash_table_destroy(search->summary_hash);
g_free(search->last_search);
@ -418,7 +405,7 @@
g_free(p);
}
@@ -344,7 +344,7 @@
@@ -345,7 +345,7 @@
GPtrArray *matches;
int i;
GHashTable *results;
@ -427,7 +414,7 @@
struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
p->ex = ex;
@@ -373,11 +373,7 @@
@@ -374,11 +374,7 @@
/* now create a folder summary to return?? */
if (r->type == ESEXP_RES_ARRAY_PTR) {
d(printf("got result ...\n"));
@ -440,7 +427,7 @@
if (search->summary) {
/* reorder result in summary order */
results = g_hash_table_new(g_str_hash, g_str_equal);
@@ -389,20 +385,21 @@
@@ -390,20 +386,21 @@
CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
char *uid = (char *)camel_message_info_uid(info);
if (g_hash_table_lookup(results, uid)) {
@ -468,7 +455,7 @@
} else {
g_warning("Search returned an invalid result type");
}
@@ -443,7 +440,7 @@
@@ -444,7 +441,7 @@
GPtrArray *matches = NULL, *summary_set;
int i;
GHashTable *results;
@ -477,7 +464,7 @@
struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
g_assert(search->folder);
@@ -495,12 +492,7 @@
@@ -496,12 +493,7 @@
/* now create a folder summary to return?? */
if (r->type == ESEXP_RES_ARRAY_PTR) {
d(printf("got result ...\n"));
@ -491,7 +478,7 @@
/* reorder result in summary order */
results = g_hash_table_new(g_str_hash, g_str_equal);
for (i=0;i<r->value.ptrarray->len;i++) {
@@ -512,14 +504,15 @@
@@ -513,14 +505,15 @@
CamelMessageInfo *info = g_ptr_array_index(summary_set, i);
char *uid = (char *)camel_message_info_uid(info);
if (g_hash_table_lookup(results, uid))
@ -512,7 +499,7 @@
} else {
g_warning("Search returned an invalid result type");
}
@@ -552,12 +545,12 @@
@@ -553,12 +546,12 @@
{
int i;
struct _CamelFolderSearchPrivate *p = _PRIVATE(search);

45
evolution-data-server-1.9.2-fix-name-selector-dialog.patch
View File

@ -1,45 +0,0 @@
--- evolution-data-server-1.9.2/libedataserverui/e-name-selector-dialog.c.fix-name-selector-dialog 2006-11-08 11:23:52.000000000 -0500
+++ evolution-data-server-1.9.2/libedataserverui/e-name-selector-dialog.c 2006-11-08 11:45:54.000000000 -0500
@@ -1189,30 +1189,24 @@
{
EDestinationStore *destination_store = E_DESTINATION_STORE (model);
EDestination *destination;
- gchar *string;
+ GString *buffer;
destination = e_destination_store_get_destination (destination_store, iter);
g_assert (destination);
- if (e_destination_is_evolution_list (destination)) {
- if (e_destination_list_show_addresses (destination)) {
- const gchar *name;
- const gchar *addresses;
-
- name = e_destination_get_name (destination);
- addresses = e_destination_get_address (destination);
-
- string = g_strdup_printf ("%s%s(%s)", name ? name : "",
- name ? " " : "", addresses ? addresses : "?");
- } else {
- string = g_strdup (e_destination_get_name (destination));
- }
- } else {
- string = g_strdup (e_destination_get_address (destination));
+ buffer = g_string_new (e_destination_get_name (destination));
+
+ if (!e_destination_is_evolution_list (destination)) {
+ const gchar *email;
+
+ email = e_destination_get_email (destination);
+ if (email == NULL || *email == '\0')
+ email = "?";
+ g_string_append_printf (buffer, " <%s>", email);
}
- g_object_set (cell, "text", string, NULL);
- g_free (string);
+ g_object_set (cell, "text", buffer->str, NULL);
+ g_string_free (buffer, TRUE);
}
/* ----------------------- *

28
evolution-data-server-1.9.2-strftime.patch
View File

@ -1,28 +0,0 @@
--- evolution-data-server-1.9.2/libedataserver/e-data-server-util.c.strftime 2006-11-09 22:40:39.000000000 -0500
+++ evolution-data-server-1.9.2/libedataserver/e-data-server-util.c 2006-11-09 22:43:54.000000000 -0500
@@ -335,11 +335,11 @@
**/
size_t e_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)
{
+ size_t ret;
#ifdef HAVE_LKSTRFTIME
- return strftime(s, max, fmt, tm);
+ ret = strftime(s, max, fmt, tm);
#else
char *c, *ffmt, *ff;
- size_t ret;
ffmt = g_strdup(fmt);
ff = ffmt;
@@ -365,8 +365,10 @@
ret = strftime(s, max, ffmt, tm);
g_free(ffmt);
- return ret;
#endif
+ if (ret == 0 && max > 0)
+ s[0] = '\0';
+ return ret;
}
/**

392
evolution-data-server-1.9.3-e-source-color.patch
View File

@ -1,392 +0,0 @@
--- evolution-data-server-1.9.3/libedataserverui/e-source-selector.c.e-source-color 2006-04-26 04:21:21.000000000 -0400
+++ evolution-data-server-1.9.3/libedataserverui/e-source-selector.c 2006-12-15 16:02:47.000000000 -0500
@@ -411,15 +411,24 @@
NULL);
} else {
ESource *source;
- guint32 color;
GdkPixbuf *pixbuf = NULL;
+ const gchar *color_spec;
+ GdkColor color;
g_assert (E_IS_SOURCE (data));
source = E_SOURCE (data);
- if (e_source_get_color (source, &color)) {
+ color_spec = e_source_peek_color_spec (source);
+ if (color_spec != NULL && gdk_color_parse (color_spec, &color)) {
+ guint32 rgba;
+
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 16, 16);
- gdk_pixbuf_fill (pixbuf, color << 8);
+
+ rgba = (((color.red & 0xff00) << 8) |
+ ((color.green & 0xff00)) |
+ ((color.blue & 0xff00) >> 8)) << 8;
+
+ gdk_pixbuf_fill (pixbuf, rgba);
}
g_object_set (renderer,
--- evolution-data-server-1.9.3/libedataserver/e-source.h.e-source-color 2005-08-31 00:26:10.000000000 -0400
+++ evolution-data-server-1.9.3/libedataserver/e-source.h 2006-12-15 16:02:47.000000000 -0500
@@ -82,20 +82,27 @@
const char *relative_uri);
void e_source_set_absolute_uri (ESource *source,
const char *absolute_uri);
+void e_source_set_color_spec (ESource *source,
+ const gchar *color_spec);
void e_source_set_readonly (ESource *source,
gboolean readonly);
+#ifndef EDS_DISABLE_DEPRECATED
void e_source_set_color (ESource *source,
guint32 color);
void e_source_unset_color (ESource *source);
+#endif
ESourceGroup *e_source_peek_group (ESource *source);
const char *e_source_peek_uid (ESource *source);
const char *e_source_peek_name (ESource *source);
const char *e_source_peek_relative_uri (ESource *source);
const char *e_source_peek_absolute_uri (ESource *source);
+const char *e_source_peek_color_spec (ESource *source);
gboolean e_source_get_readonly (ESource *source);
+#ifndef EDS_DISABLE_DEPRECATED
gboolean e_source_get_color (ESource *source,
guint32 *color_return);
+#endif
char *e_source_get_uri (ESource *source);
--- evolution-data-server-1.9.3/libedataserver/e-source.c.e-source-color 2006-08-03 07:29:44.000000000 -0400
+++ evolution-data-server-1.9.3/libedataserver/e-source.c 2006-12-15 16:02:47.000000000 -0500
@@ -32,10 +32,6 @@
#define ES_CLASS(obj) E_SOURCE_CLASS (G_OBJECT_GET_CLASS (obj))
-/* String used to put the color in the XML. */
-#define COLOR_FORMAT_STRING "%06x"
-
-
/* Private members. */
struct _ESourcePrivate {
@@ -48,8 +44,7 @@
gboolean readonly;
- gboolean has_color;
- guint32 color;
+ gchar *color_spec;
GHashTable *properties;
};
@@ -89,6 +84,7 @@
g_free (priv->name);
g_free (priv->relative_uri);
g_free (priv->absolute_uri);
+ g_free (priv->color_spec);
g_hash_table_destroy (priv->properties);
@@ -143,6 +139,28 @@
g_free, g_free);
}
+/* Private methods. */
+
+static gboolean
+set_color_spec (ESource *source,
+ const gchar *color_spec)
+{
+ ESourcePrivate *priv = source->priv;
+ gboolean do_cmp;
+
+ if (color_spec == priv->color_spec)
+ return FALSE;
+
+ do_cmp = (color_spec != NULL && priv->color_spec != NULL);
+ if (do_cmp && g_ascii_strcasecmp (color_spec, priv->color_spec) == 0)
+ return FALSE;
+
+ g_free (priv->color_spec);
+ priv->color_spec = g_strdup (color_spec);
+
+ return TRUE;
+}
+
/* Public methods. */
ESource *
@@ -300,19 +318,22 @@
xmlChar *name;
xmlChar *relative_uri;
xmlChar *absolute_uri;
- xmlChar *color_string;
- gboolean retval;
+ xmlChar *color_spec;
+ xmlChar *color;
+ gboolean retval = FALSE;
gboolean changed = FALSE;
name = xmlGetProp (node, "name");
relative_uri = xmlGetProp (node, "relative_uri");
absolute_uri = xmlGetProp (node, "uri");
- color_string = xmlGetProp (node, "color");
+ color_spec = xmlGetProp (node, "color_spec");
+ color = xmlGetProp (node, "color"); /* obsolete */
- if (name == NULL || (relative_uri == NULL && absolute_uri == NULL)) {
- retval = FALSE;
+ if (name == NULL || (relative_uri == NULL && absolute_uri == NULL))
+ goto done;
+
+ if (color_spec != NULL && color != NULL)
goto done;
- }
if (source->priv->name == NULL
|| strcmp (name, source->priv->name) != 0
@@ -334,21 +355,15 @@
changed = TRUE;
}
- if (color_string == NULL) {
- if (source->priv->has_color) {
- source->priv->has_color = FALSE;
- changed = TRUE;
- }
+ if (color == NULL) {
+ /* It is okay for color_spec to be NULL. */
+ changed |= set_color_spec (source, color_spec);
} else {
- guint32 color = 0;
-
- sscanf (color_string, COLOR_FORMAT_STRING, &color);
- if (! source->priv->has_color || source->priv->color != color) {
- source->priv->has_color = TRUE;
- source->priv->color = color;
- changed = TRUE;
- }
+ gchar buffer[8];
+ g_snprintf (buffer, sizeof (buffer), "#%s", color);
+ changed |= set_color_spec (source, buffer);
}
+
if (g_hash_table_size (source->priv->properties) && !node->children) {
g_hash_table_destroy (source->priv->properties);
source->priv->properties = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -387,8 +402,8 @@
xmlFree (relative_uri);
if (absolute_uri != NULL)
xmlFree (absolute_uri);
- if (color_string != NULL)
- xmlFree (color_string);
+ if (color_spec != NULL)
+ xmlFree (color_spec);
return retval;
}
@@ -552,18 +567,12 @@
e_source_set_color (ESource *source,
guint32 color)
{
- g_return_if_fail (E_IS_SOURCE (source));
+ gchar color_spec[8];
- if (source->priv->readonly)
- return;
-
- if (source->priv->has_color && source->priv->color == color)
- return;
-
- source->priv->has_color = TRUE;
- source->priv->color = color;
+ g_return_if_fail (E_IS_SOURCE (source));
- g_signal_emit (source, signals[CHANGED], 0);
+ g_snprintf (color_spec, sizeof (color_spec), "#%06x", color);
+ e_source_set_color_spec (source, color_spec);
}
void
@@ -571,13 +580,29 @@
{
g_return_if_fail (E_IS_SOURCE (source));
- if (! source->priv->has_color)
- return;
-
- source->priv->has_color = FALSE;
- g_signal_emit (source, signals[CHANGED], 0);
+ e_source_set_color_spec (source, NULL);
}
+/**
+ * e_source_set_color_spec:
+ * @source: an ESource
+ * @color_spec: a string specifying the color
+ *
+ * Store a textual representation of a color in @source. The @color_spec
+ * string should be parsable by #gdk_color_parse(), or %NULL to unset the
+ * color in @source.
+ *
+ * Since: 1.10
+ **/
+void
+e_source_set_color_spec (ESource *source,
+ const gchar *color_spec)
+{
+ g_return_if_fail (E_IS_SOURCE (source));
+
+ if (!source->priv->readonly && set_color_spec (source, color_spec))
+ g_signal_emit (source, signals[CHANGED], 0);
+}
ESourceGroup *
e_source_peek_group (ESource *source)
@@ -619,6 +644,25 @@
return source->priv->absolute_uri;
}
+/**
+ * e_source_peek_color_spec:
+ * @source: an ESource
+ *
+ * Return the textual representation of the color for @source, or %NULL if it
+ * has none. The returned string should be parsable by #gdk_color_parse().
+ *
+ * Return value: a string specifying the color
+ *
+ * Since: 1.10
+ **/
+const char *
+e_source_peek_color_spec (ESource *source)
+{
+ g_return_val_if_fail (E_IS_SOURCE (source), NULL);
+
+ return source->priv->color_spec;
+}
+
gboolean
e_source_get_readonly (ESource *source)
{
@@ -643,13 +687,21 @@
e_source_get_color (ESource *source,
guint32 *color_return)
{
+ const gchar *color_spec;
+ guint32 color;
+
g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
- if (! source->priv->has_color)
+ color_spec = e_source_peek_color_spec (source);
+
+ if (color_spec == NULL)
+ return FALSE;
+
+ if (sscanf (color_spec, "#%06x", &color) != 1)
return FALSE;
if (color_return != NULL)
- *color_return = source->priv->color;
+ *color_return = color;
return TRUE;
}
@@ -689,8 +741,6 @@
xmlNodePtr parent_node)
{
ESourcePrivate *priv;
- gboolean has_color;
- guint32 color;
xmlNodePtr node;
const char *abs_uri = NULL, *relative_uri = NULL;
@@ -709,13 +759,9 @@
xmlSetProp (node, "uri", abs_uri);
if (relative_uri)
xmlSetProp (node, "relative_uri", relative_uri);
-
- has_color = e_source_get_color (source, &color);
- if (has_color) {
- char *color_string = g_strdup_printf (COLOR_FORMAT_STRING, color);
- xmlSetProp (node, "color", color_string);
- g_free (color_string);
- }
+
+ if (priv->color_spec != NULL)
+ xmlSetProp (node, "color_spec", priv->color_spec);
if (g_hash_table_size (priv->properties) != 0) {
xmlNodePtr properties_node;
@@ -848,7 +894,6 @@
e_source_copy (ESource *source)
{
ESource *new_source;
- guint32 color;
g_return_val_if_fail (E_IS_SOURCE (source), NULL);
@@ -857,8 +902,7 @@
e_source_set_name (new_source, e_source_peek_name (source));
- if (e_source_get_color (source, &color))
- e_source_set_color (new_source, color);
+ new_source->priv->color_spec = g_strdup (source->priv->color_spec);
new_source->priv->absolute_uri = g_strdup (e_source_peek_absolute_uri (source));
--- evolution-data-server-1.9.3/libedataserver/test-source-list.c.e-source-color 2005-10-14 07:31:40.000000000 -0400
+++ evolution-data-server-1.9.3/libedataserver/test-source-list.c 2006-12-15 16:02:47.000000000 -0500
@@ -91,17 +91,16 @@
dump_source (ESource *source)
{
char *uri = e_source_get_uri (source);
- gboolean has_color;
- guint32 color;
+ const gchar *color_spec;
g_print ("\tSource %s\n", e_source_peek_uid (source));
g_print ("\t\tname: %s\n", e_source_peek_name (source));
g_print ("\t\trelative_uri: %s\n", e_source_peek_relative_uri (source));
g_print ("\t\tabsolute_uri: %s\n", uri);
- has_color = e_source_get_color (source, &color);
- if (has_color)
- g_print ("\t\tcolor: %06x\n", color);
+ color_spec = e_source_peek_color_spec (source);
+ if (color_spec != NULL)
+ g_print ("\t\tcolor: %s\n", color_spec);
g_print ("\t\tproperties:\n");
e_source_foreach_property (source, (GHFunc) dump_property, NULL);
@@ -429,7 +428,6 @@
if (set_color_arg != NULL) {
ESource *source;
- guint32 color;
if (add_source_arg == NULL && source_arg == NULL) {
fprintf (stderr,
@@ -442,8 +440,7 @@
else
source = e_source_list_peek_source_by_uid (list, source_arg);
- sscanf (set_color_arg, "%06x", &color);
- e_source_set_color (source, color);
+ e_source_set_color_spec (source, set_color_arg);
e_source_list_sync (list, NULL);
}
@@ -461,7 +458,7 @@
else
source = e_source_list_peek_source_by_uid (list, source_arg);
- e_source_unset_color (source);
+ e_source_set_color_spec (source, NULL);
e_source_list_sync (list, NULL);
}

705
evolution-data-server-1.9.92-e-flag.patch
View File

File diff suppressed because it is too large Load Diff

119
evolution-data-server-1.9.92-e-passwords.patch
View File

@ -1,5 +1,5 @@
--- evolution-data-server-1.10.0/libedataserverui/e-passwords.h.e-passwords 2007-01-03 05:09:27.000000000 -0500
+++ evolution-data-server-1.10.0/libedataserverui/e-passwords.h 2007-03-14 18:05:55.000000000 -0400
--- evolution-data-server-1.11.2/libedataserverui/e-passwords.h.e-passwords 2007-04-18 06:10:16.000000000 -0400
+++ evolution-data-server-1.11.2/libedataserverui/e-passwords.h 2007-05-18 12:03:54.000000000 -0400
@@ -28,45 +28,65 @@
G_BEGIN_DECLS
@ -97,8 +97,8 @@
G_END_DECLS
--- evolution-data-server-1.10.0/libedataserverui/e-passwords.c.e-passwords 2007-02-09 03:38:09.000000000 -0500
+++ evolution-data-server-1.10.0/libedataserverui/e-passwords.c 2007-03-14 20:27:01.000000000 -0400
--- evolution-data-server-1.11.2/libedataserverui/e-passwords.c.e-passwords 2007-04-18 06:10:16.000000000 -0400
+++ evolution-data-server-1.11.2/libedataserverui/e-passwords.c 2007-05-18 12:03:54.000000000 -0400
@@ -23,18 +23,29 @@
*/
@ -139,7 +139,7 @@
*/
#ifdef HAVE_CONFIG_H
@@ -42,159 +53,384 @@
@@ -42,159 +53,381 @@
#endif
#include <string.h>
@ -157,7 +157,7 @@
+#include "libedataserver/e-flag.h"
#include "libedataserver/e-url.h"
#if WITH_GNOME_KEYRING
#ifdef WITH_GNOME_KEYRING
#include <gnome-keyring.h>
#endif
@ -439,10 +439,7 @@
static void
-ep_msg_free(EPassMsg *msg)
+ep_msg_dispatch (EPassMsg *msg)
{
- e_msgport_destroy(msg->msg.reply_port);
- g_free(msg->password);
- g_free(msg);
+{
+ msg->callback (msg);
+ e_flag_set (msg->done);
+}
@ -460,13 +457,14 @@
+ g_async_queue_unlock (express_queue);
+
+ return success;
}
static void
-ep_msg_send(EPassMsg *msg)
+}
+
+static void
+ep_msg_send (EPassMsg *msg)
{
- int needidle = 0;
- e_msgport_destroy(msg->msg.reply_port);
- g_free(msg->password);
- g_free(msg);
+ GMainContext *context;
+
+ context = g_main_context_default ();
@ -476,14 +474,6 @@
+
+ if (!(msg->expedite && ep_msg_expedite (msg)))
+ g_thread_pool_push (dispatcher, msg, NULL);
- LOCK();
- e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
- if (!idle_id) {
- if (!msg->ismain)
- idle_id = g_idle_add(ep_idle_dispatch, NULL);
+ g_debug ("%s: in main thread? %d", G_STRFUNC,
+ g_main_context_is_owner (context));
+
+ /* Don't block the main loop. */
+ if (g_main_context_is_owner (context))
@ -491,9 +481,10 @@
+ g_main_context_iteration (context, TRUE);
+ else
+ e_flag_wait (msg->done);
+}
+
+static void
}
static void
-ep_msg_send(EPassMsg *msg)
+ep_msg_free (EPassMsg *msg)
+{
+ e_flag_free (msg->done);
@ -527,9 +518,15 @@
+
+static gboolean
+ep_dialog_run (EPassMsg *msg)
+{
{
- int needidle = 0;
+ /* This function must run in the main thread. */
+
- LOCK();
- e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
- if (!idle_id) {
- if (!msg->ismain)
- idle_id = g_idle_add(ep_idle_dispatch, NULL);
+ EPassDialogData *data = msg->data;
+ GtkBox *box;
+ GtkWidget *dialog;
@ -619,14 +616,14 @@
-/* the functions that actually do the work */
+/* The rest of these static functions must run in the dispatcher thread. */
+
#if WITH_GNOME_KEYRING
#ifdef WITH_GNOME_KEYRING
static void
-ep_clear_passwords_keyring(EPassMsg *msg)
+ep_clear_passwords_keyring (EPassMsg *msg)
{
GnomeKeyringAttributeList *attributes;
GnomeKeyringAttribute attribute;
@@ -205,11 +441,8 @@
@@ -205,11 +438,8 @@
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
if (!default_keyring) {
@ -640,7 +637,7 @@
default_keyring = g_strdup ("default");
}
@@ -239,38 +472,44 @@
@@ -239,38 +469,44 @@
}
g_free (default_keyring);
@ -686,7 +683,7 @@
- memset (value, 0, strlen (value));
- g_free (value);
- return TRUE;
+#if WITH_GNOME_KEYRING
+#ifdef WITH_GNOME_KEYRING
+ if (gnome_keyring_is_available ())
+ ep_clear_passwords_keyring (msg);
+ else
@ -696,14 +693,14 @@
+#endif
}
#if WITH_GNOME_KEYRING
#ifdef WITH_GNOME_KEYRING
static void
-ep_forget_passwords_keyring(EPassMsg *msg)
+ep_forget_passwords_keyring (EPassMsg *msg)
{
GnomeKeyringAttributeList *attributes;
GnomeKeyringAttribute attribute;
@@ -281,11 +520,8 @@
@@ -281,11 +517,8 @@
result = gnome_keyring_get_default_keyring_sync (&default_keyring);
if (!default_keyring) {
@ -717,7 +714,7 @@
default_keyring = g_strdup ("default");
}
d(g_print("Get Default %d\n", result));
@@ -316,69 +552,54 @@
@@ -316,69 +549,54 @@
g_free (default_keyring);
/* free up the session passwords */
@ -784,7 +781,7 @@
- g_free (keycopy);
-
- return path;
+#if WITH_GNOME_KEYRING
+#ifdef WITH_GNOME_KEYRING
+ if (gnome_keyring_is_available ())
+ ep_forget_passwords_keyring (msg);
+ else
@ -794,7 +791,7 @@
+#endif
}
#if WITH_GNOME_KEYRING
#ifdef WITH_GNOME_KEYRING
static void
-ep_remember_password_keyring(EPassMsg *msg)
+ep_remember_password_keyring (EPassMsg *msg)
@ -814,7 +811,7 @@
guint32 item_id;
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
@@ -419,48 +640,48 @@
@@ -419,48 +637,48 @@
d(g_print("Remember %s: %d/%d\n", msg->key, result, item_id));
/* now remove it from our session hash */
@ -882,7 +879,7 @@
+static void
+ep_remember_password (EPassMsg *msg)
+{
+#if WITH_GNOME_KEYRING
+#ifdef WITH_GNOME_KEYRING
+ if (gnome_keyring_is_available ())
+ ep_remember_password_keyring (msg);
+ else
@ -892,8 +889,8 @@
+#endif
}
#if WITH_GNOME_KEYRING
@@ -472,7 +693,6 @@
#ifdef WITH_GNOME_KEYRING
@@ -472,7 +690,6 @@
GnomeKeyringResult result;
GList *matches = NULL, *tmp;
char *default_keyring = NULL;
@ -901,7 +898,7 @@
EUri *uri = e_uri_new (msg->key);
if (!strcmp (uri->protocol, "ldap") && !uri->user) {
@@ -486,27 +706,17 @@
@@ -486,27 +703,17 @@
uri->user = keycopy;
}
@ -932,7 +929,7 @@
default_keyring = g_strdup ("default");
}
@@ -567,35 +777,44 @@
@@ -567,35 +774,44 @@
}
g_free (default_keyring);
@ -984,7 +981,7 @@
+static void
+ep_forget_password (EPassMsg *msg)
+{
+#if WITH_GNOME_KEYRING
+#ifdef WITH_GNOME_KEYRING
+ if (gnome_keyring_is_available ())
+ ep_forget_password_keyring (msg);
+ else
@ -994,9 +991,9 @@
+#endif
+}
#if WITH_GNOME_KEYRING
#ifdef WITH_GNOME_KEYRING
static void
@@ -605,11 +824,11 @@
@@ -605,11 +821,11 @@
GnomeKeyringAttributeList *attributes;
GnomeKeyringAttribute attribute;
GnomeKeyringResult result;
@ -1011,7 +1008,7 @@
} else {
EUri *uri = e_uri_new (msg->key);
@@ -683,287 +902,154 @@
@@ -683,287 +899,154 @@
}
}
@ -1105,7 +1102,7 @@
- msg->oldpass = msg->password;
- ep_add_password(msg);
- }
#if WITH_GNOME_KEYRING
#ifdef WITH_GNOME_KEYRING
- if (*msg->remember && type == E_PASSWORDS_REMEMBER_FOREVER) {
- if (gnome_keyring_is_available())
- ep_remember_password_keyring(msg);
@ -1136,13 +1133,13 @@
- mw = (EPassMsg *)request_list.head;
- mn = (EPassMsg *)mw->msg.ln.next;
- while (mn) {
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- if ((mw->dispatch == (gnome_keyring_is_available() ? ep_forget_password_keyring : ep_forget_password_file)
-#else
- if ((mw->dispatch == ep_forget_password_file
+ ep_get_password_keyfile (msg);
#endif
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- || mw->dispatch == (gnome_keyring_is_available() ? ep_get_password_keyring : ep_get_password_file)
-#else
- || mw->dispatch == ep_get_password_file
@ -1255,7 +1252,7 @@
- gtk_widget_grab_focus (msg->entry);
-
- if ((msg->flags & E_PASSWORDS_REPROMPT)) {
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- if (gnome_keyring_is_available())
- ep_get_password_keyring(msg);
- else
@ -1389,7 +1386,7 @@
*
* Set the offline-state of the application. This is a work-around
* for having the backends fully offline aware, and returns a
@@ -972,10 +1058,11 @@
@@ -972,10 +1055,11 @@
* FIXME: This is not a permanent api, review post 2.0.
**/
void
@ -1404,11 +1401,11 @@
}
/**
@@ -986,150 +1073,137 @@
@@ -986,150 +1070,137 @@
void
e_passwords_forget_passwords (void)
{
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- EPassMsg *msg = ep_msg_new(gnome_keyring_is_available() ? ep_forget_passwords_keyring : ep_forget_passwords_file);
-#else
- EPassMsg *msg = ep_msg_new(ep_forget_passwords_file);
@ -1434,7 +1431,7 @@
-e_passwords_clear_passwords (const char *component_name)
+e_passwords_clear_passwords (const gchar *component)
{
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- EPassMsg *msg = ep_msg_new(gnome_keyring_is_available() ? ep_clear_passwords_keyring : ep_clear_passwords_file);
-#else
- EPassMsg *msg = ep_msg_new(ep_clear_passwords_file);
@ -1471,7 +1468,7 @@
+ g_return_if_fail (component != NULL);
+ g_return_if_fail (key != NULL);
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_remember_password_keyring : ep_remember_password_file);
-#else
- msg = ep_msg_new(ep_remember_password_file);
@ -1505,7 +1502,7 @@
+ g_return_if_fail (component != NULL);
+ g_return_if_fail (key != NULL);
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_forget_password_keyring : ep_forget_password_file);
-#else
- msg = ep_msg_new(ep_forget_password_file);
@ -1542,7 +1539,7 @@
+ g_return_val_if_fail (component != NULL, NULL);
+ g_return_val_if_fail (key != NULL, NULL);
-#if WITH_GNOME_KEYRING
-#ifdef WITH_GNOME_KEYRING
- msg = ep_msg_new(gnome_keyring_is_available() ? ep_get_password_keyring : ep_get_password_file);
-#else
- msg = ep_msg_new(ep_get_password_file);
@ -1608,7 +1605,7 @@
* @key: key to store the password under
* @prompt: prompt string
* @secret: whether or not the password text should be ***ed out
@@ -1146,241 +1220,45 @@
@@ -1146,241 +1217,45 @@
* return value is non-%NULL and @remember_type is not
* E_PASSWORDS_DO_NOT_REMEMBER.
**/
@ -1879,8 +1876,8 @@
- return (char *)plain;
+ return password;
}
--- evolution-data-server-1.10.0/libedataserver/e-msgport.h.e-passwords 2007-02-26 04:52:17.000000000 -0500
+++ evolution-data-server-1.10.0/libedataserver/e-msgport.h 2007-03-14 18:05:55.000000000 -0400
--- evolution-data-server-1.11.2/libedataserver/e-msgport.h.e-passwords 2007-04-18 06:10:18.000000000 -0400
+++ evolution-data-server-1.11.2/libedataserver/e-msgport.h 2007-05-18 12:03:54.000000000 -0400
@@ -54,7 +54,7 @@
/* header for any message */

80
evolution-data-server.spec
View File

@ -9,7 +9,7 @@
%define orbit2_version 2.9.8
%define libbonobo_version 2.4.2
%define eds_base_version 1.10
%define eds_base_version 1.12
%define eds_api_version 1.2
%define use_gtk_doc 0
@ -25,8 +25,8 @@
### Abstract ###
Name: evolution-data-server
Version: 1.10.1
Release: 6%{?dist}
Version: 1.11.2
Release: 1%{?dist}
License: LGPL
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@ -48,47 +48,29 @@ Patch12: evolution-data-server-1.7.91-maybe-fix-crash.patch
# RH bug #203915
Patch13: evolution-data-server-1.8.0-fix-camel-malloc.patch
# GNOME bug #360240
Patch14: evolution-data-server-1.8.1-warn-unused-variable.patch
# GNOME bug #360619
Patch15: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch
# GNOME bug #363965
Patch16: evolution-data-server-1.9.1-kill-ememory.patch
# RH bug #203058
Patch17: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
# RH bug #210142
Patch18: evolution-data-server-1.9.2-strftime.patch
# GNOME bug #373117
Patch19: evolution-data-server-1.9.3-e-source-color.patch
# GNOME bug #363695
Patch14: evolution-data-server-1.9.1-kill-ememory.patch
# GNOME bug #415891
Patch20: evolution-data-server-1.9.92-e-flag.patch
Patch15: evolution-data-server-1.9.92-e-flag.patch
# GNOME bug #376991
Patch21: evolution-data-server-1.9.92-e-passwords.patch
Patch16: evolution-data-server-1.9.92-e-passwords.patch
# GNOME bug #415922
Patch22: evolution-data-server-1.9.92-isa-support.patch
Patch17: evolution-data-server-1.9.92-isa-support.patch
# GNOME bug #417999
Patch23: evolution-data-server-1.10.0-code-cleanup.patch
# RH bug #235290 / GNOME bug #424373
Patch24: evolution-data-server-1.10.1-apop-auth-vulnerability.patch
# Fix a dangling pointer (no bug number).
Patch25: evolution-data-server-1.10.1-e-source-group.patch
Patch18: evolution-data-server-1.10.0-code-cleanup.patch
# GNOME bug #373146
Patch26: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
Patch19: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #215634
Patch27: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
# Fix the usual implicit function declarations
Patch21: evolution-data-server-1.11.2-implicit-function-declarations.patch
### Dependencies ###
@ -173,20 +155,14 @@ evolution-data-server.
%patch11 -p1 -b .no-gnome-common
%patch12 -p1 -b .maybe-fix-crash
%patch13 -p1 -b .fix-camel-malloc
%patch14 -p1 -b .warn-unused-variable
%patch15 -p1 -b .warn-incompatible-pointer-type
%patch16 -p1 -b .kill-ememory
%patch17 -p1 -b .fix-name-selector-dialog
%patch18 -p1 -b .strftime
%patch19 -p1 -b .e-source-color
%patch20 -p1 -b .e-flag
%patch21 -p1 -b .e-passwords
%patch22 -p1 -b .isa-support
%patch23 -p1 -b .code-cleanup
%patch24 -p1 -b .apop-auth-vulnerability
%patch25 -p1 -b .e-source-group
%patch26 -p1 -b .camel-folder-symmary-crash
%patch27 -p1 -b .camel-certdb-nss-cert-get
%patch14 -p1 -b .kill-ememory
%patch15 -p1 -b .e-flag
%patch16 -p1 -b .e-passwords
%patch17 -p1 -b .isa-support
%patch18 -p1 -b .code-cleanup
%patch19 -p1 -b .camel-folder-symmary-crash
%patch20 -p1 -b .camel-certdb-nss-cert-get
%patch21 -p1 -b .implicit-function-declarations
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -404,6 +380,18 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog
* Fri May 18 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-1.fc7
- Update to 1.11.2
- Bump eds_base_version to 1.12.
- Add patch to fix implicit function declarations.
- Remove patch for RH bug #203058 (fixed upstream).
- Remove patch for RH bug #210142 (fixed upstream).
- Remove patch for RH bug #235290 (fixed upstream).
- Remove patch for GNOME bug #360240 (fixed upstream).
- Remove patch for GNOME bug #360619 (fixed upstream).
- Remove patch for GNOME bug #373117 (fixed upstream).
- Revise patch for GNOME bug #415891 (partially fixed upstream).
* Wed May 09 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.1-6.fc7
- Add patch for RH bug #215634 (read NSS certificates more reliably).

2
sources
View File

@ -1 +1 @@
1175bf76756009975f684116e76638c3 evolution-data-server-1.10.1.tar.bz2
69cc87c19f7178557902900eebd5de82 evolution-data-server-1.11.2.tar.bz2