Attachment 162277 Details for Bug 203910 – Diff patch between current port version and upgrade to v2.3.2_2

[patch] Diff patch between current port version and upgrade to v2.3.2_2

sogo.2.3.2_2.patch (text/plain), 97.87 KB, created by Euan Thoms on 2015-10-21 08:52:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Euan Thoms

Created: 2015-10-21 08:52:01 UTC

Size: 97.87 KB

patch

obsolete

>diff -ruN sogo.orig/Makefile sogo/Makefile
>--- sogo.orig/Makefile	2015-09-29 14:17:27.000000000 +0800
>+++ sogo/Makefile	2015-10-21 16:37:10.916028727 +0800
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		sogo
> PORTVERSION=		2.3.2
>-PORTREVISION=		1
>+PORTREVISION=		2
> CATEGORIES=		www gnustep
> MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
> DISTNAME=		SOGo-${PORTVERSION}
>@@ -13,12 +13,17 @@
> 
> LICENSE=		GPLv2
> 
>-BUILD_DEPENDS=		${GNUSTEP_LOCAL_LIBRARIES}/libDOM.so:${PORTSDIR}/devel/sope
> LIB_DEPENDS=		libmemcached.so:${PORTSDIR}/databases/libmemcached \
>-			libcurl.so:${PORTSDIR}/ftp/curl
>-RUN_DEPENDS:=		${BUILD_DEPENDS}
>+			libcurl.so:${PORTSDIR}/ftp/curl \
>+			libDOM.so:${PORTSDIR}/devel/sope
> 
>-MAKE_JOBS_UNSAFE=yes
>+OPTIONS_DEFINE=		ACTIVESYNC
>+OPTIONS_DEFAULT=
>+OPTIONS_SUB=		yes
>+
>+ACTIVESYNC_DESC=	Enable support for ActiveSync protocol (Experimental)
>+
>+ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
> 
> USERS=			sogod
> GROUPS=			sogod
>@@ -40,6 +45,10 @@
> 	${GREP} -rlF '/etc/sogo' ${WRKSRC} \
> 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
> 
>+.if ${PORT_OPTIONS:MACTIVESYNC}
>+	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
>+.endif
>+
> do-configure:
> 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
> 
>diff -ruN sogo.orig/files/patch-ActiveSync_GNUmakefile sogo/files/patch-ActiveSync_GNUmakefile
>--- sogo.orig/files/patch-ActiveSync_GNUmakefile	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-ActiveSync_GNUmakefile	2015-10-16 18:44:33.285273628 +0800
>@@ -0,0 +1,11 @@
>+--- ActiveSync/GNUmakefile.orig	2015-09-17 02:41:28.000000000 +0800
>++++ ActiveSync/GNUmakefile	2015-10-16 16:55:31.932724851 +0800
>+@@ -34,7 +34,7 @@
>+ ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
>+ ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/
>+ ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/
>+-ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
>++ADDITIONAL_INCLUDE_DIRS += -I/usr/local/include/libwbxml-1.0/
>+ ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2
>+ 
>+ -include GNUmakefile.preamble
>diff -ruN sogo.orig/files/patch-Main_SOGo+DAV.m sogo/files/patch-Main_SOGo+DAV.m
>--- sogo.orig/files/patch-Main_SOGo+DAV.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Main_SOGo+DAV.m	2015-10-12 01:06:44.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Main/SOGo+DAV.m.orig	2015-10-12 00:55:36.784513635 +0800
>++++ Main/SOGo+DAV.m	2015-10-12 01:05:10.524474393 +0800
>+@@ -267,7 +267,7 @@
>+   NSObject <DOMNodeList> *list;
>+   NSObject <DOMNode> *valueNode;
>+   NSArray *elements;
>+-  NSString *property, *match;
>++  NSString *property=nil, *match=nil;
>+ 
>+   list = [searchElement getElementsByTagName: @"prop"];
>+   if ([list length])
>diff -ruN sogo.orig/files/patch-SOPE_GDLContentStore_GCSChannelManager.m sogo/files/patch-SOPE_GDLContentStore_GCSChannelManager.m
>--- sogo.orig/files/patch-SOPE_GDLContentStore_GCSChannelManager.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_GDLContentStore_GCSChannelManager.m	2015-10-08 10:24:49.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SOPE/GDLContentStore/GCSChannelManager.m.orig	2015-10-08 10:23:07.630990957 +0800
>++++ SOPE/GDLContentStore/GCSChannelManager.m	2015-10-08 10:23:39.389981097 +0800
>+@@ -500,7 +500,7 @@
>+   ms = [NSMutableString stringWithCapacity: 256];
>+   [ms appendFormat: @"<0x%p[%@]: ", self, NSStringFromClass ([self class])];
>+ 
>+-  [ms appendFormat: @" #adaptors=%d", [urlToAdaptor count]];
>++  [ms appendFormat: @" #adaptors=%d", (int)[urlToAdaptor count]];
>+ 
>+   [ms appendString: @">"];
>+   return ms;
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_CardElement.m sogo/files/patch-SOPE_NGCards_CardElement.m
>--- sogo.orig/files/patch-SOPE_NGCards_CardElement.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_CardElement.m	2015-10-08 08:49:06.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SOPE/NGCards/CardElement.m.orig	2015-10-08 08:46:14.856388025 +0800
>++++ SOPE/NGCards/CardElement.m	2015-10-08 08:48:15.614375777 +0800
>+@@ -414,7 +414,7 @@
>+   if (group)
>+     [str appendFormat: @"%@ (group: %@)\n", tag, group];
>+   else
>+-    [str appendFormat: @"%@\n", tag, group];
>++    [str appendFormat: @"%@\n", tag];
>+ 
>+   [str appendString: [self versitString]];
>+ 
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_CardGroup.m sogo/files/patch-SOPE_NGCards_CardGroup.m
>--- sogo.orig/files/patch-SOPE_NGCards_CardGroup.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_CardGroup.m	2015-10-08 09:09:48.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SOPE/NGCards/CardGroup.m.orig	2015-10-08 09:03:57.483310954 +0800
>++++ SOPE/NGCards/CardGroup.m	2015-10-08 09:06:25.109300905 +0800
>+@@ -409,7 +409,7 @@
>+   max = [children count];
>+   if (max > 0)
>+     {
>+-      [str appendFormat: @"\n  %d children: {\n", [children count]];
>++      [str appendFormat: @"\n  %d children: {\n", (int)[children count]];
>+       for (count = 0; count < max; count++)
>+         [str appendFormat: @"  %@\n",
>+              [[children objectAtIndex: count] description]];
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m sogo/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m
>--- sogo.orig/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m	2015-10-08 08:27:43.000000000 +0800
>@@ -0,0 +1,24 @@
>+--- SOPE/NGCards/NSCalendarDate+NGCards.m.orig	2015-10-08 08:22:33.220485498 +0800
>++++ SOPE/NGCards/NSCalendarDate+NGCards.m	2015-10-08 08:24:16.099475908 +0800
>+@@ -32,16 +32,16 @@
>+ - (NSString *) iCalFormattedDateTimeString
>+ {
>+   return [NSString stringWithFormat: @"%.4d%.2d%.2dT%.2d%.2d%.2d",
>+-                   [self yearOfCommonEra], [self monthOfYear],
>+-                   [self dayOfMonth], [self hourOfDay],
>+-                   [self minuteOfHour], [self secondOfMinute]];
>++                   (int)[self yearOfCommonEra], (int)[self monthOfYear],
>++                   (int)[self dayOfMonth], (int)[self hourOfDay],
>++                   (int)[self minuteOfHour], (int)[self secondOfMinute]];
>+ }
>+ 
>+ - (NSString *) iCalFormattedDateString
>+ {
>+   return [NSString stringWithFormat: @"%.4d%.2d%.2d",
>+-                   [self yearOfCommonEra], [self monthOfYear],
>+-                   [self dayOfMonth]];
>++                   (int)[self yearOfCommonEra], (int)[self monthOfYear],
>++                   (int)[self dayOfMonth]];
>+ }
>+ 
>+ @end
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m sogo/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m
>--- sogo.orig/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m	2015-10-08 19:32:41.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m.orig	2015-10-08 19:30:05.019721919 +0800
>++++ SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m	2015-10-08 19:31:47.705714765 +0800
>+@@ -348,7 +348,7 @@
>+                   if ([byDayMask occursOnDay: currentWeekDay])
>+                     {
>+                       if ([bySetPos containsObject:
>+-                                      [NSString stringWithFormat: @"%d", currentPos]])
>++                                      [NSString stringWithFormat: @"%d", (int)currentPos]])
>+                         monthDays[monthDay+1] = YES;
>+                       currentPos++;
>+                     }
>+@@ -362,7 +362,7 @@
>+                   if ([byDayMask occursOnDay: currentWeekDay])
>+                     {
>+                       if ([bySetPos containsObject:
>+-                                      [NSString stringWithFormat: @"%d", currentPos]])
>++                                      [NSString stringWithFormat: @"%d", (int)currentPos]])
>+                         monthDays[monthDay] = YES;
>+                       currentPos--;
>+                     }
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_iCalPerson.m sogo/files/patch-SOPE_NGCards_iCalPerson.m
>--- sogo.orig/files/patch-SOPE_NGCards_iCalPerson.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_iCalPerson.m	2015-10-08 09:33:18.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SOPE/NGCards/iCalPerson.m.orig	2015-10-08 09:29:37.635206447 +0800
>++++ SOPE/NGCards/iCalPerson.m	2015-10-08 09:32:16.016193627 +0800
>+@@ -256,7 +256,7 @@
>+ - (BOOL)isEqual:(id)_other {
>+   if(_other == nil)
>+     return NO;
>+-  if([_other class] != self->isa)
>++  if([_other class] != object_getClass(self))
>+     return NO;
>+   if([_other hash] != [self hash])
>+     return NO;
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_iCalRecurranceRule.m sogo/files/patch-SOPE_NGCards_iCalRecurranceRule.m
>--- sogo.orig/files/patch-SOPE_NGCards_iCalRecurranceRule.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_iCalRecurranceRule.m	2015-10-08 09:53:34.000000000 +0800
>@@ -0,0 +1,15 @@
>+--- SOPE/NGCards/iCalRecurrenceRule.m.orig	2015-10-08 09:37:28.117175437 +0800
>++++ SOPE/NGCards/iCalRecurrenceRule.m	2015-10-08 09:50:57.392119166 +0800
>+@@ -309,10 +309,10 @@
>+       else if ([frequency isEqualToString:@"SECONDLY"])
>+ 	freq = iCalRecurrenceFrequenceSecondly;
>+       else
>+-	freq = NSNotFound;
>++	freq = (iCalRecurrenceFrequency) NSNotFound;
>+     }
>+   else
>+-    freq = NSNotFound;
>++    freq = (iCalRecurrenceFrequency) NSNotFound;
>+ 
>+   return freq;
>+ }
>diff -ruN sogo.orig/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m sogo/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m
>--- sogo.orig/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m	2015-10-08 10:19:21.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m.orig	2015-10-08 10:17:21.303008853 +0800
>++++ SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m	2015-10-08 10:18:24.511005649 +0800
>+@@ -1045,7 +1045,7 @@
>+   if (debugOn)
>+     {
>+       NSLog(@"%s: trying to decode data (0x%p,len=%d) ...",
>+-	    __PRETTY_FUNCTION__, _data, [_data length]);
>++	    __PRETTY_FUNCTION__, _data, (int)[_data length]);
>+     }
>+   
>+   if ((len = [_data length]) == 0)
>+@@ -1164,7 +1164,7 @@
>+   if (debugOn)
>+     {
>+       NSLog(@"%s: trying to parse string (0x%p,len=%d) ...",
>+-            __PRETTY_FUNCTION__, _source, [_source length]);
>++            __PRETTY_FUNCTION__, _source, (int)[_source length]);
>+     }
>+   if (!_sysId) _sysId = @"<string>";
>+   [self _parseString: _source];
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m sogo/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m
>--- sogo.orig/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m	2015-10-09 16:18:26.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Appointments/MSExchangeFreeBusy.m.orig	2015-10-09 16:15:25.499576435 +0800
>++++ SoObjects/Appointments/MSExchangeFreeBusy.m	2015-10-09 16:17:52.374562154 +0800
>+@@ -344,7 +344,7 @@
>+   NSMutableString *s;
>+ 
>+   s = [NSMutableString stringWithCapacity: 64];
>+-  [s appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
>++  [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])];
>+   if (freeBusyViewType)
>+     [s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType];
>+   if (mergedFreeBusy)
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m sogo/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m
>--- sogo.orig/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m	2015-10-09 15:26:26.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Appointments/SOGoAppointmentFolder.m.orig	2015-10-09 15:19:44.154803470 +0800
>++++ SoObjects/Appointments/SOGoAppointmentFolder.m	2015-10-09 15:25:42.002786945 +0800
>+@@ -2387,7 +2387,7 @@
>+   request = [context request];
>+   if (!([request isIPhone] || [request isICal4]))
>+     {
>+-      gdRT = [self groupDavResourceType];
>++      gdRT = (NSArray *) [self groupDavResourceType];
>+       gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
>+                   XMLNS_GROUPDAV, nil];
>+       [colType addObject: gdVEventCol];
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m sogo/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m
>--- sogo.orig/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m	2015-10-09 15:06:56.000000000 +0800
>@@ -0,0 +1,64 @@
>+--- SoObjects/Appointments/SOGoAppointmentObject.m.orig	2015-10-09 14:24:40.529034383 +0800
>++++ SoObjects/Appointments/SOGoAppointmentObject.m	2015-10-09 14:55:22.495908672 +0800
>+@@ -45,6 +45,7 @@
>+ #import <NGCards/iCalDateTime.h>
>+ #import <NGCards/iCalTimeZone.h>
>+ #import <NGCards/iCalTimeZonePeriod.h>
>++#import <NGCards/iCalToDo.h>
>+ #import <NGCards/NSString+NGCards.h>
>+ 
>+ #import <SOGo/SOGoConstants.h>
>+@@ -747,11 +748,14 @@
>+     {
>+       e = [events objectAtIndex: i];
>+       if ([e recurrenceId])
>+-        for (j = 0; j < [theAttendees count]; j++)
>+-          if (shouldAdd)
>++        for (j = 0; j < [theAttendees count]; j++) {
>++          if (shouldAdd) {
>+             [e addToAttendees: [theAttendees objectAtIndex: j]];
>+-          else
>++          }
>++          else {
>+             [e removeFromAttendees: [theAttendees objectAtIndex: j]];
>++          }
>++        }
>+     }
>+ }
>+ 
>+@@ -1037,7 +1041,7 @@
>+           if ([delegateEmail length])
>+             otherDelegate = [event findAttendeeWithEmail: delegateEmail];
>+           else
>+-            otherDelegate = NO;
>++            otherDelegate = nil;
>+           
>+           /* we handle the addition/deletion of delegate users */
>+           addDelegate = NO;
>+@@ -1075,7 +1079,7 @@
>+                   if ([delegateEmail length])
>+                     otherDelegate = [event findAttendeeWithEmail: delegateEmail];
>+                   else
>+-                    otherDelegate = NO;
>++                    otherDelegate = nil;
>+                 }
>+             }
>+           if (addDelegate)
>+@@ -1232,7 +1236,7 @@
>+               if ([delegateEmail length])
>+                 otherDelegate = [event findAttendeeWithEmail: delegateEmail];
>+               else
>+-                otherDelegate = NO;
>++                otherDelegate = nil;
>+             }
>+           
>+           [self sendEMailUsingTemplateNamed: @"Deletion"
>+@@ -1990,7 +1994,7 @@
>+       if ([container resourceNameForEventUID: eventUID])
>+         {
>+           return [NSException exceptionWithHTTPStatus: 403
>+-                                               reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", eventUID]];
>++                                               reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", (char *)eventUID]];
>+         }
>+      
>+       //
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m sogo/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m
>--- sogo.orig/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m	2015-10-09 14:23:27.000000000 +0800
>@@ -0,0 +1,25 @@
>+--- SoObjects/Appointments/SOGoCalendarComponent.m.orig	2015-10-09 13:51:16.100168977 +0800
>++++ SoObjects/Appointments/SOGoCalendarComponent.m	2015-10-09 14:20:59.057046917 +0800
>+@@ -140,6 +140,13 @@
>+   return aclManager;
>+ }
>+ 
>++- (NSException *) changeParticipationStatus: (NSString *) newPartStat
>++                               withDelegate: (iCalPerson *) delegate
>++                                      alarm: (iCalAlarm *) alarm;
>++{
>++  return nil;
>++}
>++
>+ - (id) init
>+ {
>+   if ((self = [super init]))
>+@@ -171,7 +178,7 @@
>+ 
>+ - (Class *) parsingClass
>+ {
>+-  return [iCalCalendar class];
>++  return (Class *) [iCalCalendar class];
>+ }
>+ 
>+ - (NSString *) davContentType
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m sogo/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m
>--- sogo.orig/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m	2015-10-09 13:38:55.000000000 +0800
>@@ -0,0 +1,14 @@
>+--- SoObjects/Appointments/iCalAlarm+SOGo.m.orig	2015-10-09 13:32:17.705247981 +0800
>++++ SoObjects/Appointments/iCalAlarm+SOGo.m	2015-10-09 13:36:28.503254126 +0800
>+@@ -102,9 +102,9 @@
>+         }
>+       
>+       if ([reminderReference caseInsensitiveCompare: @"BEFORE"] == NSOrderedSame)
>+-        aValue = [NSString stringWithString: @"-P"];
>++        aValue = (NSString *) @"-P";
>+       else
>+-        aValue = [NSString stringWithString: @"P"];
>++        aValue = (NSString *) @"P";
>+       
>+       if ([reminderUnit caseInsensitiveCompare: @"MINUTES"] == NSOrderedSame ||
>+           [reminderUnit caseInsensitiveCompare: @"HOURS"] == NSOrderedSame)
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h
>--- sogo.orig/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h	2015-10-09 13:44:23.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Appointments/iCalEvent+SOGo.h.orig	2015-10-09 13:42:25.289208627 +0800
>++++ SoObjects/Appointments/iCalEvent+SOGo.h	2015-10-09 13:42:56.647202696 +0800
>+@@ -28,7 +28,7 @@
>+ @interface iCalEvent (SOGoExtensions)
>+ 
>+ - (BOOL) isStillRelevant;
>+-- (unsigned int) occurenceInterval;
>++- (NSTimeInterval) occurenceInterval;
>+ - (void) updateRecurrenceRulesUntilDate: (NSCalendarDate *) previousEndDate;
>+ 
>+ @end
>diff -ruN sogo.orig/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m
>--- sogo.orig/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m	2015-10-09 13:43:54.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Appointments/iCalEvent+SOGo.m.orig	2015-10-09 13:40:11.097214920 +0800
>++++ SoObjects/Appointments/iCalEvent+SOGo.m	2015-10-09 13:41:24.319208579 +0800
>+@@ -259,7 +259,7 @@
>+ 
>+ - (NSTimeInterval) occurenceInterval
>+ {
>+-  return [[self endDate] timeIntervalSinceDate: [self startDate]];
>++  return (NSTimeInterval) [[self endDate] timeIntervalSinceDate: [self startDate]];
>+ }
>+ 
>+ /**
>diff -ruN sogo.orig/files/patch-SoObjects_Contacts_NGVCard+SOGo.m sogo/files/patch-SoObjects_Contacts_NGVCard+SOGo.m
>--- sogo.orig/files/patch-SoObjects_Contacts_NGVCard+SOGo.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Contacts_NGVCard+SOGo.m	2015-10-09 17:32:32.000000000 +0800
>@@ -0,0 +1,26 @@
>+--- SoObjects/Contacts/NGVCard+SOGo.m.orig	2015-10-09 16:20:14.044553480 +0800
>++++ SoObjects/Contacts/NGVCard+SOGo.m	2015-10-09 17:29:21.144266488 +0800
>+@@ -297,7 +297,7 @@
>+ 
>+   if (year && month && day)
>+     [self setBday: [NSString stringWithFormat: @"%.4d-%.2d-%.2d",
>+-                             year, month, day]];
>++                             (int)year, (int)month, (int)day]];
>+   else
>+     [self setBday: @""];
>+ 
>+@@ -614,11 +614,11 @@
>+   birthDay = [[self bday] asCalendarDate];
>+   if (birthDay)
>+     {
>+-      stringValue = [NSString stringWithFormat: @"%.4d", [birthDay yearOfCommonEra]];
>++      stringValue = [NSString stringWithFormat: @"%.4d", (int)[birthDay yearOfCommonEra]];
>+       [self _setValue: @"birthyear" to: stringValue inLDIFRecord: ldifRecord];
>+-      stringValue = [NSString stringWithFormat: @"%.2d", [birthDay monthOfYear]];
>++      stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay monthOfYear]];
>+       [self _setValue: @"birthmonth" to: stringValue inLDIFRecord: ldifRecord];
>+-      stringValue = [NSString stringWithFormat: @"%.2d", [birthDay dayOfMonth]];
>++      stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay dayOfMonth]];
>+       [self _setValue: @"birthday" to: stringValue inLDIFRecord: ldifRecord];
>+     }
>+   [self _setValue: @"description" to: [self note] inLDIFRecord: ldifRecord];
>diff -ruN sogo.orig/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m sogo/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m
>--- sogo.orig/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m	2015-10-12 00:21:48.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Contacts/SOGoContactEntryPhoto.m.orig	2015-10-12 00:20:43.010660719 +0800
>++++ SoObjects/Contacts/SOGoContactEntryPhoto.m	2015-10-12 00:21:07.660013539 +0800
>+@@ -59,7 +59,7 @@
>+ 
>+       [response setHeader: [self davContentType] forKey: @"content-type"];
>+       [response setHeader: [NSString stringWithFormat:@" %d",
>+-                                     [data length]]
>++                                     (int)[data length]]
>+                    forKey: @"content-length"];
>+       [response setContent: data];
>+     }
>diff -ruN sogo.orig/files/patch-SoObjects_Contacts_SOGoContactFolders.m sogo/files/patch-SoObjects_Contacts_SOGoContactFolders.m
>--- sogo.orig/files/patch-SoObjects_Contacts_SOGoContactFolders.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Contacts_SOGoContactFolders.m	2015-10-10 13:21:46.000000000 +0800
>@@ -0,0 +1,15 @@
>+--- SoObjects/Contacts/SOGoContactFolders.m.orig	2015-10-09 17:53:48.355169269 +0800
>++++ SoObjects/Contacts/SOGoContactFolders.m	2015-10-10 12:59:10.048433423 +0800
>+@@ -268,9 +268,9 @@
>+   SOGoUser *currentUser;
>+   id <SOGoSource> source;
>+ 
>+-  if ([sourceID isEqualToString: @"personal"])
>+-    result = [NSException exceptionWithHTTPStatus: 403
>+-                                           reason: (@"folder '%@' cannot be deleted", sourceID)];
>++  if ([sourceID isEqualToString: @"personal"]){
>++    result = [NSException exceptionWithHTTPStatus: 403 reason: [NSString stringWithFormat: (@"folder '%@' cannot be deleted"), sourceID]];
>++  }
>+   else
>+     {
>+       result = nil;
>diff -ruN sogo.orig/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m sogo/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m
>--- sogo.orig/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m	2015-10-10 13:24:26.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Contacts/SOGoContactGCSEntry.m.orig	2015-10-10 13:22:12.488337134 +0800
>++++ SoObjects/Contacts/SOGoContactGCSEntry.m	2015-10-10 13:23:24.526329978 +0800
>+@@ -50,7 +50,7 @@
>+ 
>+ - (Class *) parsingClass
>+ {
>+-  return [NGVCard class];
>++  return (Class *)[NGVCard class];
>+ }
>+ 
>+ /* content */
>diff -ruN sogo.orig/files/patch-SoObjects_Contacts_SOGoContactGCSList.m sogo/files/patch-SoObjects_Contacts_SOGoContactGCSList.m
>--- sogo.orig/files/patch-SoObjects_Contacts_SOGoContactGCSList.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Contacts_SOGoContactGCSList.m	2015-10-10 13:26:07.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Contacts/SOGoContactGCSList.m.orig	2015-10-10 13:25:06.365325835 +0800
>++++ SoObjects/Contacts/SOGoContactGCSList.m	2015-10-10 13:25:31.802319847 +0800
>+@@ -45,7 +45,7 @@
>+ 
>+ - (Class *) parsingClass
>+ {
>+-  return [NGVList class];
>++  return (Class *)[NGVList class];
>+ }
>+ 
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m sogo/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m
>--- sogo.orig/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m	2015-10-15 08:31:13.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- SoObjects/Contacts/SOGoContactSourceFolder.m.orig	2015-10-10 13:26:34.980316221 +0800
>++++ SoObjects/Contacts/SOGoContactSourceFolder.m	2015-10-10 13:53:49.996206010 +0800
>+@@ -94,7 +94,7 @@
>+     {
>+       if (![newDisplayName length])
>+         newDisplayName = newName;
>+-      ASSIGN (displayName, newDisplayName);
>++      ASSIGN (displayName, [newDisplayName mutableCopy]);
>+     }
>+ 
>+   return self;
>+@@ -657,7 +657,7 @@
>+   BOOL otherIsPersonal;
>+ 
>+   otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
>+-                     || ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
>++                     || ([otherFolder isKindOfClass: object_getClass(self)] && [otherFolder isPersonalSource]));
>+ 
>+   if (isPersonalSource)
>+     {
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_NSDictionary+Mail.m sogo/files/patch-SoObjects_Mailer_NSDictionary+Mail.m
>--- sogo.orig/files/patch-SoObjects_Mailer_NSDictionary+Mail.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_NSDictionary+Mail.m	2015-10-14 06:14:13.000000000 +0800
>@@ -0,0 +1,10 @@
>+--- SoObjects/Mailer/NSDictionary+Mail.m.orig	2015-10-14 05:47:30.728396081 +0800
>++++ SoObjects/Mailer/NSDictionary+Mail.m	2015-10-14 06:09:50.541304212 +0800
>+@@ -20,6 +20,7 @@
>+ 
>+ #import <Foundation/NSDictionary.h>
>+ #import <Foundation/NSString.h>
>++#import <NGExtensions/NSString+misc.h>
>+ 
>+ #import "NSDictionary+Mail.h"
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_NSString+Mail.m sogo/files/patch-SoObjects_Mailer_NSString+Mail.m
>--- sogo.orig/files/patch-SoObjects_Mailer_NSString+Mail.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_NSString+Mail.m	2015-10-12 00:08:58.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Mailer/NSString+Mail.m.orig	2015-10-12 00:02:53.664734285 +0800
>++++ SoObjects/Mailer/NSString+Mail.m	2015-10-12 00:04:12.743725205 +0800
>+@@ -533,7 +533,7 @@
>+   messageID = [NSMutableString string];
>+   [messageID appendFormat: @"<%@", [SOGoObject globallyUniqueObjectId]];
>+   pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
>+-  [messageID appendFormat: @"@%u>", [pGUID hash]];
>++  [messageID appendFormat: @"@%u>", (unsigned int)[pGUID hash]];
>+ 
>+   return [messageID lowercaseString];
>+ }
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailAccounts.m sogo/files/patch-SoObjects_Mailer_SOGoMailAccounts.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailAccounts.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailAccounts.m	2015-10-14 05:45:17.000000000 +0800
>@@ -0,0 +1,28 @@
>+--- SoObjects/Mailer/SOGoMailAccounts.m.orig	2015-09-17 02:41:30.000000000 +0800
>++++ SoObjects/Mailer/SOGoMailAccounts.m	2015-10-14 05:44:19.467409671 +0800
>+@@ -41,6 +41,8 @@
>+ 
>+ #define XMLNS_INVERSEDAV @"urn:inverse:params:xml:ns:inverse-dav"
>+ 
>++// TODO: prune redundant methods
>++
>+ @implementation SOGoMailAccounts
>+ 
>+ - (NSArray *) mailAccounts
>+@@ -206,6 +208,9 @@
>+ </D:multistatus>
>+ 
>+ */
>++
>++/* No longer in use, causes objc-method-access warning
>++
>+ - (NSException *) setDavMailsLabels: (NSString *) newLabels
>+ {
>+   id <DOMElement> documentElement, labelNode;
>+@@ -253,5 +258,6 @@
>+ 
>+   return nil;
>+ }
>++*/
>+ 
>+ @end /* SOGoMailAccounts */
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m sogo/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m	2015-10-14 02:21:07.000000000 +0800
>@@ -0,0 +1,14 @@
>+--- SoObjects/Mailer/SOGoMailBaseObject.m.orig	2015-09-17 02:41:30.000000000 +0800
>++++ SoObjects/Mailer/SOGoMailBaseObject.m	2015-10-14 02:16:23.980269983 +0800
>+@@ -32,9 +32,11 @@
>+ #import <NGExtensions/NSString+misc.h>
>+ #import <NGExtensions/NSURL+misc.h>
>+ #import <NGImap4/NGImap4Connection.h>
>++#import <NGImap4/NGImap4Client.h>
>+ 
>+ #import <SOGo/SOGoCache.h>
>+ #import <SOGo/SOGoUser.h>
>++#import <SOGo/WORequest+SOGo.h>
>+ 
>+ #import "SOGoMailAccount.h"
>+ #import "SOGoMailManager.h"
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m sogo/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m	2015-10-15 08:32:50.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Mailer/SOGoMailBodyPart.m.orig	2015-10-11 23:55:35.353760677 +0800
>++++ SoObjects/Mailer/SOGoMailBodyPart.m	2015-10-11 23:58:39.164751566 +0800
>+@@ -396,7 +395,7 @@
>+ 	    mimeType = @"application/octet-stream";
>+ 	  
>+ 	  [response setHeader: mimeType forKey: @"content-type"];
>+-	  [response setHeader: [NSString stringWithFormat:@"%d", [data length]]
>++	  [response setHeader: [NSString stringWithFormat:@"%d", (int)[data length]]
>+ 		    forKey: @"content-length"];
>+   
>+ 	  if (asAttachment)
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailFolder.m sogo/files/patch-SoObjects_Mailer_SOGoMailFolder.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailFolder.m	2015-10-10 17:31:06.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Mailer/SOGoMailFolder.m.orig	2015-10-10 17:21:58.389347307 +0800
>++++ SoObjects/Mailer/SOGoMailFolder.m	2015-10-10 17:25:17.473330458 +0800
>+@@ -1645,7 +1645,7 @@
>+ 
>+   sortOrderings = [NSMutableArray array];
>+ 
>+-  if ([self _sortElementIsAscending: sortElement])
>++  if ([self _sortElementIsAscending: (NGDOMNodeWithChildren <DOMElement> *)sortElement])
>+     sortOrderingOrder = EOCompareAscending;
>+   else
>+     sortOrderingOrder = EOCompareDescending;
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailForward.m sogo/files/patch-SoObjects_Mailer_SOGoMailForward.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailForward.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailForward.m	2015-10-12 00:06:27.000000000 +0800
>@@ -0,0 +1,15 @@
>+--- SoObjects/Mailer/SOGoMailForward.m.orig	2015-10-12 00:00:08.490746039 +0800
>++++ SoObjects/Mailer/SOGoMailForward.m	2015-10-12 00:02:19.963732575 +0800
>+@@ -73,10 +73,10 @@
>+ 
>+ - (NSString *) newLine
>+ {
>+-  NSString *rc = [NSString stringWithString: @" "];
>++  NSString *rc = @" ";
>+   
>+   if (htmlComposition)
>+-    rc = [NSString stringWithString: @"<br/>"];
>++    rc = @"<br/>";
>+ 
>+   return rc;
>+ }
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailLabel.m sogo/files/patch-SoObjects_Mailer_SOGoMailLabel.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailLabel.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailLabel.m	2015-10-15 08:58:35.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/Mailer/SOGoMailLabel.m.orig	2015-10-11 18:07:02.705202858 +0800
>++++ SoObjects/Mailer/SOGoMailLabel.m	2015-10-11 18:09:13.043193497 +0800
>+@@ -74,7 +74,7 @@
>+   int i;
>+ 
>+   allLabels = [NSMutableArray array];
>+-  allKeys = [[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)];
>++  allKeys = [[[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)] mutableCopy];
>+   
>+   for (i = 0; i < [allKeys count]; i++)
>+     {
>diff -ruN sogo.orig/files/patch-SoObjects_Mailer_SOGoMailObject.m sogo/files/patch-SoObjects_Mailer_SOGoMailObject.m
>--- sogo.orig/files/patch-SoObjects_Mailer_SOGoMailObject.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_Mailer_SOGoMailObject.m	2015-10-12 00:51:53.000000000 +0800
>@@ -0,0 +1,46 @@
>+--- SoObjects/Mailer/SOGoMailObject.m.orig	2015-10-12 00:48:44.033544034 +0800
>++++ SoObjects/Mailer/SOGoMailObject.m	2015-10-12 00:51:09.761535745 +0800
>+@@ -765,7 +765,7 @@
>+ 		       [part objectForKey: @"type"],
>+ 		       [part objectForKey: @"subtype"]];
>+ 
>+-  if (!filename)
>++  if (!filename) {
>+       // We might end up here because of MUA that actually strips the
>+       // Content-Disposition (and thus, the filename) when mails containing
>+       // attachments have been forwarded. Thunderbird (2.x) does just that
>+@@ -773,10 +773,14 @@
>+       if ([mimeType hasPrefix: @"application/"] ||
>+ 	  [mimeType hasPrefix: @"audio/"] ||
>+ 	  [mimeType hasPrefix: @"image/"] ||
>+-	  [mimeType hasPrefix: @"video/"])
>++	  [mimeType hasPrefix: @"video/"]) {
>+           filename = [NSString stringWithFormat: @"unknown_%@", path];
>+-      else if ([mimeType isEqualToString: @"message/rfc822"])
>+-        filename = [NSString stringWithFormat: @"email_%@.eml", path];
>++      }
>++      else {
>++        if ([mimeType isEqualToString: @"message/rfc822"])
>++          filename = [NSString stringWithFormat: @"email_%@.eml", path];
>++      }
>++  }
>+   
>+ 
>+   if (filename)
>+@@ -820,13 +824,13 @@
>+ 	{
>+ 	  currentPart = [subparts objectAtIndex: i-1];
>+ 	  if (path)
>+-	    newPath = [NSString stringWithFormat: @"%@.%d", path, i];
>++	    newPath = [NSString stringWithFormat: @"%@.%d", path, (int)i];
>+ 	  else
>+-	    newPath = [NSString stringWithFormat: @"%d", i];
>++	    newPath = [NSString stringWithFormat: @"%d", (int)i];
>+ 	  [self _fetchFileAttachmentKeysInPart: currentPart
>+                                      intoArray: keys
>+                                       withPath: newPath
>+-                                     andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, i]];
>++                                     andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, (int)i]];
>+ 	}
>+     }
>+   else
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_BSONCodec.m sogo/files/patch-SoObjects_SOGo_BSONCodec.m
>--- sogo.orig/files/patch-SoObjects_SOGo_BSONCodec.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_BSONCodec.m	2015-10-08 10:44:16.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- SoObjects/SOGo/BSONCodec.m.orig	2015-10-08 10:27:25.726969480 +0800
>++++ SoObjects/SOGo/BSONCodec.m	2015-10-08 10:44:13.473901101 +0800
>+@@ -310,7 +310,7 @@
>+ 
>+ 		case 'q': return 0x12;
>+ 		default:
>+-			[NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
>++			[NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], (char *)NSStringFromSelector(_cmd), encoding];
>+ 	}
>+ 	return 0;
>+ }
>+@@ -385,7 +385,7 @@
>+ 	}
>+ 
>+ 
>+-	[NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
>++	[NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], (char *)NSStringFromSelector(_cmd), encoding];
>+ 	return nil;
>+ }
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_LDAPSource.m sogo/files/patch-SoObjects_SOGo_LDAPSource.m
>--- sogo.orig/files/patch-SoObjects_SOGo_LDAPSource.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_LDAPSource.m	2015-10-15 09:31:20.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/LDAPSource.m.orig	2015-10-08 14:56:38.777853673 +0800
>++++ SoObjects/SOGo/LDAPSource.m	2015-10-08 15:07:17.767809894 +0800
>+@@ -1703,7 +1703,7 @@
>+                             hostname: hostname
>+                                 port: [NSString stringWithFormat: @"%d", port]
>+                           encryption: encryption
>+-                   bindAsCurrentUser: NO];
>++                   bindAsCurrentUser: [NSString stringWithFormat: @"%d", NO]];
>+               [ab                     setBaseDN: [entry dn]
>+                                         IDField: @"cn"
>+                                         CNField: @"displayName"
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m sogo/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m
>--- sogo.orig/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m	2015-10-08 15:31:33.000000000 +0800
>@@ -0,0 +1,28 @@
>+--- SoObjects/SOGo/NSCalendarDate+SOGo.m.orig	2015-10-08 15:27:02.130727407 +0800
>++++ SoObjects/SOGo/NSCalendarDate+SOGo.m	2015-10-08 15:30:00.529714242 +0800
>+@@ -88,9 +88,9 @@
>+   NSString *str;
>+ 
>+   str = [NSString stringWithFormat: @"%.4d%.2d%.2d",
>+-                  [self yearOfCommonEra],
>+-                  [self monthOfYear],
>+-                  [self dayOfMonth]];
>++                  (int)[self yearOfCommonEra],
>++                  (int)[self monthOfYear],
>++                  (int)[self dayOfMonth]];
>+ 
>+   return str;
>+ }
>+@@ -107,9 +107,9 @@
>+ 
>+   return
>+     [NSString stringWithFormat: @"%@, %.2d %@ %d %.2d:%.2d:%.2d %+.4d",
>+-	      rfc822Days[[self dayOfWeek]], [self dayOfMonth],
>+-	      rfc822Months[[self monthOfYear]], [self yearOfCommonEra],
>+-	      [self hourOfDay], [self minuteOfHour], [self secondOfMinute],
>++	      rfc822Days[[self dayOfWeek]], (int)[self dayOfMonth],
>++	      rfc822Months[[self monthOfYear]], (int)[self yearOfCommonEra],
>++	      (int)[self hourOfDay], (int)[self minuteOfHour], (int)[self secondOfMinute],
>+ 	      timeZoneShift];
>+ }
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_NSData+Crypto.m sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m
>--- sogo.orig/files/patch-SoObjects_SOGo_NSData+Crypto.m	2015-09-23 13:30:12.000000000 +0800
>+++ sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m	2015-10-15 09:48:27.000000000 +0800
>@@ -1,13 +1,11 @@
>---- SoObjects/SOGo/NSData+Crypto.m.orig	2015-09-16 18:41:31 UTC
>-+++ SoObjects/SOGo/NSData+Crypto.m
>-@@ -23,10 +23,6 @@
>+--- SoObjects/SOGo/NSData+Crypto.m.orig	2015-10-15 09:47:42.622448275 +0800
>++++ SoObjects/SOGo/NSData+Crypto.m	2015-10-15 09:47:56.039449839 +0800
>+@@ -23,7 +23,7 @@
>   * Boston, MA 02111-1307, USA.
>   */
>  
> -#ifndef __OpenBSD__
>--#include <crypt.h>
>--#endif
>--
>- #include <sys/types.h>
>- #include <sys/stat.h>
>- #include <fcntl.h>
>++#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
>+ #include <crypt.h>
>+ #endif
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_NSDictionary+DAV.m sogo/files/patch-SoObjects_SOGo_NSDictionary+DAV.m
>--- sogo.orig/files/patch-SoObjects_SOGo_NSDictionary+DAV.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_NSDictionary+DAV.m	2015-10-08 17:26:57.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/NSDictionary+DAV.m.orig	2015-10-08 17:24:48.307243279 +0800
>++++ SoObjects/SOGo/NSDictionary+DAV.m	2015-10-08 17:25:57.354237540 +0800
>+@@ -46,7 +46,7 @@
>+ {
>+   NSString *newTag;
>+ 
>+-  newTag = [NSString stringWithFormat: @"n%d", [namespaces count]];
>++  newTag = [NSString stringWithFormat: @"n%d", (int)[namespaces count]];
>+   [namespaces setObject: newTag forKey: newNS];
>+ 
>+   return newTag;
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_NSString+Utilities.m sogo/files/patch-SoObjects_SOGo_NSString+Utilities.m
>--- sogo.orig/files/patch-SoObjects_SOGo_NSString+Utilities.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_NSString+Utilities.m	2015-10-08 19:37:57.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/NSString+Utilities.m.orig	2015-10-08 19:36:02.806701634 +0800
>++++ SoObjects/SOGo/NSString+Utilities.m	2015-10-08 19:37:02.380693585 +0800
>+@@ -309,7 +309,7 @@
>+           c == 0xD ||
>+           (c >= 0x20 && c <= 0xD7FF) ||
>+           (c >= 0xE000 && c <= 0xFFFD) ||
>+-          (c >= 0x10000 && c <= 0x10FFFF))
>++          (c >= (unichar)0x10000 && c <= (unichar)0x10FFFF))
>+         {
>+           *(start+j) = c;
>+           j++;
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoCache.h sogo/files/patch-SoObjects_SOGo_SOGoCache.h
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoCache.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoCache.h	2015-10-08 11:12:36.000000000 +0800
>@@ -0,0 +1,10 @@
>+--- SoObjects/SOGo/SOGoCache.h.orig	2015-10-08 11:12:00.831781718 +0800
>++++ SoObjects/SOGo/SOGoCache.h	2015-10-08 11:10:21.287794419 +0800
>+@@ -21,6 +21,7 @@
>+ #ifndef SOGOCACHE_H
>+ #define SOGOCACHE_H
>+ 
>++#import <Foundation/Foundation.h>
>+ #import <Foundation/NSObject.h>
>+ 
>+ #include <libmemcached/memcached.h>
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h	2015-10-08 11:36:32.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/SOGoCacheGCSFolder.h.orig	2015-10-08 11:19:28.603751311 +0800
>++++ SoObjects/SOGo/SOGoCacheGCSFolder.h	2015-10-08 11:35:36.006684174 +0800
>+@@ -40,6 +40,8 @@
>+ 
>+ - (NSMutableString *) pathForChild: (NSString *) childName;
>+ 
>++- (void) addUserInAcls: (NSString *) user;
>++
>+ - (NSArray *) toOneRelationshipKeys;
>+ - (NSArray *) toManyRelationshipKeys;
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m	2015-10-08 11:17:52.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/SOGoCacheGCSFolder.m.orig	2015-10-08 11:13:15.184779897 +0800
>++++ SoObjects/SOGo/SOGoCacheGCSFolder.m	2015-10-08 11:17:04.335760701 +0800
>+@@ -364,7 +364,7 @@
>+   if (record)
>+     {
>+       if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
>+-        objectClass = isa;
>++        objectClass = object_getClass(self);
>+       else
>+         objectClass = SOGoCacheGCSObjectK;
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m	2015-10-08 12:09:32.000000000 +0800
>@@ -0,0 +1,68 @@
>+--- SoObjects/SOGo/SOGoCacheGCSObject.m.orig	2015-10-08 11:38:29.151675385 +0800
>++++ SoObjects/SOGo/SOGoCacheGCSObject.m	2015-10-08 12:09:29.854549665 +0800
>+@@ -87,7 +87,7 @@
>+     {
>+       tableUrl = nil;
>+       initialized = NO;
>+-      objectType = -1;
>++      objectType = (SOGoCacheObjectType) -1;
>+       deleted = NO;
>+       version = 0;
>+     }
>+@@ -383,7 +383,7 @@
>+                            @"SELECT * FROM %@ WHERE c_path = %@",
>+                          tableName, pathValue];
>+   if (startVersion > -1)
>+-    [sql appendFormat: @" AND c_version > %d", startVersion];
>++    [sql appendFormat: @" AND c_version > %d", (int)startVersion];
>+ 
>+   /* execution */
>+   records = [self performSQLQuery: sql];
>+@@ -411,18 +411,16 @@
>+ 
>+   tableName = [self tableName];
>+   adaptor = [self tableChannelAdaptor];
>+-  pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
>+-                      forAttribute: textColumn];
>+ 
>+   /* query */
>+   sql = [NSMutableString stringWithFormat:
>+                            @"SELECT * FROM %@ WHERE c_type = %d AND c_deleted <> 1", tableName, objectType];
>+ 
>+   if (startVersion > -1)
>+-    [sql appendFormat: @" AND c_version > %d", startVersion];
>++    [sql appendFormat: @" AND c_version > %d", (int)startVersion];
>+ 
>+   if (deviceId) {
>+-    pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@%", deviceId]
>++    pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
>+                       forAttribute: textColumn];
>+     [sql appendFormat: @" AND c_path like %@", pathValue];
>+   }
>+@@ -546,7 +544,7 @@
>+   
>+   lastModifiedValue = (NSInteger) [lastModified timeIntervalSince1970];
>+   
>+-  if (objectType == -1)
>++  if (objectType == (SOGoCacheObjectType) -1)
>+     [NSException raise: @"SOGoCacheIOException"
>+                 format: @"object type has not been set for object '%@'",
>+                  self];
>+@@ -576,7 +574,7 @@
>+                          @")"),
>+                       tableName,
>+                       pathValue, parentPathValue, objectType,
>+-                      creationDateValue, lastModifiedValue,
>++                      (int)creationDateValue, (int)lastModifiedValue,
>+                       propsValue];
>+       isNew = NO;
>+     }
>+@@ -590,7 +588,7 @@
>+                          @"      c_version = %d, c_content = %@"
>+                          @" WHERE c_path = %@"),
>+                       tableName,
>+-                      lastModifiedValue, deletedValue, version, propsValue,
>++                      (int)lastModifiedValue, (int)deletedValue, (int)version, propsValue,
>+                     pathValue];
>+     }
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheObject.h sogo/files/patch-SoObjects_SOGo_SOGoCacheObject.h
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoCacheObject.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoCacheObject.h	2015-10-08 12:14:50.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/SOGoCacheObject.h.orig	2015-10-08 12:13:56.954532500 +0800
>++++ SoObjects/SOGo/SOGoCacheObject.h	2015-10-08 12:14:14.781522288 +0800
>+@@ -42,8 +42,6 @@
>+ - (NSCalendarDate *) creationDate;
>+ - (NSCalendarDate *) lastModified;
>+ 
>+-- (NSException *) destroy;
>+-
>+ @end
>+ 
>+ #endif /* SOGOCACHEOBJECT_H */
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoContentObject.m sogo/files/patch-SoObjects_SOGo_SOGoContentObject.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoContentObject.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoContentObject.m	2015-10-08 12:44:39.000000000 +0800
>@@ -0,0 +1,39 @@
>+--- SoObjects/SOGo/SOGoContentObject.m.orig	2015-10-08 12:31:02.045459297 +0800
>++++ SoObjects/SOGo/SOGoContentObject.m	2015-10-08 12:43:44.313403665 +0800
>+@@ -94,7 +94,7 @@
>+ {
>+   [self subclassResponsibility: _cmd];
>+   
>+-  return nil;
>++  return (Class *) nil;
>+ }
>+ 
>+ - (void) _setRecord: (NSDictionary *) objectRecord
>+@@ -254,6 +254,9 @@
>+ - (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
>+ {
>+   [self subclassResponsibility: _cmd];
>++
>++  // TODO: Add exception handling code and return it
>++  return (NSException *) nil;
>+ }
>+ 
>+ - (NSException *) delete
>+@@ -345,7 +348,7 @@
>+ 
>+       /* attempt a save */
>+       
>+-      error = [self saveComponent: [[self parsingClass] parseSingleFromSource: [rq contentAsString]]
>++      error = [self saveComponent: [(id)[self parsingClass] parseSingleFromSource: [rq contentAsString]]
>+                       baseVersion: baseVersion];
>+       if (error)
>+ 	response = (WOResponse *) error;
>+@@ -410,7 +413,7 @@
>+   else
>+     length = 0;
>+ 
>+-  return [NSString stringWithFormat: @"%u", length];
>++  return [NSString stringWithFormat: @"%u", (unsigned int)length];
>+ }
>+ 
>+ - (NSException *) davMoveToTargetObject: (id) _target
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoFolder.m sogo/files/patch-SoObjects_SOGo_SOGoFolder.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoFolder.m	2015-10-15 11:25:45.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- SoObjects/SOGo/SOGoFolder.m.orig	2015-10-08 12:48:00.753385180 +0800
>++++ SoObjects/SOGo/SOGoFolder.m	2015-10-08 12:50:18.720380410 +0800
>+@@ -107,7 +107,7 @@
>+ 
>+ - (void) setDisplayName: (NSString *) newDisplayName
>+ {
>+-  ASSIGN (displayName, newDisplayName);
>++  ASSIGN (displayName, [newDisplayName mutableCopy]);
>+ }
>+ 
>+ - (NSString *) displayName
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoGCSFolder.m sogo/files/patch-SoObjects_SOGo_SOGoGCSFolder.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoGCSFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoGCSFolder.m	2015-10-15 11:29:21.000000000 +0800
>@@ -0,0 +1,27 @@
>+--- SoObjects/SOGo/SOGoGCSFolder.m.orig	2015-09-17 02:41:31.000000000 +0800
>++++ SoObjects/SOGo/SOGoGCSFolder.m	2015-10-08 13:05:51.848316611 +0800
>+@@ -376,12 +376,12 @@
>+   if (!displayName)
>+     {
>+       if (activeUserIsOwner)
>+-        displayName = [self _displayNameFromOwner];
>++        displayName = [[self _displayNameFromOwner] mutableCopy];
>+       else
>+         {
>+-          displayName = [self _displayNameFromSubscriber];
>++          displayName = [[self _displayNameFromSubscriber] mutableCopy];
>+           if (!displayName)
>+-            displayName = [self _displayNameFromOwner];
>++            displayName = [[self _displayNameFromOwner] mutableCopy];
>+         }
>+       [displayName retain];
>+     }
>+@@ -829,7 +829,7 @@
>+     {
>+       currentID = [ids objectAtIndex: count];
>+       names = [[currentID componentsSeparatedByString: @"/"] objectEnumerator];
>+-      deleteObject = self;
>++      deleteObject = (SOGoContentObject *)self;
>+       while ((currentName = [names nextObject]))
>+         {
>+           deleteObject = [deleteObject lookupName: currentName
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoGroup.m sogo/files/patch-SoObjects_SOGo_SOGoGroup.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoGroup.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoGroup.m	2015-10-09 11:05:55.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- SoObjects/SOGo/SOGoGroup.m.orig	2015-10-09 07:05:53.364848141 +0800
>++++ SoObjects/SOGo/SOGoGroup.m	2015-10-09 11:05:52.535853113 +0800
>+@@ -135,7 +135,7 @@
>+ {
>+   NSArray *allSources;
>+   NGLdapEntry *entry;
>+-  NSObject <SOGoSource> *source;
>++  NSObject <SOGoSource, SOGoDNSource> *source;
>+   id o;
>+   NSEnumerator *gclasses;
>+   NSString *gclass;
>+@@ -154,7 +154,7 @@
>+ 
>+   for (i = 0; i < [allSources count]; i++)
>+     {
>+-      source = [[SOGoUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
>++      source = (NSObject <SOGoSource, SOGoDNSource> *) [[SOGoUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
>+ 
>+       // Our different sources might not all implements groups support
>+       if ([source respondsToSelector: theSelector])
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoObject.m sogo/files/patch-SoObjects_SOGo_SOGoObject.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoObject.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoObject.m	2015-10-08 12:29:17.000000000 +0800
>@@ -0,0 +1,29 @@
>+--- SoObjects/SOGo/SOGoObject.m.orig	2015-10-08 12:15:33.034523424 +0800
>++++ SoObjects/SOGo/SOGoObject.m	2015-10-08 12:28:36.114468163 +0800
>+@@ -1066,7 +1066,7 @@
>+     [_ms appendFormat:@" name=%@", nameInContainer];
>+   if (container)
>+     [_ms appendFormat:@" container=0x%08X/%@", 
>+-         container, [container valueForKey:@"nameInContainer"]];
>++         (unsigned int)container, [container valueForKey:@"nameInContainer"]];
>+ }
>+ 
>+ - (NSString *) description
>+@@ -1074,7 +1074,7 @@
>+   NSMutableString *ms;
>+ 
>+   ms = [NSMutableString stringWithCapacity:64];
>+-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
>++  [ms appendFormat:@"<0x%08X[%@]:", (unsigned int) self, NSStringFromClass([self class])];
>+   [self appendAttributesToDescription:ms];
>+   [ms appendString:@">"];
>+ 
>+@@ -1084,7 +1084,7 @@
>+ - (NSString *) loggingPrefix
>+ {
>+   return [NSString stringWithFormat:@"<0x%08X[%@]:%@>",
>+-		   self, NSStringFromClass([self class]),
>++		   (unsigned int) self, NSStringFromClass([self class]),
>+ 		   [self nameInContainer]];
>+ }
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoParentFolder.h sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.h
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoParentFolder.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.h	2015-10-08 14:40:40.000000000 +0800
>@@ -0,0 +1,10 @@
>+--- SoObjects/SOGo/SOGoParentFolder.h.orig	2015-10-08 14:18:51.757012268 +0800
>++++ SoObjects/SOGo/SOGoParentFolder.h	2015-10-08 14:23:51.190988564 +0800
>+@@ -45,6 +45,7 @@
>+ 
>+ - (NSException *) appendPersonalSources;
>+ - (void) removeSubFolder: (NSString *) subfolderName;
>++- (NSException *) appendCollectedSources;
>+ 
>+ - (void) setBaseOCSPath: (NSString *) newOCSPath;
>+ 
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SOGoParentFolder.m sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SOGoParentFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.m	2015-10-08 14:40:23.000000000 +0800
>@@ -0,0 +1,41 @@
>+--- SoObjects/SOGo/SOGoParentFolder.m.orig	2015-10-08 13:26:16.671228360 +0800
>++++ SoObjects/SOGo/SOGoParentFolder.m	2015-10-08 14:38:57.340927167 +0800
>+@@ -423,6 +423,38 @@
>+   return error;
>+ }
>+ 
>++- (NSException *) appendCollectedSources
>++{
>++  GCSChannelManager *cm;
>++  EOAdaptorChannel *fc;
>++  NSURL *folderLocation;
>++  NSString *sql, *gcsFolderType;
>++  NSException *error;
>++
>++  cm = [GCSChannelManager defaultChannelManager];
>++  folderLocation = [[GCSFolderManager defaultFolderManager] folderInfoLocation];
>++  fc = [cm acquireOpenChannelForURL: folderLocation];
>++  if ([fc isOpen])
>++  {
>++    gcsFolderType = [[self class] gcsFolderType];
>++
>++    sql = [NSString stringWithFormat: (@"SELECT c_path4 FROM %@"
>++                                       @" WHERE c_path2 = '%@'"
>++                                       @" AND c_folder_type = '%@'"),
>++           [folderLocation gcsTableName], owner, gcsFolderType];
>++  
>++    error = [self fetchSpecialFolders: sql withChannel: fc andFolderType: SOGoCollectedFolder];
>++
>++    [cm releaseChannel: fc];
>++  }
>++  else
>++    error = [NSException exceptionWithName: @"SOGoDBException"
>++                                    reason: @"database connection could not be open"
>++                                  userInfo: nil];
>++ 
>++  return error;
>++}
>++
>+ - (NSException *) initSubFolders
>+ {
>+   NSException *error;
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_SQLSource.m sogo/files/patch-SoObjects_SOGo_SQLSource.m
>--- sogo.orig/files/patch-SoObjects_SOGo_SQLSource.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_SQLSource.m	2015-10-08 15:17:26.000000000 +0800
>@@ -0,0 +1,56 @@
>+--- SoObjects/SOGo/SQLSource.m.orig	2015-10-08 15:11:51.598793649 +0800
>++++ SoObjects/SOGo/SQLSource.m	2015-10-08 15:17:24.502768818 +0800
>+@@ -880,7 +880,7 @@
>+ 
>+   reason = [NSString stringWithFormat: @"method '%@' is not available"
>+                      @" for class '%@'", NSStringFromSelector (_cmd),
>+-                     NSStringFromClass (isa)];
>++                     NSStringFromClass (object_getClass(self))];
>+ 
>+   return [NSException exceptionWithName: @"SQLSourceIOException"
>+                                  reason: reason
>+@@ -893,7 +893,7 @@
>+ 
>+   reason = [NSString stringWithFormat: @"method '%@' is not available"
>+                      @" for class '%@'", NSStringFromSelector (_cmd),
>+-                     NSStringFromClass (isa)];
>++                     NSStringFromClass (object_getClass(self))];
>+ 
>+   return [NSException exceptionWithName: @"SQLSourceIOException"
>+                                  reason: reason
>+@@ -906,7 +906,7 @@
>+ 
>+   reason = [NSString stringWithFormat: @"method '%@' is not available"
>+                      @" for class '%@'", NSStringFromSelector (_cmd),
>+-                     NSStringFromClass (isa)];
>++                     NSStringFromClass (object_getClass(self))];
>+ 
>+   return [NSException exceptionWithName: @"SQLSourceIOException"
>+                                  reason: reason
>+@@ -932,7 +932,7 @@
>+ 
>+   reason = [NSString stringWithFormat: @"method '%@' is not available"
>+                      @" for class '%@'", NSStringFromSelector (_cmd),
>+-                     NSStringFromClass (isa)];
>++                     NSStringFromClass (object_getClass(self))];
>+ 
>+   return [NSException exceptionWithName: @"SQLSourceIOException"
>+                                  reason: reason
>+@@ -947,7 +947,7 @@
>+ 
>+   reason = [NSString stringWithFormat: @"method '%@' is not available"
>+                      @" for class '%@'", NSStringFromSelector (_cmd),
>+-                     NSStringFromClass (isa)];
>++                     NSStringFromClass (object_getClass(self))];
>+ 
>+   return [NSException exceptionWithName: @"SQLSourceIOException"
>+                                  reason: reason
>+@@ -961,7 +961,7 @@
>+ 
>+   reason = [NSString stringWithFormat: @"method '%@' is not available"
>+                      @" for class '%@'", NSStringFromSelector (_cmd),
>+-                     NSStringFromClass (isa)];
>++                     NSStringFromClass (object_getClass(self))];
>+ 
>+   return [NSException exceptionWithName: @"SQLSourceIOException"
>+                                  reason: reason
>diff -ruN sogo.orig/files/patch-SoObjects_SOGo_WORequest+SOGo.m sogo/files/patch-SoObjects_SOGo_WORequest+SOGo.m
>--- sogo.orig/files/patch-SoObjects_SOGo_WORequest+SOGo.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-SoObjects_SOGo_WORequest+SOGo.m	2015-10-09 13:30:10.000000000 +0800
>@@ -0,0 +1,35 @@
>+--- SoObjects/SOGo/WORequest+SOGo.m.orig	2015-10-09 11:56:27.945647076 +0800
>++++ SoObjects/SOGo/WORequest+SOGo.m	2015-10-09 13:30:08.196266262 +0800
>+@@ -180,14 +180,24 @@
>+   cc = [self clientCapabilities];
>+ 
>+   b = (
>+-       [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
>+-       && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound
>+-       || (
>+-           [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
>+-            || [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound
>+-           )
>+-       && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound
>+-       );
>++        (
>++          (
>++            [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
>++            && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound
>++          )
>++          ||
>++          (
>++            [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
>++            &&
>++            (
>++              [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound
>++              ||
>++              [[cc userAgent] rangeOfString: @"Mac_OS_X"].location != NSNotFound
>++            )
>++          )
>++        )
>++        && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound
>++      );
>+ 
>+   return b;
>+ }
>diff -ruN sogo.orig/files/patch-Tests_Unit_SOGoTest.m sogo/files/patch-Tests_Unit_SOGoTest.m
>--- sogo.orig/files/patch-Tests_Unit_SOGoTest.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tests_Unit_SOGoTest.m	2015-10-13 21:29:25.000000000 +0800
>@@ -0,0 +1,15 @@
>+--- Tests/Unit/SOGoTest.m.orig	2015-10-13 21:27:11.658467928 +0800
>++++ Tests/Unit/SOGoTest.m	2015-10-13 21:28:18.545460408 +0800
>+@@ -245,10 +245,10 @@
>+       sc2 = _stringForCharacterAtIndex(i, str2, length2);
>+ 
>+       if ([sc1 isEqualToString: sc2]) 
>+-        finalSTR = [finalSTR stringByAppendingFormat: @"%u |%@|\n", i, sc1];
>++        finalSTR = [finalSTR stringByAppendingFormat: @"%lu |%@|\n", i, sc1];
>+       else
>+         {
>+-          finalSTR = [finalSTR stringByAppendingFormat: @"%u |%@|%@|<--\n", i, sc1, sc2];
>++          finalSTR = [finalSTR stringByAppendingFormat: @"%lu |%@|%@|<--\n", i, sc1, sc2];
>+           differencesFound = YES;
>+         }
>+     }
>diff -ruN sogo.orig/files/patch-Tests_Unit_TestNGMimeAddressHeaderFieldGenerator.m sogo/files/patch-Tests_Unit_TestNGMimeAddressHeaderFieldGenerator.m
>--- sogo.orig/files/patch-Tests_Unit_TestNGMimeAddressHeaderFieldGenerator.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tests_Unit_TestNGMimeAddressHeaderFieldGenerator.m	2015-10-13 23:23:22.000000000 +0800
>@@ -0,0 +1,23 @@
>+--- Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m.orig	2015-10-13 23:08:27.577045766 +0800
>++++ Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m	2015-10-13 23:20:49.017995327 +0800
>+@@ -39,8 +39,8 @@
>+         @"<wolfgang@test.com>",  // email between brackets
>+         @"\"<wolfgang@test.com>\" <wolfgang@test.com>", // doubled
>+         @"\"wolfgang@inverse.ca\" <wolfgang@test.com>", // with and without br.
>+-        @"Àñinéoblabla <wolfgang@test.com>", // accented full name
>+-        @"Àñinéoblabla Bla Blé <wolfgang@test.com>", // accented and multiword
>++        @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= <wolfgang@test.com>", // accented full name
>++        @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= <wolfgang@test.com>", // accented and multiword
>+         @"Wolfgang Sourdeau \"Bla Bla\" <wolfgang@test.com>", // partly quoted
>+         @"Wolfgang Sourdeau <wolfgang@test.com>", // full name + email
>+         nil };
>+@@ -50,8 +50,7 @@
>+         @"\"<wolfgang@test.com>\" <wolfgang@test.com>", // doubled
>+         @"\"wolfgang@inverse.ca\" <wolfgang@test.com>", // with and without br.
>+         @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= <wolfgang@test.com>", // accented full name
>+-        @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= <wolfgang@test.com>", // accented
>+-        // and multiword
>++        @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= <wolfgang@test.com>", // accented and multiword
>+ 
>+         /* NOTE: the following are wrong but tolerated for now */
>+         @"Wolfgang Sourdeau \"Bla Bla\" <wolfgang@test.com>", // partly quoted
>diff -ruN sogo.orig/files/patch-Tests_Unit_TestNGMimeMessageGenerator.m sogo/files/patch-Tests_Unit_TestNGMimeMessageGenerator.m
>--- sogo.orig/files/patch-Tests_Unit_TestNGMimeMessageGenerator.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tests_Unit_TestNGMimeMessageGenerator.m	2015-10-13 23:31:30.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tests/Unit/TestNGMimeMessageGenerator.m.orig	2015-10-13 23:27:44.267969037 +0800
>++++ Tests/Unit/TestNGMimeMessageGenerator.m	2015-10-13 23:29:30.792958515 +0800
>+@@ -117,7 +117,7 @@
>+       NSString *diff = [self stringFromDiffBetween: [NSString stringWithString: resultString]
>+                                                and: [NSString stringWithString: expected]];
>+       NSString *testErrorMsg = [NSString
>+-                             stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %u lengthExpected: %u",
>++                             stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %lu lengthExpected: %lu",
>+                               header,
>+                               resultString,
>+                               expected,
>diff -ruN sogo.orig/files/patch-Tests_Unit_TestVersit.m sogo/files/patch-Tests_Unit_TestVersit.m
>--- sogo.orig/files/patch-Tests_Unit_TestVersit.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tests_Unit_TestVersit.m	2015-10-13 22:11:54.000000000 +0800
>@@ -0,0 +1,41 @@
>+--- Tests/Unit/TestVersit.m.orig	2015-10-13 22:02:35.703319178 +0800
>++++ Tests/Unit/TestVersit.m	2015-10-13 22:10:50.805284923 +0800
>+@@ -34,6 +34,10 @@
>+ 
>+ - (void) test_rendering
>+ {
>++
>++#pragma clang diagnostic push
>++#pragma clang diagnostic ignored "-Wobjc-string-compare"
>++
>+   CardElement *element;
>+   CardVersitRenderer *renderer;
>+   NSString *result;
>+@@ -137,10 +141,17 @@
>+   testEquals(result, @"ELEM:NONEMPTY=coucou\r\n");
>+ 
>+   /** tests about parameters handling could be nice */
>++
>++#pragma clang diagnostic pop
>++
>+ }
>+ 
>+ - (void) test_parsing
>+ {
>++
>++#pragma clang diagnostic push
>++#pragma clang diagnostic ignored "-Wobjc-string-compare"
>++
>+   CardGroup *group;
>+   CardElement *element;
>+   NSString *versit;
>+@@ -201,6 +212,9 @@
>+   element = [group firstChildWithTag: @"element"];
>+   testEquals([element flattenedValueAtIndex: 0 forKey: @""], @"value");
>+   testEquals([element value: 0 ofAttribute: @"param1"], @"paramvalue1, with comma");
>++
>++#pragma clang diagnostic pop
>++
>+ }
>+ 
>+ @end
>diff -ruN sogo.orig/files/patch-Tests_Unit_TestiCalRecurrenceCalculator.m sogo/files/patch-Tests_Unit_TestiCalRecurrenceCalculator.m
>--- sogo.orig/files/patch-Tests_Unit_TestiCalRecurrenceCalculator.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tests_Unit_TestiCalRecurrenceCalculator.m	2015-10-13 23:07:12.000000000 +0800
>@@ -0,0 +1,29 @@
>+--- Tests/Unit/TestiCalRecurrenceCalculator.m.orig	2015-10-13 22:24:36.211231500 +0800
>++++ Tests/Unit/TestiCalRecurrenceCalculator.m	2015-10-13 23:05:47.988057201 +0800
>+@@ -107,7 +107,7 @@
>+ 			    [currentOccurrence descriptionWithCalendarFormat: dateFormat]];
>+ 	  testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
>+ 	}
>+-      error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
>++      error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
>+ 			[currentRule objectAtIndex: 1],
>+ 			[occurrences count],
>+ 			[currentRule count] - 2];
>+@@ -211,7 +211,7 @@
>+ 			    [currentOccurrence descriptionWithCalendarFormat: dateFormat]];
>+ 	  testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
>+ 	}
>+-      error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
>++      error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
>+ 			[currentRule objectAtIndex: 1],
>+ 			[occurrences count],
>+ 			[currentRule count] - 2];
>+@@ -376,7 +376,7 @@
>+ 			    [currentOccurrence descriptionWithCalendarFormat: dateFormat]];
>+ 	  testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
>+ 	}
>+-      error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
>++      error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
>+ 			[currentRule objectAtIndex: 1],
>+ 			[occurrences count],
>+ 			[currentRule count] - 2];
>diff -ruN sogo.orig/files/patch-Tests_Unit_TestiCalTimeZonePeriod.m sogo/files/patch-Tests_Unit_TestiCalTimeZonePeriod.m
>--- sogo.orig/files/patch-Tests_Unit_TestiCalTimeZonePeriod.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tests_Unit_TestiCalTimeZonePeriod.m	2015-10-13 22:24:03.000000000 +0800
>@@ -0,0 +1,13 @@
>+--- Tests/Unit/TestiCalTimeZonePeriod.m.orig	2015-10-13 22:12:21.064282266 +0800
>++++ Tests/Unit/TestiCalTimeZonePeriod.m	2015-10-13 22:23:02.608233950 +0800
>+@@ -80,8 +80,8 @@
>+       testWithMessage ((NSInteger) [testDate timeIntervalSince1970]
>+                        == occurrenceSeconds[count],
>+                        ([NSString stringWithFormat:
>+-                                    @"test %d: seconds do not match:"
>+-                                  @" delta = %d", count, delta]));
>++                                    @"test %ld: seconds do not match:"
>++                                  @" delta = %ld", count, delta]));
>+     }
>+ }
>+ 
>diff -ruN sogo.orig/files/patch-Tools_SOGoEAlarmsNotifier.m sogo/files/patch-Tools_SOGoEAlarmsNotifier.m
>--- sogo.orig/files/patch-Tools_SOGoEAlarmsNotifier.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoEAlarmsNotifier.m	2015-10-13 21:24:54.000000000 +0800
>@@ -0,0 +1,13 @@
>+--- Tools/SOGoEAlarmsNotifier.m.orig	2015-10-13 21:19:28.942510596 +0800
>++++ Tools/SOGoEAlarmsNotifier.m	2015-10-13 21:24:03.748478690 +0800
>+@@ -81,8 +81,8 @@
>+   timestamp = (int) [[NSDate date] timeIntervalSince1970];
>+   pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
>+ 
>+-  messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%u>",
>+-                        pid, timestamp, sequence, random(), [pGUID hash]];
>++  messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%lu>",
>++                        pid, timestamp, sequence, (unsigned int)random(), [pGUID hash]];
>+ 
>+   return [messageID lowercaseString];
>+ }
>diff -ruN sogo.orig/files/patch-Tools_SOGoSockDOperation.m sogo/files/patch-Tools_SOGoSockDOperation.m
>--- sogo.orig/files/patch-Tools_SOGoSockDOperation.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoSockDOperation.m	2015-10-13 21:17:45.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/SOGoSockDOperation.m.orig	2015-10-13 21:11:15.463535399 +0800
>++++ Tools/SOGoSockDOperation.m	2015-10-13 21:14:55.685516664 +0800
>+@@ -145,7 +145,7 @@
>+     [self _appendEntry: [resultEntries objectAtIndex: count]
>+               toResult: result];
>+ 
>+-  [result appendFormat: @"RESULT\ncode: %", resultCode];
>++  [result appendFormat: @"RESULT\ncode: %d", resultCode];
>+   [responseSocket
>+     safeWriteData: [result dataUsingEncoding: NSASCIIStringEncoding]];
>+ }
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolCreateFolder.m sogo/files/patch-Tools_SOGoToolCreateFolder.m
>--- sogo.orig/files/patch-Tools_SOGoToolCreateFolder.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolCreateFolder.m	2015-10-13 09:43:18.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/SOGoToolCreateFolder.m.orig	2015-10-13 09:24:13.755455090 +0800
>++++ Tools/SOGoToolCreateFolder.m	2015-10-13 09:42:15.600381213 +0800
>+@@ -97,7 +97,7 @@
>+   rc = [self createFolder: folder withFM: fm];
>+   if (!rc)
>+     {
>+-      NSLog (@"Create directory failed at path %s", folder);
>++      NSLog (@"Create directory failed at path %@", folder);
>+       return NO;
>+     }
>+ 
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolExpireUserSessions.m sogo/files/patch-Tools_SOGoToolExpireUserSessions.m
>--- sogo.orig/files/patch-Tools_SOGoToolExpireUserSessions.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolExpireUserSessions.m	2015-10-13 23:44:15.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/SOGoToolExpireUserSessions.m.orig	2015-10-13 23:42:49.782904725 +0800
>++++ Tools/SOGoToolExpireUserSessions.m	2015-10-13 23:43:53.893900318 +0800
>+@@ -143,7 +143,7 @@
>+   else
>+   {
>+     if (verbose)
>+-      NSLog(@"No session to remove", sessionsToDelete);
>++      NSLog(@"No session to remove");
>+   }
>+ 
>+   [cm releaseChannel: channel];
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolManageEAS.m sogo/files/patch-Tools_SOGoToolManageEAS.m
>--- sogo.orig/files/patch-Tools_SOGoToolManageEAS.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolManageEAS.m	2015-10-13 19:30:28.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/SOGoToolManageEAS.m.orig	2015-10-13 09:50:19.138347381 +0800
>++++ Tools/SOGoToolManageEAS.m	2015-10-13 19:29:28.210951778 +0800
>+@@ -227,7 +227,7 @@
>+ 
>+               NSMutableString *sql;
>+ 
>+-              sql = [NSMutableString stringWithFormat: @"DELETE FROM %@" @" WHERE c_path like '/%@%'", [oc tableName], deviceId];
>++              sql = [NSMutableString stringWithFormat: @"DELETE FROM %@ WHERE c_path like '/%@'", [oc tableName], deviceId];
>+ 
>+               [oc performBatchSQLQueries: [NSArray arrayWithObject: sql]];
>+               rc = YES;
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolRemoveDoubles.m sogo/files/patch-Tools_SOGoToolRemoveDoubles.m
>--- sogo.orig/files/patch-Tools_SOGoToolRemoveDoubles.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolRemoveDoubles.m	2015-10-15 10:56:29.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/SOGoToolRemoveDoubles.m.orig	2015-09-17 02:41:31.000000000 +0800
>++++ Tools/SOGoToolRemoveDoubles.m	2015-10-15 10:55:54.609166337 +0800
>+@@ -175,7 +175,7 @@
>+ 
>+   now = [NSCalendarDate date];
>+   delSql = [NSString stringWithFormat: @"UPDATE %@"
>+-                     @" SET c_deleted = 1, c_lastmodified = %d,"
>++                     @" SET c_deleted = 1, c_lastmodified = %lu,"
>+                      @" c_content = ''"
>+ 		     @" WHERE c_name = '%@'",
>+ 		     tableName,
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolRenameUser.m sogo/files/patch-Tools_SOGoToolRenameUser.m
>--- sogo.orig/files/patch-Tools_SOGoToolRenameUser.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolRenameUser.m	2015-10-13 09:16:13.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- Tools/SOGoToolRenameUser.m.orig	2015-10-13 09:12:17.759505521 +0800
>++++ Tools/SOGoToolRenameUser.m	2015-10-13 09:14:38.742494299 +0800
>+@@ -148,7 +148,7 @@
>+   if (sqlError)
>+     {
>+       [ac rollbackTransaction];
>+-      NSLog([sqlError reason]);
>++      NSLog(@"%@", [sqlError reason]);
>+     }
>+   else
>+     rc = [ac commitTransaction];
>+@@ -201,7 +201,7 @@
>+   if (sqlError)
>+     {
>+       [ac rollbackTransaction];
>+-      NSLog([sqlError reason]);
>++      NSLog(@"%@", [sqlError reason]);
>+     }
>+   else
>+     rc = [ac commitTransaction];
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolRestore.m sogo/files/patch-Tools_SOGoToolRestore.m
>--- sogo.orig/files/patch-Tools_SOGoToolRestore.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolRestore.m	2015-10-13 23:47:20.000000000 +0800
>@@ -0,0 +1,10 @@
>+--- Tools/SOGoToolRestore.m.orig	2015-10-13 23:45:35.646896281 +0800
>++++ Tools/SOGoToolRestore.m	2015-10-13 23:46:38.256887925 +0800
>+@@ -574,6 +574,7 @@
>+           NSLog (@"  %@ (%@)",
>+                  folderKey, [currentFolder objectForKey: @"displayname"]);
>+         }
>++      rc = YES;
>+     }
>+   else
>+     {
>diff -ruN sogo.orig/files/patch-Tools_SOGoToolUserPreferences.m sogo/files/patch-Tools_SOGoToolUserPreferences.m
>--- sogo.orig/files/patch-Tools_SOGoToolUserPreferences.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_SOGoToolUserPreferences.m	2015-10-13 09:49:34.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/SOGoToolUserPreferences.m.orig	2015-10-13 09:43:41.234378222 +0800
>++++ Tools/SOGoToolUserPreferences.m	2015-10-13 09:48:36.693354816 +0800
>+@@ -115,7 +115,7 @@
>+       [theKey caseInsensitiveCompare: @"Vacation"] == NSOrderedSame)
>+     {
>+       /* credentials file handling */
>+-      NSString *credsFilename, *authname, *authpwd;
>++      NSString *credsFilename=nil, *authname=nil, *authpwd=nil;
>+       SOGoCredentialsFile *cf;
>+ 
>+       credsFilename = [[NSUserDefaults standardUserDefaults] stringForKey: @"p"];
>diff -ruN sogo.orig/files/patch-Tools_sogo-tool.m sogo/files/patch-Tools_sogo-tool.m
>--- sogo.orig/files/patch-Tools_sogo-tool.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-Tools_sogo-tool.m	2015-10-13 08:50:53.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- Tools/sogo-tool.m.orig	2015-10-13 08:49:02.534602894 +0800
>++++ Tools/sogo-tool.m	2015-10-13 08:50:28.020596778 +0800
>+@@ -149,7 +149,7 @@
>+                   command, [currentTool objectAtIndex: 1]];
>+     }
>+ 
>+-  NSLog (helpString);
>++  NSLog (@"%@", helpString);
>+ }
>+ 
>+ - (void) registerTools
>diff -ruN sogo.orig/files/patch-UI_Common_UIxToolbar.m sogo/files/patch-UI_Common_UIxToolbar.m
>--- sogo.orig/files/patch-UI_Common_UIxToolbar.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Common_UIxToolbar.m	2015-10-12 01:31:18.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Common/UIxToolbar.m.orig	2015-10-12 01:26:49.548386836 +0800
>++++ UI/Common/UIxToolbar.m	2015-10-12 01:29:17.906393163 +0800
>+@@ -166,7 +166,7 @@
>+     [self errorWithFormat:
>+             @"not toolbar configuration found on SoObject: %@ (%@)",
>+             [self clientObject], [[self clientObject] soClass]];
>+-    toolbarConfig = [[NSNull null] retain];
>++    toolbarConfig = (NSArray *)[[NSNull null] retain];
>+     return nil;
>+   }
>+ 
>diff -ruN sogo.orig/files/patch-UI_Contacts_UIxContactActions.m sogo/files/patch-UI_Contacts_UIxContactActions.m
>--- sogo.orig/files/patch-UI_Contacts_UIxContactActions.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Contacts_UIxContactActions.m	2015-10-15 11:08:41.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Contacts/UIxContactActions.m.orig	2015-10-12 01:31:58.756363563 +0800
>++++ UI/Contacts/UIxContactActions.m	2015-10-12 02:04:25.062227766 +0800
>+@@ -141,7 +141,7 @@
>+   content = [NSMutableString string];
>+   response = [context response];
>+ 
>+-  [content appendFormat: [[self clientObject] contentAsString]];
>++  [content appendFormat: @"%@", [[self clientObject] contentAsString]];
>+   [response setHeader: @"text/plain; charset=utf-8" 
>+             forKey: @"content-type"];
>+   [response appendContentString: content];
>diff -ruN sogo.orig/files/patch-UI_Contacts_UIxContactFolderActions.m sogo/files/patch-UI_Contacts_UIxContactFolderActions.m
>--- sogo.orig/files/patch-UI_Contacts_UIxContactFolderActions.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Contacts_UIxContactFolderActions.m	2015-10-12 02:38:25.000000000 +0800
>@@ -0,0 +1,14 @@
>+--- UI/Contacts/UIxContactFolderActions.m.orig	2015-10-12 02:35:08.415105259 +0800
>++++ UI/Contacts/UIxContactFolderActions.m	2015-10-12 02:37:28.637102880 +0800
>+@@ -78,9 +78,9 @@
>+                                     inContext: [self context]
>+                                       acquire: NO];
>+       if ([currentChild respondsToSelector: @selector (vCard)])
>+-        [content appendFormat: [[currentChild ldifRecord] ldifRecordAsString]];
>++        [content appendFormat: @"%@", [[currentChild ldifRecord] ldifRecordAsString]];
>+       else if ([currentChild respondsToSelector: @selector (vList)])
>+-        [content appendFormat: [[currentChild vList] ldifString]];
>++        [content appendFormat: @"%@", [[currentChild vList] ldifString]];
>+       [content appendString: @"\n"];
>+     }
>+ 
>diff -ruN sogo.orig/files/patch-UI_Contacts_UIxContactFolderProperties.m sogo/files/patch-UI_Contacts_UIxContactFolderProperties.m
>--- sogo.orig/files/patch-UI_Contacts_UIxContactFolderProperties.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Contacts_UIxContactFolderProperties.m	2015-10-14 06:47:20.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Contacts/UIxContactFolderProperties.m.orig	2015-10-14 06:34:18.044206978 +0800
>++++ UI/Contacts/UIxContactFolderProperties.m	2015-10-14 06:47:09.534149701 +0800
>+@@ -19,6 +19,8 @@
>+  */
>+ 
>+ #import <SOGo/SOGoSystemDefaults.h>
>++#import <Contacts/SOGoContactGCSFolder.h>
>++#import <NGExtensions/NSURL+misc.h>
>+ 
>+ #import "UIxContactFolderProperties.h"
>+ 
>diff -ruN sogo.orig/files/patch-UI_Contacts_UIxContactView.m sogo/files/patch-UI_Contacts_UIxContactView.m
>--- sogo.orig/files/patch-UI_Contacts_UIxContactView.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Contacts_UIxContactView.m	2015-10-15 11:20:50.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- UI/Contacts/UIxContactView.m.orig	2015-09-17 02:41:36.000000000 +0800
>++++ UI/Contacts/UIxContactView.m	2015-10-15 11:19:56.731067858 +0800
>+@@ -350,7 +350,7 @@
>+   data = [NSMutableString string];
>+   [data appendString: postalCode];
>+   if ([postalCode length] > 0 && [country length] > 0)
>+-    [data appendFormat: @", ", country];
>++    [data appendFormat: @", "];
>+   [data appendString: country];
>+ 
>+   return [self _cardStringWithLabel: nil value: data];
>+@@ -562,7 +562,7 @@
>+   data = [NSMutableString string];
>+   [data appendString: postalCode];
>+   if ([postalCode length] > 0 && [country length] > 0)
>+-    [data appendFormat: @" ", country];
>++    [data appendFormat: @", "];
>+   [data appendString: country];
>+ 
>+   return [self _cardStringWithLabel: nil value: data];
>diff -ruN sogo.orig/files/patch-UI_MailPartViewers_UIxMailListActions.h sogo/files/patch-UI_MailPartViewers_UIxMailListActions.h
>--- sogo.orig/files/patch-UI_MailPartViewers_UIxMailListActions.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_MailPartViewers_UIxMailListActions.h	2015-10-12 03:46:51.000000000 +0800
>@@ -0,0 +1,10 @@
>+--- UI/MailerUI/UIxMailListActions.h.orig	2015-10-12 03:45:20.839812321 +0800
>++++ UI/MailerUI/UIxMailListActions.h	2015-10-12 03:45:29.934812501 +0800
>+@@ -43,7 +43,6 @@
>+ }
>+ 
>+ - (NSString *) defaultSortKey;
>+-- (NSString *) imap4SortKey;
>+ - (NSString *) imap4SortOrdering;
>+ - (EOQualifier *) searchQualifier;
>+ - (NSString *) msgLabels;
>diff -ruN sogo.orig/files/patch-UI_MailPartViewers_UIxMailMainFrame.m sogo/files/patch-UI_MailPartViewers_UIxMailMainFrame.m
>--- sogo.orig/files/patch-UI_MailPartViewers_UIxMailMainFrame.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_MailPartViewers_UIxMailMainFrame.m	2015-10-12 03:35:20.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/MailerUI/UIxMailMainFrame.m.orig	2015-10-12 03:31:38.716871414 +0800
>++++ UI/MailerUI/UIxMailMainFrame.m	2015-10-12 03:32:31.963865693 +0800
>+@@ -627,7 +627,7 @@
>+ 
>+ - (NSString *) columnsDisplayCount
>+ {
>+-  return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]];
>++  return [NSString stringWithFormat: @"%d", (int)[[self columnsDisplayOrder] count]];
>+ }
>+ 
>+ - (void) setCurrentColumn: (NSDictionary *) newCurrentColumn
>diff -ruN sogo.orig/files/patch-UI_MailPartViewers_UIxMailPartHTMLViewer.m sogo/files/patch-UI_MailPartViewers_UIxMailPartHTMLViewer.m
>--- sogo.orig/files/patch-UI_MailPartViewers_UIxMailPartHTMLViewer.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_MailPartViewers_UIxMailPartHTMLViewer.m	2015-10-12 03:27:02.000000000 +0800
>@@ -0,0 +1,32 @@
>+--- UI/MailPartViewers/UIxMailPartHTMLViewer.m.orig	2015-10-12 02:42:22.519071553 +0800
>++++ UI/MailPartViewers/UIxMailPartHTMLViewer.m	2015-10-12 03:25:07.395896369 +0800
>+@@ -551,9 +551,9 @@
>+                   else
>+                     skipAttribute = YES;
>+                 }
>+-              else if ([name isEqualToString: @"background"] ||
>++              else if (([name isEqualToString: @"background"] ||
>+                        ([name isEqualToString: @"data"]
>+-                        || [name isEqualToString: @"classid"])
>++                        || [name isEqualToString: @"classid"]))
>+                        && [lowerName isEqualToString: @"object"])
>+                 {
>+                   value = [_attributes valueAtIndex: count];
>+@@ -741,7 +741,7 @@
>+ 
>+ /* SaxLexicalHandler */
>+ - (void) comment: (unichar *) _chars
>+-          length: (NSUInteger) _len
>++          length: (int) _len
>+ {
>+   showWhoWeAre();
>+   if (inStyle)
>+@@ -807,7 +807,7 @@
>+     }
>+   [dump appendFormat: @"--- end ---\n"];
>+ 
>+-  NSLog(dump);
>++  NSLog(@"%@", dump);
>+   [dump release];
>+ }
>+ 
>diff -ruN sogo.orig/files/patch-UI_MailPartViewers_UIxMailPartViewer.m sogo/files/patch-UI_MailPartViewers_UIxMailPartViewer.m
>--- sogo.orig/files/patch-UI_MailPartViewers_UIxMailPartViewer.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_MailPartViewers_UIxMailPartViewer.m	2015-10-15 11:23:58.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/MailPartViewers/UIxMailPartViewer.m.orig	2015-10-12 02:39:07.719086705 +0800
>++++ UI/MailPartViewers/UIxMailPartViewer.m	2015-10-12 02:41:14.554075510 +0800
>+@@ -270,7 +270,7 @@
>+   if ([filename length])
>+     // We replace any slash by a dash since Apache won't allow encoded slashes by default.
>+     // See http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes
>+-    filename = [filename stringByReplacingString: @"/" withString: @"-"];
>++    filename = [[filename stringByReplacingString: @"/" withString: @"-"] mutableCopy];
>+   else
>+     [filename appendFormat: @"%@-%@",
>+ 	      [self labelForKey: @"Untitled"],
>diff -ruN sogo.orig/files/patch-UI_MailerUI_UIxMailFolderActions.m sogo/files/patch-UI_MailerUI_UIxMailFolderActions.m
>--- sogo.orig/files/patch-UI_MailerUI_UIxMailFolderActions.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_MailerUI_UIxMailFolderActions.m	2015-10-12 04:13:02.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/MailerUI/UIxMailFolderActions.m.orig	2015-10-12 04:08:23.478716523 +0800
>++++ UI/MailerUI/UIxMailFolderActions.m	2015-10-12 04:11:58.350711826 +0800
>+@@ -383,7 +383,7 @@
>+ - (WOResponse *) moveMessagesAction
>+ {
>+   SOGoMailFolder *co;
>+-  SOGoUserSettings *us;
>++  SOGoUserSettings *us=nil;
>+   WOResponse *response;
>+   NSArray *uids;
>+   NSString *value, *destinationFolder;
>diff -ruN sogo.orig/files/patch-UI_MainUI_SOGoMicrosoftActiveSyncActions.m sogo/files/patch-UI_MainUI_SOGoMicrosoftActiveSyncActions.m
>--- sogo.orig/files/patch-UI_MainUI_SOGoMicrosoftActiveSyncActions.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_MainUI_SOGoMicrosoftActiveSyncActions.m	2015-10-14 07:24:12.000000000 +0800
>@@ -0,0 +1,21 @@
>+--- UI/MainUI/SOGoMicrosoftActiveSyncActions.m.orig	2015-09-17 02:41:32.000000000 +0800
>++++ UI/MainUI/SOGoMicrosoftActiveSyncActions.m	2015-10-14 07:23:29.165999648 +0800
>+@@ -30,6 +30,9 @@
>+ #import <NGObjWeb/WORequest.h>
>+ #import <NGObjWeb/WOResponse.h>
>+ 
>++#import <Common/WODirectAction+SOGo.h>
>++#import <ActiveSync/SOGoActiveSyncDispatcher.h>
>++
>+ @interface SOGoMicrosoftActiveSyncActions : WODirectAction
>+ @end
>+ 
>+@@ -47,7 +50,7 @@
>+   id dispatcher;
>+   Class clazz;
>+ 
>+-  request = [context request];
>++  request = (WORequest *)[context request];
>+   response = [self responseWithStatus: 200];
>+ 
>+   bundle = [NSBundle bundleForClass: NSClassFromString(@"ActiveSyncProduct")];
>diff -ruN sogo.orig/files/patch-UI_PreferencesUI_UIxPreferences.m sogo/files/patch-UI_PreferencesUI_UIxPreferences.m
>--- sogo.orig/files/patch-UI_PreferencesUI_UIxPreferences.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_PreferencesUI_UIxPreferences.m	2015-10-12 17:29:35.000000000 +0800
>@@ -0,0 +1,21 @@
>+--- UI/PreferencesUI/UIxPreferences.m.orig	2015-10-12 17:26:24.474415189 +0800
>++++ UI/PreferencesUI/UIxPreferences.m	2015-10-12 17:28:42.117407234 +0800
>+@@ -1366,15 +1366,15 @@
>+           if ([account updateFilters])
>+             // If Sieve is not enabled, the SOGoSieveManager will immediatly return a positive answer
>+             // See [SOGoSieveManager updateFiltersForAccount:withUsername:andPassword:]
>+-            results = [self responseWithStatus: 200
>++            results = (id <WOActionResults>)[self responseWithStatus: 200
>+                          andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
>+ 
>+           else
>+-            results = [self responseWithStatus: 502
>++            results = (id <WOActionResults>)[self responseWithStatus: 502
>+                          andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
>+         }
>+       else
>+-        results = [self responseWithStatus: 503
>++        results = (id <WOActionResults>)[self responseWithStatus: 503
>+                      andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
>+     }
>+   else
>diff -ruN sogo.orig/files/patch-UI_SOGoUI_SOGoAptFormatter.m sogo/files/patch-UI_SOGoUI_SOGoAptFormatter.m
>--- sogo.orig/files/patch-UI_SOGoUI_SOGoAptFormatter.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_SOGoUI_SOGoAptFormatter.m	2015-10-12 01:20:28.000000000 +0800
>@@ -0,0 +1,22 @@
>+--- UI/SOGoUI/SOGoAptFormatter.m.orig	2015-10-12 01:17:54.305420146 +0800
>++++ UI/SOGoUI/SOGoAptFormatter.m	2015-10-12 01:19:34.047412685 +0800
>+@@ -155,14 +155,14 @@
>+    */
>+ 
>+   [_buf appendFormat:@"%02i:%02i",
>+-                     [_date hourOfDay],
>+-                     [_date minuteOfHour]];
>++                     (int)[_date hourOfDay],
>++                     (int)[_date minuteOfHour]];
>+   if (_refDate && ![_date isDateOnSameDay:_refDate]) {
>+     [_buf appendFormat:@" (%02i-%02i",
>+-                       [_date monthOfYear],
>+-                       [_date dayOfMonth]];
>++                       (int)[_date monthOfYear],
>++                       (int)[_date dayOfMonth]];
>+     if ([_date yearOfCommonEra] != [_refDate yearOfCommonEra])
>+-      [_buf appendFormat:@"-%04i", [_date yearOfCommonEra]];
>++      [_buf appendFormat:@"-%04i", (int)[_date yearOfCommonEra]];
>+     [_buf appendString:@")"];
>+   }
>+ }
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalDateSelector.m sogo/files/patch-UI_Scheduler_UIxCalDateSelector.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalDateSelector.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalDateSelector.m	2015-10-13 06:40:24.000000000 +0800
>@@ -0,0 +1,20 @@
>+--- UI/Scheduler/UIxCalDateSelector.m.orig	2015-10-13 06:02:26.792289741 +0800
>++++ UI/Scheduler/UIxCalDateSelector.m	2015-10-13 06:39:25.511136695 +0800
>+@@ -117,7 +117,7 @@
>+ 
>+   date = [self startDate];
>+ 
>+-  return [NSString stringWithFormat: @"%.2d", [date monthOfYear]];
>++  return [NSString stringWithFormat: @"%.2d", (int)[date monthOfYear]];
>+ }
>+ 
>+ - (NSString *) headerMonthString
>+@@ -136,7 +136,7 @@
>+ 
>+   date = [self startDate];
>+ 
>+-  return [NSString stringWithFormat: @"%d", [date yearOfCommonEra]];
>++  return [NSString stringWithFormat: @"%d", (int)[date yearOfCommonEra]];
>+ }
>+ 
>+ - (NSString *) localizedDayOfWeekName
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalDayTable.h sogo/files/patch-UI_Scheduler_UIxCalDayTable.h
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalDayTable.h	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalDayTable.h	2015-10-13 06:00:46.000000000 +0800
>@@ -0,0 +1,21 @@
>+--- UI/Scheduler/UIxCalDayTable.h.orig	2015-10-13 06:00:14.240298780 +0800
>++++ UI/Scheduler/UIxCalDayTable.h	2015-10-13 06:00:19.230301851 +0800
>+@@ -39,7 +39,8 @@
>+   NSArray *weekDays;
>+   NSString *currentView, *timeFormat, *currentTableHour;
>+   NSCalendarDate *startDate, *currentTableDay;
>+-  NSMutableArray *daysToDisplay, *calendarsToDisplay,  *currentCalendar, *hoursToDisplay;
>++  NSMutableArray *daysToDisplay, *calendarsToDisplay, *hoursToDisplay;
>++  NSMutableDictionary *currentCalendar;
>+   unsigned int numberOfDays;
>+ }
>+ 
>+@@ -55,7 +56,7 @@
>+ - (NSArray *) calendarsToDisplay;
>+ - (void) setCurrentTableDay: (NSCalendarDate *) aTableDay;
>+ - (NSCalendarDate *) currentTableDay;
>+-- (NSMutableArray *) currentCalendar;
>++- (NSMutableDictionary *) currentCalendar;
>+ 
>+ @end
>+ 
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalDayTable.m sogo/files/patch-UI_Scheduler_UIxCalDayTable.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalDayTable.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalDayTable.m	2015-10-14 07:53:41.000000000 +0800
>@@ -0,0 +1,56 @@
>+--- UI/Scheduler/UIxCalDayTable.m.orig	2015-09-17 02:41:36.000000000 +0800
>++++ UI/Scheduler/UIxCalDayTable.m	2015-10-14 07:44:32.063915367 +0800
>+@@ -37,6 +37,9 @@
>+ #import <SOGo/SOGoUserDefaults.h>
>+ #import <SOGo/WOResourceManager+SOGo.h>
>+ 
>++#import <Appointments/SOGoAppointmentFolder.h>
>++#import <Appointments/SOGoAppointmentFolders.h>
>++
>+ #import "UIxCalDayTable.h"
>+ 
>+ @class SOGoAppointment;
>+@@ -191,7 +194,7 @@
>+     NSMutableDictionary *calendar;
>+     unsigned int count, foldersCount;
>+     NSString *folderName, *fDisplayName;
>+-    BOOL *isActive;
>++    BOOL isActive;
>+     
>+     co = [self clientObject];
>+     folders = [co subFolders];
>+@@ -200,8 +203,8 @@
>+     for (count = 0; count < foldersCount; count++)
>+     {
>+       folder = [folders objectAtIndex: count];
>+-      isActive = [NSNumber numberWithBool: [folder isActive]];
>+-      if ([isActive intValue] != 0) {
>++      isActive = [folder isActive];
>++      if (isActive != NO) {
>+         calendar = [NSMutableDictionary dictionary];
>+         folderName = [folder nameInContainer];
>+         fDisplayName = [folder displayName];
>+@@ -214,7 +217,7 @@
>+         [calendar setObject: fDisplayName forKey: @"displayName"];
>+         [calendar setObject: folderName forKey: @"folder"];
>+         [calendar setObject: [folder calendarColor] forKey: @"color"];
>+-        [calendar setObject: isActive forKey: @"active"];
>++        [calendar setObject: [NSNumber numberWithBool:isActive] forKey: @"active"];
>+         [calendar setObject: [folder ownerInContext: context]
>+                      forKey: @"owner"];
>+         [calendarsToDisplay addObject: calendar];
>+@@ -235,12 +238,12 @@
>+   return currentTableDay;
>+ }
>+ 
>+-- (void) setCurrentCalendar: (NSMutableArray *) aCalendar
>++- (void) setCurrentCalendar: (NSMutableDictionary *) aCalendar
>+ {
>+   ASSIGN(currentCalendar, aCalendar);
>+ }
>+ 
>+-- (NSMutableArray *) currentCalendar
>++- (NSMutableDictionary *) currentCalendar
>+ {
>+   return currentCalendar;
>+ }
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalDayView.m sogo/files/patch-UI_Scheduler_UIxCalDayView.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalDayView.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalDayView.m	2015-10-13 06:56:16.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Scheduler/UIxCalDayView.m.orig	2015-10-13 06:55:05.290075011 +0800
>++++ UI/Scheduler/UIxCalDayView.m	2015-10-13 06:55:41.472070500 +0800
>+@@ -164,7 +164,7 @@
>+     
>+   date = [self selectedDate];
>+   hmString = [NSString stringWithFormat:@"%.2d%.2d",
>+-                       [date hourOfDay], [date minuteOfHour]];
>++                       (int)[date hourOfDay], (int)[date minuteOfHour]];
>+   qp = [[self queryParameters] mutableCopy];
>+   [self setSelectedDateQueryParameter:date inDictionary:qp];
>+   [qp setObject: hmString forKey:@"hm"];
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalListingActions.m sogo/files/patch-UI_Scheduler_UIxCalListingActions.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalListingActions.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalListingActions.m	2015-10-15 11:42:52.000000000 +0800
>@@ -0,0 +1,56 @@
>+--- UI/Scheduler/UIxCalListingActions.m.orig	2015-09-17 02:41:36.000000000 +0800
>++++ UI/Scheduler/UIxCalListingActions.m	2015-10-15 11:41:53.562979042 +0800
>+@@ -316,7 +316,7 @@
>+   NSString *owner, *role, *calendarName, *filters, *iCalString;
>+   NSRange match;
>+   iCalCalendar *calendar;
>+-  iCalObject *master;
>++  iCalEntityObject *master;
>+   SOGoAppointmentFolder *currentFolder;
>+   SOGoAppointmentFolders *clientObject;
>+   SOGoUser *ownerUser;
>+@@ -350,11 +350,11 @@
>+           else if ([criteria isEqualToString:@"entireContent"])
>+             {
>+               // First search : Through the quick table inside the location, category and title columns
>+-              quickInfos = [currentFolder fetchCoreInfosFrom: startDate
>++              quickInfos = [[currentFolder fetchCoreInfosFrom: startDate
>+                                                           to: endDate
>+                                                        title: value
>+                                                    component: component
>+-                                           additionalFilters: criteria];
>++                                           additionalFilters: criteria] mutableCopy];
>+         
>+               // Save the c_name in another array to compare with
>+               if ([quickInfos count] > 0)
>+@@ -366,10 +366,10 @@
>+                 }
>+         
>+               // Second research : Every objects except for those already in the quickInfos array
>+-              allInfos = [currentFolder fetchCoreInfosFrom: startDate
>++              allInfos = [[currentFolder fetchCoreInfosFrom: startDate
>+                                                         to: endDate
>+                                                      title: nil
>+-                                                 component: component];
>++                                                 component: component] mutableCopy];
>+               if (quickInfosFlag == YES)
>+                 {
>+                   for (i = ([allInfos count] - 1); i >= 0 ; i--) {
>+@@ -383,7 +383,7 @@
>+                 {
>+                   iCalString = [[allInfos objectAtIndex:i] objectForKey:@"c_content"];
>+                   calendar = [iCalCalendar parseSingleFromSource: iCalString];
>+-                  master = [calendar firstChildWithTag:component];
>++                  master = (iCalEntityObject *)[calendar firstChildWithTag:component];
>+                   if (master) {
>+                     if ([[master comment] length] > 0)
>+                       {
>+@@ -1089,7 +1089,7 @@
>+   
>+   if ([currentView isEqualToString: @"multicolumndayview"])
>+   {
>+-    calendars = [self _selectedCalendars];
>++    calendars = [[self _selectedCalendars] mutableCopy];
>+     eventsByCalendars = [NSMutableArray arrayWithCapacity:[calendars count]];
>+     for (i = 0; i < [calendars count]; i++) // For each calendar
>+     {
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalMonthView.m sogo/files/patch-UI_Scheduler_UIxCalMonthView.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalMonthView.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalMonthView.m	2015-10-13 06:57:57.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Scheduler/UIxCalMonthView.m.orig	2015-10-13 06:56:35.930068918 +0800
>++++ UI/Scheduler/UIxCalMonthView.m	2015-10-13 06:57:08.272061713 +0800
>+@@ -299,7 +299,7 @@
>+ 
>+   [classes appendFormat: @"day weekOf%d week%dof%d day%d",
>+            numberOfWeeks,
>+-           [weeksToDisplay indexOfObject: currentWeek],
>++           (int)[weeksToDisplay indexOfObject: currentWeek],
>+            numberOfWeeks, dayOfWeek];
>+   if (realDayOfWeek == 0 || realDayOfWeek == 6)
>+     [classes appendString: @" weekEndDay"];
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxCalViewPrint.m sogo/files/patch-UI_Scheduler_UIxCalViewPrint.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxCalViewPrint.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxCalViewPrint.m	2015-10-13 06:54:44.000000000 +0800
>@@ -0,0 +1,19 @@
>+--- UI/Scheduler/UIxCalViewPrint.m.orig	2015-10-13 06:40:49.935130156 +0800
>++++ UI/Scheduler/UIxCalViewPrint.m	2015-10-13 06:45:36.482115783 +0800
>+@@ -49,6 +49,7 @@
>+ - (void) dealloc
>+ {
>+   [item release];
>++  [super dealloc];
>+ }
>+ 
>+ - (void) setItem: (NSString *) newItem
>+@@ -68,7 +69,7 @@
>+ 
>+ - (NSString *) itemPrintLayoutText
>+ {
>+-  return [self labelForKey: [NSString stringWithFormat: item]];
>++  return [self labelForKey: [NSString stringWithFormat: @"%@", item]];
>+ }
>+ 
>+ //
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxComponentEditor.m sogo/files/patch-UI_Scheduler_UIxComponentEditor.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxComponentEditor.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxComponentEditor.m	2015-10-13 08:41:22.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Scheduler/UIxComponentEditor.m.orig	2015-10-13 08:34:49.429762100 +0800
>++++ UI/Scheduler/UIxComponentEditor.m	2015-10-13 08:39:58.917637567 +0800
>+@@ -2472,7 +2472,7 @@
>+   content = [NSMutableString string];
>+   response = [context response];
>+ 
>+-  [content appendFormat: [[self clientObject] contentAsString]];
>++  [content appendFormat: @"%@", [[self clientObject] contentAsString]];
>+   [response setHeader: @"text/plain; charset=utf-8" 
>+             forKey: @"content-type"];
>+   [response appendContentString: content];
>diff -ruN sogo.orig/files/patch-UI_Scheduler_UIxRecurrenceEditor.m sogo/files/patch-UI_Scheduler_UIxRecurrenceEditor.m
>--- sogo.orig/files/patch-UI_Scheduler_UIxRecurrenceEditor.m	1970-01-01 07:30:00.000000000 +0730
>+++ sogo/files/patch-UI_Scheduler_UIxRecurrenceEditor.m	2015-10-13 08:44:38.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- UI/Scheduler/UIxRecurrenceEditor.m.orig	2015-10-13 08:43:32.796623156 +0800
>++++ UI/Scheduler/UIxRecurrenceEditor.m	2015-10-13 08:44:08.401625528 +0800
>+@@ -148,7 +148,7 @@
>+       [shortWeekDaysList retain];
>+     }
>+ 
>+-  id = [NSString stringWithFormat: @"weekDay%i", [shortWeekDaysList indexOfObject: item]];
>++  id = [NSString stringWithFormat: @"weekDay%i", (int)[shortWeekDaysList indexOfObject: item]];
>+ 
>+   return id;
>+ }
>diff -ruN sogo.orig/pkg-plist sogo/pkg-plist
>--- sogo.orig/pkg-plist	2015-09-23 13:30:12.000000000 +0800
>+++ sogo/pkg-plist	2015-10-16 18:44:03.971283911 +0800
>@@ -564,6 +564,10 @@
> GNUstep/Local/Library/OCSTypeModels/appointment.ocs
> GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs
> GNUstep/Local/Library/OCSTypeModels/contact.ocs
>+%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/ActiveSync
>+%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/Resources/Info-gnustep.plist
>+%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/Resources/product.plist
>+%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/stamp.make
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/AdministrationUI
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Arabic.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Basque.lproj/Localizable.strings

Actions: View | Diff

Attachments on bug 203910: 162268 | 162272 | 162277 | 162278