rpm/evolution-data-server
SHA256
1
0
Fork 0
forked from pool/evolution-data-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2007-07-21 16:10:00 +00:00 committed by Git OBS Bridge
parent 3dfc2a74ff
commit 8608e0bedf
10 changed files with 132 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
abuild.patch Normal file
View File

@ -0,0 +1,38 @@
Index: evolution-data-server-1.11.5/addressbook/backends/groupwise/e-book-backend-groupwise.c
===================================================================
--- evolution-data-server-1.11.5.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ evolution-data-server-1.11.5/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -2449,11 +2449,6 @@ find_book_view (EBookBackendGroupwise *e
EIterator *iter;
EDataBookView *rv = NULL;
- if (!iter) {
- g_object_unref (views);
- return NULL;
- }
-
if (!views)
return NULL;
Index: evolution-data-server-1.11.5/libedataserverui/e-name-selector-entry.c
===================================================================
--- evolution-data-server-1.11.5.orig/libedataserverui/e-name-selector-entry.c
+++ evolution-data-server-1.11.5/libedataserverui/e-name-selector-entry.c
@@ -2057,7 +2057,7 @@ popup_activate_cut (ENameSelectorEntry *
g_signal_handlers_block_by_func (name_selector_entry, user_delete_text, name_selector_entry);
clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
- pemail = g_strconcat (contact_email, ",");
+ pemail = g_strconcat (contact_email, ",", NULL);
gtk_clipboard_set_text (clipboard, pemail, strlen (pemail));
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
@@ -2086,7 +2086,7 @@ popup_activate_copy (ENameSelectorEntry
g_signal_handlers_block_by_func (name_selector_entry, user_delete_text, name_selector_entry);
clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
- pemail = g_strconcat (contact_email, ",");
+ pemail = g_strconcat (contact_email, ",", NULL);
gtk_clipboard_set_text (clipboard, pemail, strlen (pemail));
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);

24
bnc-164140-eds-crash-evolution--offline.patch
View File

@ -1,26 +1,14 @@
Index: addressbook/backends/file/e-book-backend-file.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/file/e-book-backend-file.c,v
retrieving revision 1.41
diff -u -p -r1.41 e-book-backend-file.c
--- addressbook/backends/file/e-book-backend-file.c 16 Jan 2006 16:36:14 -0000 1.41
+++ addressbook/backends/file/e-book-backend-file.c 11 Apr 2006 11:25:19 -0000
@@ -516,6 +516,8 @@ book_view_thread (gpointer data)
{
EDataBookView *book_view = data;
FileBackendSearchClosure *closure = get_closure (book_view);
+ if (!closure)
+ return;
EBookBackendFile *bf = closure->bf;
const char *query;
DB *db;
@@ -652,6 +654,9 @@ e_book_backend_file_stop_book_view (EBoo
{
--- addressbook/backends/file/e-book-backend-file.c.orig
+++ addressbook/backends/file/e-book-backend-file.c
@@ -684,6 +684,9 @@ e_book_backend_file_stop_book_view (EBoo
FileBackendSearchClosure *closure = get_closure (book_view);
gboolean need_join = FALSE;
+
+ if (!closure)
+ return;
+
d(printf ("stopping query\n"));
g_mutex_lock (closure->mutex);
if (!closure->stopped)

42
eds-compiler-warning.patch
View File

@ -2,50 +2,26 @@ Index: addressbook/backends/ldap/e-book-backend-ldap.c
===================================================================
--- addressbook/backends/ldap/e-book-backend-ldap.c.orig
+++ addressbook/backends/ldap/e-book-backend-ldap.c
@@ -2243,8 +2243,10 @@ contact_list_handler (LDAPOp *op, LDAPMe
GTimeVal start, end;
unsigned long diff;
@@ -2457,6 +2457,8 @@ e_book_backend_ldap_get_contact_list (EB
diff -= start.tv_sec * 1000 + start.tv_usec/1000;
- if (enable_debug)
+ if (enable_debug) {
printf ("contact_list_handler ...\n");
+ g_get_current_time (&start);
+ }
ldap = bl->priv->ldap;
if (!ldap) {
e_data_book_respond_get_contact_list (op->book, op->opid, GNOME_Evolution_Addressbook_OtherError, NULL);
@@ -2427,6 +2429,8 @@ e_book_backend_ldap_get_contact_list (EB
if (enable_debug) {
g_get_current_time (&end);
printf ("e_book_backend_ldap_get_contact_list invoked contact_list_handler ");
+ diff = end.tv_sec * 1000 + end.tv_usec/1000;
+ diff -= start.tv_sec * 1000 + start.tv_usec/1000;
printf ("and took %ld.%03ld seconds\n", diff/1000, diff%1000);
}
}
Index: camel/camel-stream-vfs.c
===================================================================
--- camel/camel-stream-vfs.c.orig
+++ camel/camel-stream-vfs.c
@@ -151,7 +151,7 @@ camel_stream_vfs_new_with_uri (const cha
{
GnomeVFSResult result;
GnomeVFSHandle *handle;
- int vfs_flag;
+ int vfs_flag = 0;
if (flags & O_WRONLY)
vfs_flag = vfs_flag | GNOME_VFS_OPEN_WRITE;
Index: servers/exchange/storage/exchange-account.c
===================================================================
--- servers/exchange/storage/exchange-account.c.orig
+++ servers/exchange/storage/exchange-account.c
@@ -1965,7 +1965,7 @@ exchange_account_get_quota_limit (Exchan
int
exchange_account_check_password_expiry (ExchangeAccount *account)
{
- E2kGlobalCatalogEntry *entry;
+ E2kGlobalCatalogEntry *entry = NULL;
@@ -1983,6 +1983,9 @@ exchange_account_check_password_expiry (
E2kGlobalCatalogEntry *entry; /* This is never set before it's used! */
int max_pwd_age_days = -1;
+ /* Bull. The comment above is totally bogus. */
+ entry = NULL;
+
g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), 0);
max_pwd_age_days = find_passwd_exp_period (account, entry);

52
eds-warnings.patch
View File

@ -1,8 +1,8 @@
Index: calendar/backends/contacts/e-cal-backend-contacts.c
================================================================================
--- calendar/backends/contacts/e-cal-backend-contacts.c
===================================================================
--- calendar/backends/contacts/e-cal-backend-contacts.c.orig
+++ calendar/backends/contacts/e-cal-backend-contacts.c
@@ -384,7 +384,7 @@
@@ -386,7 +386,7 @@ contacts_removed_cb (EBookView *book_vie
static struct icaltimetype
cdate_to_icaltime (EContactDate *cdate)
{
@ -11,9 +11,11 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
/*FIXME: this is a really _ugly_ (temporary) hack
* since several functions are still depending on the epoch,
--- calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
Index: calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
===================================================================
--- calendar/backends/groupwise/e-cal-backend-groupwise-utils.h.orig
+++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
@@ -44,6 +44,7 @@
@@ -44,6 +44,7 @@ G_BEGIN_DECLS
* Items management
*/
EGwItem *e_gw_item_new_from_cal_component (const char *container, ECalBackendGroupwise *cbgw, ECalComponent *comp);
@ -21,20 +23,24 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
ECalComponent *e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw);
void e_gw_item_set_changes (EGwItem *item, EGwItem *cached_item);
--- camel/providers/groupwise/camel-groupwise-folder.c
Index: camel/providers/groupwise/camel-groupwise-folder.c
===================================================================
--- camel/providers/groupwise/camel-groupwise-folder.c.orig
+++ camel/providers/groupwise/camel-groupwise-folder.c
@@ -1866,7 +1866,7 @@
CamelGroupwiseStore *gw_store= CAMEL_GROUPWISE_STORE(folder->parent_store);
@@ -2050,7 +2050,7 @@ groupwise_transfer_messages_to (CamelFol
CamelGroupwiseStore *gw_store= CAMEL_GROUPWISE_STORE(source->parent_store);
CamelOfflineStore *offline = (CamelOfflineStore *) destination->parent_store;
CamelGroupwiseStorePrivate *priv = gw_store->priv;
CamelOfflineStore *offline = (CamelOfflineStore *) folder->parent_store;
- EGwConnectionStatus status;
+ EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK;
EGwConnection *cnc;
EGwItem *item;
char *id;
--- camel/providers/imap/camel-imap-store.c
CamelFolderChangeInfo *changes = NULL;
Index: camel/providers/imap/camel-imap-store.c
===================================================================
--- camel/providers/imap/camel-imap-store.c.orig
+++ camel/providers/imap/camel-imap-store.c
@@ -693,6 +693,9 @@
@@ -701,6 +701,9 @@ connect_to_server (CamelService *service
}
#ifdef HAVE_SSL
@ -44,7 +50,7 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
if (!(store->capabilities & IMAP_CAPABILITY_STARTTLS)) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Failed to connect to IMAP server %s in secure mode: %s"),
@@ -701,9 +704,6 @@
@@ -709,9 +712,6 @@ connect_to_server (CamelService *service
goto exception;
}
@ -54,9 +60,11 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
response = camel_imap_command (store, NULL, ex, "STARTTLS");
if (!response) {
camel_object_unref (store->istream);
--- camel/providers/pop3/camel-pop3-store.c
Index: camel/providers/pop3/camel-pop3-store.c
===================================================================
--- camel/providers/pop3/camel-pop3-store.c.orig
+++ camel/providers/pop3/camel-pop3-store.c
@@ -215,6 +215,9 @@
@@ -217,6 +217,9 @@ connect_to_server (CamelService *service
}
#ifdef HAVE_SSL
@ -66,7 +74,7 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
if (!(store->engine->capa & CAMEL_POP3_CAP_STLS)) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Failed to connect to POP server %s in secure mode: %s"),
@@ -222,9 +225,6 @@
@@ -224,9 +227,6 @@ connect_to_server (CamelService *service
goto stls_exception;
}
@ -76,9 +84,11 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
pc = camel_pop3_engine_command_new (store->engine, 0, NULL, NULL, "STLS\r\n");
while (camel_pop3_engine_iterate (store->engine, NULL) > 0)
;
--- libdb/dbm/dbm.c
Index: libdb/dbm/dbm.c
===================================================================
--- libdb/dbm/dbm.c.orig
+++ libdb/dbm/dbm.c
@@ -128,7 +128,8 @@
@@ -128,7 +128,8 @@ __db_dbm_fetch(key)
if (__cur_db == NULL) {
__db_no_open();
@ -88,7 +98,7 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
return (item);
}
return (dbm_fetch(__cur_db, key));
@@ -141,7 +142,8 @@
@@ -141,7 +142,8 @@ __db_dbm_firstkey()
if (__cur_db == NULL) {
__db_no_open();
@ -98,7 +108,7 @@ Index: calendar/backends/contacts/e-cal-backend-contacts.c
return (item);
}
return (dbm_firstkey(__cur_db));
@@ -157,7 +159,8 @@
@@ -157,7 +159,8 @@ __db_dbm_nextkey(key)
if (__cur_db == NULL) {
__db_no_open();

27
evolution-camel-imap-CVE-2007-3257.patch
View File

@ -1,27 +0,0 @@
2007-06-14 Philip Van Hoof <pvanhoof@gnome.org>
* camel-imap-folder.c: Security bugfix. The sequence can be a negative
value while it is being used as the index of an array (#447414)
Index: providers/imap/camel-imap-folder.c
===================================================================
--- camel/providers/imap/camel-imap-folder.c (revision 7815)
+++ camel/providers/imap/camel-imap-folder.c (working copy)
@@ -656,7 +656,7 @@
uid = g_datalist_get_data (&data, "UID");
flags = GPOINTER_TO_UINT (g_datalist_get_data (&data, "FLAGS"));
- if (!uid || !seq || seq > summary_len) {
+ if (!uid || !seq || seq > summary_len || seq < 0) {
g_datalist_clear (&data);
continue;
}
@@ -2790,7 +2790,7 @@
if (*response != '*' || *(response + 1) != ' ')
return NULL;
- seq = strtol (response + 2, &response, 10);
+ seq = strtoul (response + 2, &response, 10);
if (seq == 0)
return NULL;
if (g_ascii_strncasecmp (response, " FETCH (", 8) != 0)

3
evolution-data-server-1.10.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:289a541974fb37ed3e2392b19fd3e83429bfecd6873db52d4598ad4db5d1e905
size 7120388

3
evolution-data-server-1.11.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5a4a921cf6fe3589bb210786bbfb3802a63083f0a336d3f2169a72d8495b8f9
size 7429645

13
evolution-data-server-retval.patch
View File

@ -1,13 +0,0 @@
Index: addressbook/backends/file/e-book-backend-file.c
===================================================================
--- addressbook/backends/file/e-book-backend-file.c.orig
+++ addressbook/backends/file/e-book-backend-file.c
@@ -523,7 +523,7 @@ book_view_thread (gpointer data)
EDataBookView *book_view = data;
FileBackendSearchClosure *closure = get_closure (book_view);
if (!closure)
- return;
+ return NULL;
EBookBackendFile *bf = closure->bf;
const char *query;
DB *db;

19
evolution-data-server.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Jul 20 19:14:59 CEST 2007 - maw@suse.de
- Update to version 1.11.5
- bugzilla.gnome.org bugs:
#307410, #311098, #352284, #364731, #394572, #410823, #412735, #434356,
#448947, #449531, #452996, #454570, #312854, #331099, #344728, #352284,
#437751, #443705, #443958, #447414, #447753, #447749, #448589, #360114,
#409542, #425129, #438577, #438577, #438727, #438928, #440524, #442187,
#438928, #420496, #339160, #414191, #433782, #336574, #431135, #274035,
#361138, #383686, #322105, #418971, #360240, #360619, #405495, #360807,
#400970, #413173, #420933, #426893, #422883, #424837, #422932, #428183,
#425512, #426564, #385078, #425464, #422652, #421445, #421683, #359806,
#73117, #425535, #423382, #415891, #388789, #388788
- Updated translations
- Remove evolution-data-server-retval.patch (redundant),
evolution-camel-imap-CVE-2007-3257.patch (upstreamed)
- Add abuild.patch.
-------------------------------------------------------------------
Fri Jun 22 15:57:28 CEST 2007 - sbrabec@suse.cz

38
evolution-data-server.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package evolution-data-server (Version 1.10.1)
# spec file for package evolution-data-server (Version 1.11.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,12 +12,12 @@
Name: evolution-data-server
BuildRequires: bison db-devel gcc-c++ gnome-common gnome-keyring-devel gtk-doc intltool krb5-devel libglade2-devel libgnome-devel libidl-devel libsoup-devel mDNSResponder-devel mozilla-nss-devel openldap2 openldap2-devel perl-XML-Parser python-devel sgml-skel
License: GNU General Public License (GPL)
License: GPL v2 or later
Group: Development/Libraries/GNOME
Autoreqprov: on
Summary: Evolution Data Server
Version: 1.10.1
Release: 33
Version: 1.11.5
Release: 1
Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.10/%{name}-%{version}.tar.bz2
#Patch3: evolution-data-server-gcc4.patch
Patch5: evolution-data-server-configure.patch
@ -105,12 +105,11 @@ Patch83: datarootdir.diff
Patch84: cal-attachment-filename-handling.patch
Patch85: bnc-167330-default-GW-alarms.patch
Patch86: eds-compiler-warning.patch
Patch87: evolution-data-server-retval.patch
Patch89: bgo-369168-buffer-overrun.patch
Patch90: evolution-camel-imap-CVE-2007-3257.patch
# Change patch below if we move away from /opt/gnome
# It avoids a build dependency on libgnomeui to speed up bootstrap
Patch99: libgnomeui-dep.patch
Patch100: abuild.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libsoup >= 2.2.6 mozilla-nss
@ -237,10 +236,9 @@ documentation.
#%patch82
#%patch83
%patch86
%patch87
#%patch89
%patch90
%patch99 -p1
%patch100 -p1
%build
libtoolize --force --copy
@ -262,7 +260,7 @@ make %{?jobs:-j%jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang evolution-data-server-1.10
%find_lang evolution-data-server-1.12
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%clean
@ -272,10 +270,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%postun -p /sbin/ldconfig
%files -f evolution-data-server-1.10.lang
%files -f evolution-data-server-1.12.lang
%defattr(-,root,root)
%doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL
%{_datadir}/evolution-data-server-1.10
%{_datadir}/evolution-data-server-1.12
%{_datadir}/idl/evolution-data-server-1.2
%{_datadir}/pixmaps/evolution-data-server
%{_libdir}/*.so.*
@ -285,7 +283,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%files devel
%defattr(-, root, root)
%{_includedir}/evolution-data-server-1.10
%{_includedir}/evolution-data-server-1.12
%{_libdir}/*.so
%{_libdir}/*.*a
%{_libdir}/pkgconfig/*.pc
@ -295,6 +293,22 @@ rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%{_datadir}/gtk-doc/html/*
%changelog
* Fri Jul 20 2007 - maw@suse.de
- Update to version 1.11.5
- bugzilla.gnome.org bugs:
[#307410], #311098, #352284, #364731, #394572, #410823, #412735, #434356,
[#448947], #449531, #452996, #454570, #312854, #331099, #344728, #352284,
[#437751], #443705, #443958, #447414, #447753, #447749, #448589, #360114,
[#409542], #425129, #438577, #438577, #438727, #438928, #440524, #442187,
[#438928], #420496, #339160, #414191, #433782, #336574, #431135, #274035,
[#361138], #383686, #322105, #418971, #360240, #360619, #405495, #360807,
[#400970], #413173, #420933, #426893, #422883, #424837, #422932, #428183,
[#425512], #426564, #385078, #425464, #422652, #421445, #421683, #359806,
[#73117], #425535, #423382, #415891, #388789, #388788
- Updated translations
- Remove evolution-data-server-retval.patch (redundant),
evolution-camel-imap-CVE-2007-3257.patch (upstreamed)
- Add abuild.patch.
* Fri Jun 22 2007 - sbrabec@suse.cz
- Fixed IMAP UID format string vulnerability (#284828,
GNOME#447414, CVE-2007-3257).