- Update to 2.22.1
- Remove patch for RH bug #296671 (fixed upstream). - Remove patch for GNOME bug #523023 (fixed upstream).
This commit is contained in:
Matthew Barnes
parent
25453e9e31
commit
4944482a72
@ -1 +1 @@
|
||||
evolution-data-server-2.22.0.tar.bz2
|
||||
evolution-data-server-2.22.1.tar.bz2
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
diff -up evolution-data-server-2.21.91/camel/camel-net-utils.c.netdb-breakage evolution-data-server-2.21.91/camel/camel-net-utils.c
|
||||
--- evolution-data-server-2.21.91/camel/camel-net-utils.c.netdb-breakage 2008-01-23 06:16:25.000000000 -0500
|
||||
+++ evolution-data-server-2.21.91/camel/camel-net-utils.c 2008-02-12 13:25:56.000000000 -0500
|
||||
@@ -44,6 +44,14 @@
|
||||
|
||||
#define d(x)
|
||||
|
||||
+/* These are GNU extensions */
|
||||
+#ifndef NI_MAXHOST
|
||||
+#define NI_MAXHOST 1025
|
||||
+#endif
|
||||
+#ifndef NI_MAXSERV
|
||||
+#define NI_MAXSERV 32
|
||||
+#endif
|
||||
+
|
||||
#ifdef G_OS_WIN32
|
||||
|
||||
typedef short in_port_t;
|
||||
diff -up evolution-data-server-2.21.91/camel/camel-net-utils.h.netdb-breakage evolution-data-server-2.21.91/camel/camel-net-utils.h
|
||||
--- evolution-data-server-2.21.91/camel/camel-net-utils.h.netdb-breakage 2007-11-29 07:53:44.000000000 -0500
|
||||
+++ evolution-data-server-2.21.91/camel/camel-net-utils.h 2008-02-12 13:25:56.000000000 -0500
|
||||
@@ -77,9 +77,6 @@ struct addrinfo {
|
||||
#define EAI_SYSTEM -11 /* System error returned in `errno'. */
|
||||
#define EAI_OVERFLOW -12 /* Argument buffer overflow. */
|
||||
|
||||
-#define NI_MAXHOST 1025
|
||||
-#define NI_MAXSERV 32
|
||||
-
|
||||
#define NI_NUMERICHOST 1 /* Don't try to look up hostname. */
|
||||
#define NI_NUMERICSERV 2 /* Don't convert port number to name. */
|
||||
#define NI_NOFQDN 4 /* Only return nodename portion. */
|
||||
diff -up evolution-data-server-2.21.91/configure.in.netdb-breakage evolution-data-server-2.21.91/configure.in
|
||||
--- evolution-data-server-2.21.91/configure.in.netdb-breakage 2008-02-10 10:19:14.000000000 -0500
|
||||
+++ evolution-data-server-2.21.91/configure.in 2008-02-12 13:25:56.000000000 -0500
|
||||
@@ -878,6 +878,14 @@ AC_CACHE_CHECK([if system supports getad
|
||||
#include <stddef.h>
|
||||
|
||||
],[
|
||||
+ #ifndef NI_MAXHOST
|
||||
+ #define NI_MAXHOST 1025
|
||||
+ #endif
|
||||
+
|
||||
+ #ifndef NI_MAXSERV
|
||||
+ #define NI_MAXSERV 32
|
||||
+ #endif
|
||||
+
|
||||
struct addrinfo hints, *res;
|
||||
struct sockaddr_in6 sin6;
|
||||
int af = AF_INET6;
|
||||
@ -1,24 +0,0 @@
|
||||
diff -up evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c.no-gnuc-pretty-function evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c
|
||||
--- evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c.no-gnuc-pretty-function 2008-01-12 04:21:01.000000000 -0500
|
||||
+++ evolution-data-server-2.21.91/servers/exchange/storage/exchange-account.c 2008-02-12 14:27:30.000000000 -0500
|
||||
@@ -1886,7 +1886,7 @@ add_folder (gpointer key, gpointer value
|
||||
{
|
||||
EFolder *folder = value;
|
||||
|
||||
- d(g_print ("%s(%d):%s: key=[%s]\t folder-path=[%s]\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION,
|
||||
+ d(g_print ("%s:%s: key=[%s]\t folder-path=[%s]\n", G_STRLOC, G_STRFUNC,
|
||||
key, e_folder_exchange_get_path (folder)));
|
||||
|
||||
/* Each folder appears under three different keys, but
|
||||
diff -up evolution-data-server-2.21.91/addressbook/libebook/e-book.c.no-gnuc-pretty-function evolution-data-server-2.21.91/addressbook/libebook/e-book.c
|
||||
--- evolution-data-server-2.21.91/addressbook/libebook/e-book.c.no-gnuc-pretty-function 2007-11-29 07:53:48.000000000 -0500
|
||||
+++ evolution-data-server-2.21.91/addressbook/libebook/e-book.c 2008-02-12 14:27:30.000000000 -0500
|
||||
@@ -4012,7 +4012,7 @@ e_book_dispose (GObject *object)
|
||||
CORBA_exception_init (&ev);
|
||||
bonobo_object_release_unref (book->priv->corba_book, &ev);
|
||||
if (ev._major != CORBA_NO_EXCEPTION)
|
||||
- g_warning ("%s: Exception releasing remote book interface!\n", G_GNUC_PRETTY_FUNCTION);
|
||||
+ g_warning ("%s: Exception releasing remote book interface!\n", G_STRFUNC);
|
||||
CORBA_exception_free (&ev);
|
||||
}
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
diff -up evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c.e2k-global-catalog evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c
|
||||
--- evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c.e2k-global-catalog 2007-11-29 07:53:45.000000000 -0500
|
||||
+++ evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c 2008-03-11 23:41:22.000000000 -0400
|
||||
@@ -307,17 +307,19 @@ static int
|
||||
connect_ldap (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap)
|
||||
{
|
||||
int ldap_error;
|
||||
-#ifndef HAVE_LDAP_NTLM_BIND
|
||||
char *nt_name;
|
||||
#ifdef G_OS_WIN32
|
||||
SEC_WINNT_AUTH_IDENTITY_W auth;
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
/* authenticate */
|
||||
#ifdef HAVE_LDAP_NTLM_BIND
|
||||
- ldap_error = ntlm_bind (gc, op, ldap);
|
||||
-#else
|
||||
+ if (ntlm_bind (gc, op, ldap) == LDAP_SUCCESS) {
|
||||
+ E2K_GC_DEBUG_MSG(("GC: connected via NTLM\n\n"));
|
||||
+ return LDAP_SUCCESS;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
nt_name = gc->priv->nt_domain ?
|
||||
g_strdup_printf ("%s\\%s", gc->priv->nt_domain, gc->priv->user) :
|
||||
g_strdup (gc->priv->user);
|
||||
@@ -339,7 +341,7 @@ connect_ldap (E2kGlobalCatalog *gc, E2kO
|
||||
g_free (auth.User);
|
||||
#endif
|
||||
g_free (nt_name);
|
||||
-#endif
|
||||
+
|
||||
if (ldap_error != LDAP_SUCCESS)
|
||||
g_warning ("LDAP authentication failed (0x%02x)", ldap_error);
|
||||
else
|
||||
@ -1,34 +0,0 @@
|
||||
diff -up evolution-data-server-2.22.0/servers/exchange/storage/exchange-hierarchy-webdav.c.efolder-leak evolution-data-server-2.22.0/servers/exchange/storage/exchange-hierarchy-webdav.c
|
||||
--- evolution-data-server-2.22.0/servers/exchange/storage/exchange-hierarchy-webdav.c.efolder-leak 2007-11-29 07:53:44.000000000 -0500
|
||||
+++ evolution-data-server-2.22.0/servers/exchange/storage/exchange-hierarchy-webdav.c 2008-03-24 11:11:30.000000000 -0400
|
||||
@@ -756,10 +756,10 @@ scan_subtree (ExchangeHierarchy *hier, E
|
||||
if (hwd->priv->deep_searchable &&
|
||||
e_folder_exchange_get_has_subfolders (folder)) {
|
||||
e_folder_exchange_set_has_subfolders (folder, FALSE);
|
||||
- subtrees = g_slist_prepend (subtrees, folder);
|
||||
+ subtrees = g_slist_prepend (subtrees, g_object_ref (folder));
|
||||
}
|
||||
exchange_hierarchy_new_folder (hier, folder);
|
||||
- //g_object_unref (folder);
|
||||
+ g_object_unref (folder);
|
||||
|
||||
/* Check the folder size here */
|
||||
if (hier->type != EXCHANGE_HIERARCHY_PUBLIC) {
|
||||
@@ -788,11 +788,16 @@ scan_subtree (ExchangeHierarchy *hier, E
|
||||
while (subtrees) {
|
||||
folder = subtrees->data;
|
||||
subtrees = g_slist_remove (subtrees, folder);
|
||||
+
|
||||
/* Dont scan the subtree for deleteditems folder */
|
||||
int_uri = e_folder_exchange_get_internal_uri (folder);
|
||||
- if (int_uri && deleted_items_uri && !strcmp (int_uri, deleted_items_uri))
|
||||
+ if (int_uri && deleted_items_uri && !strcmp (int_uri, deleted_items_uri)) {
|
||||
+ g_object_unref (folder);
|
||||
continue;
|
||||
+ }
|
||||
+
|
||||
scan_subtree (hier, folder, mode);
|
||||
+ g_object_unref (folder);
|
||||
}
|
||||
|
||||
e_folder_exchange_set_rescan_tree (parent, FALSE);
|
||||
@ -27,8 +27,8 @@
|
||||
### Abstract ###
|
||||
|
||||
Name: evolution-data-server
|
||||
Version: 2.22.0
|
||||
Release: 3%{?dist}
|
||||
Version: 2.22.1
|
||||
Release: 1%{?dist}
|
||||
License: LGPL
|
||||
Group: System Environment/Libraries
|
||||
Summary: Backend data server for Evolution
|
||||
@ -55,12 +55,6 @@ Patch14: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
|
||||
|
||||
Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch
|
||||
|
||||
# RH bug #296671 / GNOME bug #500389
|
||||
Patch16: evolution-data-server-2.22.0-e2k-global-catalog.patch
|
||||
|
||||
# GNOME bug #523023
|
||||
Patch17: evolution-data-server-2.22.0-efolder-leak.patch
|
||||
|
||||
### Build Dependencies ###
|
||||
|
||||
BuildRequires: GConf2-devel
|
||||
@ -140,8 +134,6 @@ This package contains developer documentation for %{name}.
|
||||
%patch13 -p1 -b .camel-folder-summary-crash
|
||||
%patch14 -p1 -b .fix-64bit-acinclude
|
||||
%patch15 -p1 -b .implicit-function-declaration
|
||||
%patch16 -p1 -b .e2k-global-catalog
|
||||
%patch17 -p1 -b .efolder-leak
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -384,6 +376,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/gtk-doc/html/libedataserverui
|
||||
|
||||
%changelog
|
||||
* Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com. - 2.22.1-1.fc9
|
||||
- Update to 2.22.1
|
||||
- Remove patch for RH bug #296671 (fixed upstream).
|
||||
- Remove patch for GNOME bug #523023 (fixed upstream).
|
||||
|
||||
* Mon Mar 24 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-3.fc9
|
||||
- Add patch for GNOME bug #523023 (EFolder leak in evo-ex-storage).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user