Hello community, here is the log from the commit of package evolution-ews for openSUSE:Factory checked in at 2015-08-11 08:25:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-ews (Old) and /work/SRC/openSUSE:Factory/.evolution-ews.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-ews" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-ews/evolution-ews.changes 2015-07-14 17:46:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-ews.new/evolution-ews.changes 2015-08-11 08:25:15.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 10 06:13:44 UTC 2015 - [email protected] + +- Update to version 3.16.5: + + Avoid %ld in printf formats. + + Use only personal mail folders for change notification + listener. + + Bugs fixed: bgo#751703. + +------------------------------------------------------------------- Old: ---- evolution-ews-3.16.4.tar.xz New: ---- evolution-ews-3.16.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-ews.spec ++++++ --- /var/tmp/diff_new_pack.Fiod0n/_old 2015-08-11 08:25:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Fiod0n/_new 2015-08-11 08:25:16.000000000 +0200 @@ -19,7 +19,7 @@ Name: evolution-ews # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.16 -Version: 3.16.4 +Version: 3.16.5 Release: 0 Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later License: LGPL-2.1 ++++++ evolution-ews-3.16.4.tar.xz -> evolution-ews-3.16.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/NEWS new/evolution-ews-3.16.5/NEWS --- old/evolution-ews-3.16.4/NEWS 2015-07-13 07:48:08.000000000 +0200 +++ new/evolution-ews-3.16.5/NEWS 2015-08-10 07:22:56.000000000 +0200 @@ -1,3 +1,13 @@ +Evolution-EWS 3.16.5 2015-08-10 +------------------------------- + +Bug Fixes: + Bug 751703 - Skip mail folders out of mail hierarchy (Milan Crha) + +Miscellaneous: + Avoid %ld in printf formats (Milan Crha) + Use only personal mail folders for change notification listener (Milan Crha) + Evolution-EWS 3.16.4 2015-07-13 ------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/configure new/evolution-ews-3.16.5/configure --- old/evolution-ews-3.16.4/configure 2015-07-13 07:48:53.000000000 +0200 +++ new/evolution-ews-3.16.5/configure 2015-08-10 07:23:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for evolution-ews 3.16.4. +# Generated by GNU Autoconf 2.69 for evolution-ews 3.16.5. # # Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=evolution-ews>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='evolution-ews' PACKAGE_TARNAME='evolution-ews' -PACKAGE_VERSION='3.16.4' -PACKAGE_STRING='evolution-ews 3.16.4' +PACKAGE_VERSION='3.16.5' +PACKAGE_STRING='evolution-ews 3.16.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=evolution-ews' PACKAGE_URL='' @@ -1515,7 +1515,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures evolution-ews 3.16.4 to adapt to many kinds of systems. +\`configure' configures evolution-ews 3.16.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1585,7 +1585,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution-ews 3.16.4:";; + short | recursive ) echo "Configuration of evolution-ews 3.16.5:";; esac cat <<\_ACEOF @@ -1786,7 +1786,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution-ews configure 3.16.4 +evolution-ews configure 3.16.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2155,7 +2155,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evolution-ews $as_me 3.16.4, which was +It was created by evolution-ews $as_me 3.16.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3018,7 +3018,7 @@ # Define the identity of the package. PACKAGE='evolution-ews' - VERSION='3.16.4' + VERSION='3.16.5' cat >>confdefs.h <<_ACEOF @@ -3257,11 +3257,11 @@ # precisely one minor behind [ews_version], then allow building against *that* # version of EDS and Evo. read x NEWSVER y < NEWS -PREVVER=3.16.$(expr 4 - 1) +PREVVER=3.16.$(expr 5 - 1) if test "$PREVVER" = "$NEWSVER"; then EVOREQVER=$PREVVER else - EVOREQVER=3.16.4 + EVOREQVER=3.16.5 fi @@ -17423,7 +17423,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evolution-ews $as_me 3.16.4, which was +This file was extended by evolution-ews $as_me 3.16.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17489,7 +17489,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -evolution-ews config.status 3.16.4 +evolution-ews config.status 3.16.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/configure.ac new/evolution-ews-3.16.5/configure.ac --- old/evolution-ews-3.16.4/configure.ac 2015-06-11 10:14:24.000000000 +0200 +++ new/evolution-ews-3.16.5/configure.ac 2015-07-13 07:51:42.000000000 +0200 @@ -1,7 +1,7 @@ dnl Evolution-EWS version m4_define([ews_major_version], [3]) m4_define([ews_minor_version], [16]) -m4_define([ews_micro_version], [4]) +m4_define([ews_micro_version], [5]) m4_define([ews_version], [ews_major_version.ews_minor_version.ews_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/src/addressbook/e-book-backend-ews.c new/evolution-ews-3.16.5/src/addressbook/e-book-backend-ews.c --- old/evolution-ews-3.16.4/src/addressbook/e-book-backend-ews.c 2015-05-22 13:47:17.000000000 +0200 +++ new/evolution-ews-3.16.5/src/addressbook/e-book-backend-ews.c 2015-07-27 15:25:52.000000000 +0200 @@ -214,7 +214,7 @@ /* rev_counter is protected by the EBookSqlite lock. We only ever * call ebews_bump_revision() under e_book_sqlite_lock() */ - prop_value = g_strdup_printf ("%ld(%d)", (long) t, ++ebews->priv->rev_counter); + prop_value = g_strdup_printf ("%" G_GINT64_FORMAT "(%d)", (gint64) t, ++ebews->priv->rev_counter); ret = e_book_sqlite_set_key_value (ebews->priv->summary, "revision", prop_value, error); @@ -2626,8 +2626,8 @@ } t2 = g_get_monotonic_time (); - d (g_print("GAL update completed %ssuccessfully in %ld µs. Added: %d, Changed: %d, Unchanged %d, Removed: %d\n", - ret ? "" : "un", t2 - t1, + d (g_print("GAL update completed %ssuccessfully in %" G_GINT64_FORMAT " µs. Added: %d, Changed: %d, Unchanged %d, Removed: %d\n", + ret ? "" : "un", (gint64) (t2 - t1), data.added, data.changed, data.unchanged, g_slist_length(stale_uids))); g_slist_free (stale_uids); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/src/addressbook/mspack/lzxd.c new/evolution-ews-3.16.5/src/addressbook/mspack/lzxd.c --- old/evolution-ews-3.16.4/src/addressbook/mspack/lzxd.c 2014-03-24 10:28:36.000000000 +0100 +++ new/evolution-ews-3.16.5/src/addressbook/mspack/lzxd.c 2015-07-27 15:25:52.000000000 +0200 @@ -13,6 +13,7 @@ /* LZX decompression implementation */ #include "lzx.h" +#include <glib.h> /* Microsoft's LZX document (in cab-sdk.exe) and their implementation * of the com.ms.util.cab Java package do not concur. @@ -804,7 +805,7 @@ /* check that we've used all of the previous frame first */ if (lzx->o_ptr != lzx->o_end) { - D(("%ld avail bytes, new %d frame", lzx->o_end-lzx->o_ptr, frame_size)) + D(("%" G_GINT64_FORMAT " avail bytes, new %d frame", (gint64) (lzx->o_end - lzx->o_ptr), frame_size)) return lzx->error = LZX_ERR_DECRUNCH; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/src/camel/camel-ews-store.c new/evolution-ews-3.16.5/src/camel/camel-ews-store.c --- old/evolution-ews-3.16.4/src/camel/camel-ews-store.c 2015-06-30 22:13:07.000000000 +0200 +++ new/evolution-ews-3.16.5/src/camel/camel-ews-store.c 2015-08-06 17:26:31.000000000 +0200 @@ -1091,7 +1091,14 @@ gchar *id; id = camel_ews_store_summary_get_folder_id_from_name (hnd->ews_store->summary, folder_info->full_name); - hnd->folders = g_slist_prepend (hnd->folders, id); + if (id && !g_str_has_prefix (id, "ForeignMailbox::") && + !g_str_equal (id, EWS_PUBLIC_FOLDER_ROOT_ID) && + !g_str_equal (id, EWS_FOREIGN_FOLDER_ROOT_ID) && + !camel_ews_store_summary_get_foreign (hnd->ews_store->summary, id, NULL) && + !camel_ews_store_summary_get_public (hnd->ews_store->summary, id, NULL)) + hnd->folders = g_slist_prepend (hnd->folders, id); + else + g_free (id); if (folder_info->child != NULL) folder_ids_populate (folder_info->child, hnd); @@ -2049,6 +2056,32 @@ return g_string_free (full_name, FALSE); } +static gboolean +ews_store_has_as_parent_id (CamelEwsStoreSummary *ews_summary, + const gchar *fid, + const gchar *mailroot_fid) +{ + gchar *parent = NULL; + gboolean found = FALSE; + + g_return_val_if_fail (CAMEL_IS_EWS_STORE_SUMMARY (ews_summary), FALSE); + g_return_val_if_fail (fid != NULL, FALSE); + g_return_val_if_fail (mailroot_fid != NULL, FALSE); + + while (found = g_strcmp0 (fid, mailroot_fid) == 0, fid && !found) { + gchar *tmp = parent; + + parent = camel_ews_store_summary_get_parent_folder_id (ews_summary, fid, NULL); + fid = parent; + + g_free (tmp); + } + + g_free (parent); + + return found; +} + static CamelFolderInfo * folder_info_from_store_summary (CamelEwsStore *store, const gchar *top, @@ -2180,12 +2213,20 @@ /* search in regular/subscribed folders */ } else { GSList *folders, *fiter; + gchar *mailroot_fid = NULL, *inbox_fid; ews_summary = store->summary; folders = camel_ews_store_summary_get_folders (ews_summary, top); if (!folders) return NULL; + inbox_fid = camel_ews_store_summary_get_folder_id_from_folder_type (ews_summary, CAMEL_FOLDER_TYPE_INBOX); + if (inbox_fid) { + mailroot_fid = camel_ews_store_summary_get_parent_folder_id (ews_summary, inbox_fid, NULL); + } + g_free (inbox_fid); + inbox_fid = NULL; + folder_infos = g_ptr_array_new (); for (fiter = folders; fiter != NULL; fiter = g_slist_next (fiter)) { @@ -2202,6 +2243,10 @@ fflags = camel_ews_store_summary_get_folder_flags (ews_summary, fid, NULL); if (!(fflags & CAMEL_FOLDER_SUBSCRIBED)) continue; + } else if (!camel_ews_store_summary_get_foreign (ews_summary, fid, NULL) && + mailroot_fid && !ews_store_has_as_parent_id (ews_summary, fid, mailroot_fid)) { + /* Skip mail folders out of the msgfolderroot hierarchy */ + continue; } fi = camel_ews_utils_build_folder_info (store, fid); @@ -2209,6 +2254,7 @@ } g_slist_free_full (folders, g_free); + g_free (mailroot_fid); } root_fi = camel_folder_info_build (folder_infos, top, '/', TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evolution-ews-3.16.4/src/server/e-soap-message.c new/evolution-ews-3.16.5/src/server/e-soap-message.c --- old/evolution-ews-3.16.4/src/server/e-soap-message.c 2015-04-21 21:08:45.000000000 +0200 +++ new/evolution-ews-3.16.5/src/server/e-soap-message.c 2015-07-27 15:25:52.000000000 +0200 @@ -801,7 +801,7 @@ g_return_if_fail (E_IS_SOAP_MESSAGE (msg)); - string = g_strdup_printf ("%ld", i); + string = g_strdup_printf ("%" G_GINT64_FORMAT, (gint64) i); e_soap_message_write_string (msg, string); g_free (string); }
