--- Main/SOGo+DAV.m.orig	2015-09-16 18:41:29 UTC

+++ Main/SOGo+DAV.m

@@ -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])

--- SOPE/GDLContentStore/GCSChannelManager.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/GDLContentStore/GCSChannelManager.m

@@ -500,7 +500,7 @@ static NSTimeInterval ChannelCollectionT

   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;

--- SOPE/NGCards/CardElement.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/NGCards/CardElement.m

@@ -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]];

--- SOPE/NGCards/CardGroup.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/NGCards/CardGroup.m

@@ -409,7 +409,7 @@ static NGCardsSaxHandler *sax = nil;

   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]];

--- SOPE/NGCards/NSCalendarDate+NGCards.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/NGCards/NSCalendarDate+NGCards.m

@@ -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

--- SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m

@@ -348,7 +348,7 @@ static inline unsigned iCalDoWForNSDoW (

                   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 @@ static inline unsigned iCalDoWForNSDoW (

                   if ([byDayMask occursOnDay: currentWeekDay])

                     {

                       if ([bySetPos containsObject:

-                                      [NSString stringWithFormat: @"%d", currentPos]])

+                                      [NSString stringWithFormat: @"%d", (int)currentPos]])

                         monthDays[monthDay] = YES;

                       currentPos--;

                     }

--- SOPE/NGCards/iCalPerson.m.orig	2015-09-16 18:41:36 UTC

+++ SOPE/NGCards/iCalPerson.m

@@ -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;

--- SOPE/NGCards/iCalRecurrenceRule.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/NGCards/iCalRecurrenceRule.m

@@ -309,10 +309,10 @@ NSString *iCalWeekDayString[] = { @"SU",

       else if ([frequency isEqualToString:@"SECONDLY"])

 	freq = iCalRecurrenceFrequenceSecondly;

       else

-	freq = NSNotFound;

+	freq = (iCalRecurrenceFrequency) NSNotFound;

     }

   else

-    freq = NSNotFound;

+    freq = (iCalRecurrenceFrequency) NSNotFound;

   return freq;

 }

--- SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m.orig	2015-09-16 18:41:29 UTC

+++ SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m

@@ -1045,7 +1045,7 @@ static NSCharacterSet *whitespaceCharSet

   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 @@ static NSCharacterSet *whitespaceCharSet

   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];

--- SoObjects/Appointments/MSExchangeFreeBusy.m.orig	2015-09-16 18:41:29 UTC

+++ SoObjects/Appointments/MSExchangeFreeBusy.m

@@ -344,7 +344,7 @@ size_t curl_body_function_freebusy(void 

   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)

--- SoObjects/Appointments/SOGoAppointmentFolder.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -2387,7 +2387,7 @@ firstInstanceCalendarDateRange: (NGCalen

   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];

--- SoObjects/Appointments/SOGoAppointmentObject.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Appointments/SOGoAppointmentObject.m

@@ -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 @@ inRecurrenceExceptionsForEvent: (iCalEve

     {

       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 @@ inRecurrenceExceptionsForEvent: (iCalEve

           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 @@ inRecurrenceExceptionsForEvent: (iCalEve

                   if ([delegateEmail length])

                     otherDelegate = [event findAttendeeWithEmail: delegateEmail];

                   else

-                    otherDelegate = NO;

+                    otherDelegate = nil;

                 }

             }

           if (addDelegate)

@@ -1232,7 +1236,7 @@ inRecurrenceExceptionsForEvent: (iCalEve

               if ([delegateEmail length])

                 otherDelegate = [event findAttendeeWithEmail: delegateEmail];

               else

-                otherDelegate = NO;

+                otherDelegate = nil;

             }

           [self sendEMailUsingTemplateNamed: @"Deletion"

@@ -1990,7 +1994,7 @@ inRecurrenceExceptionsForEvent: (iCalEve

       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]];

         }

       //

--- SoObjects/Appointments/SOGoCalendarComponent.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Appointments/SOGoCalendarComponent.m

@@ -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

--- SoObjects/Appointments/iCalAlarm+SOGo.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Appointments/iCalAlarm+SOGo.m

@@ -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)

--- SoObjects/Appointments/iCalEvent+SOGo.h.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Appointments/iCalEvent+SOGo.h

@@ -28,7 +28,7 @@

 @interface iCalEvent (SOGoExtensions)

 - (BOOL) isStillRelevant;

--- SoObjects/Appointments/iCalEvent+SOGo.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Appointments/iCalEvent+SOGo.m

@@ -259,7 +259,7 @@

 - (NSTimeInterval) occurenceInterval

 {

-  return [[self endDate] timeIntervalSinceDate: [self startDate]];

+  return (NSTimeInterval) [[self endDate] timeIntervalSinceDate: [self startDate]];

 }

 /**

--- SoObjects/Contacts/NGVCard+SOGo.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Contacts/NGVCard+SOGo.m

@@ -297,7 +297,7 @@ convention:

   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 @@ convention:

   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];

--- SoObjects/Contacts/SOGoContactEntryPhoto.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Contacts/SOGoContactEntryPhoto.m

@@ -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];

     }

--- SoObjects/Contacts/SOGoContactFolders.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Contacts/SOGoContactFolders.m

@@ -268,9 +268,9 @@ Class SOGoContactSourceFolderK;

   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;

--- SoObjects/Contacts/SOGoContactGCSEntry.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Contacts/SOGoContactGCSEntry.m

@@ -50,7 +50,7 @@

 - (Class *) parsingClass

 {

-  return [NGVCard class];

+  return (Class *)[NGVCard class];

 }

 /* content */

--- SoObjects/Contacts/SOGoContactGCSList.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Contacts/SOGoContactGCSList.m

@@ -45,7 +45,7 @@

 - (Class *) parsingClass

 {

-  return [NGVList class];

+  return (Class *)[NGVList class];

 }

--- SoObjects/Contacts/SOGoContactSourceFolder.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Contacts/SOGoContactSourceFolder.m

@@ -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)

     {

--- SoObjects/Mailer/NSDictionary+Mail.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Mailer/NSDictionary+Mail.m

@@ -20,6 +20,7 @@

 #import <Foundation/NSDictionary.h>

 #import <Foundation/NSString.h>

+#import <NGExtensions/NSString+misc.h>

 #import "NSDictionary+Mail.h"

--- SoObjects/Mailer/NSString+Mail.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Mailer/NSString+Mail.m

@@ -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];

 }

--- SoObjects/Mailer/SOGoMailAccounts.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Mailer/SOGoMailAccounts.m

@@ -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 */

--- SoObjects/Mailer/SOGoMailBaseObject.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Mailer/SOGoMailBaseObject.m

@@ -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"

--- SoObjects/Mailer/SOGoMailBodyPart.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Mailer/SOGoMailBodyPart.m

@@ -396,7 +396,7 @@ static BOOL debugOn = NO;

 	    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)

--- SoObjects/Mailer/SOGoMailFolder.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Mailer/SOGoMailFolder.m

@@ -1645,7 +1645,7 @@ _compareFetchResultsByMODSEQ (id entry1,

   sortOrderings = [NSMutableArray array];

-  if ([self _sortElementIsAscending: sortElement])

+  if ([self _sortElementIsAscending: (NGDOMNodeWithChildren <DOMElement> *)sortElement])

     sortOrderingOrder = EOCompareAscending;

   else

     sortOrderingOrder = EOCompareDescending;

--- SoObjects/Mailer/SOGoMailForward.m.orig	2015-09-16 18:41:30 UTC

+++ SoObjects/Mailer/SOGoMailForward.m

@@ -73,10 +73,10 @@

 - (NSString *) newLine

 {

-  NSString *rc = [NSString stringWithString: @" "];

+  NSString *rc = @" ";

   if (htmlComposition)

-    rc = [NSString stringWithString: @"<br/>"];

+    rc = @"<br/>";

   return rc;

 }

--- SoObjects/Mailer/SOGoMailLabel.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Mailer/SOGoMailLabel.m

@@ -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++)

     {

--- SoObjects/Mailer/SOGoMailObject.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/Mailer/SOGoMailObject.m

@@ -765,7 +765,7 @@ static BOOL debugSoParts       = NO;

 		       [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 @@ static BOOL debugSoParts       = NO;

       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 @@ static BOOL debugSoParts       = NO;

 	{

 	  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

--- SoObjects/SOGo/BSONCodec.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/BSONCodec.m

@@ -310,7 +310,7 @@ static NSDictionary *BSONTypes()

 		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 @@ static NSDictionary *BSONTypes()

 	}

-	[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;

 }

--- SoObjects/SOGo/LDAPSource.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/LDAPSource.m

@@ -1703,7 +1703,7 @@ _makeLDAPChanges (NGLdapConnection *ldap

                             hostname: hostname

                                 port: [NSString stringWithFormat: @"%d", port]

                           encryption: encryption

-                   bindAsCurrentUser: NO];

+                   bindAsCurrentUser: [NSString stringWithFormat: @"%d", NO]];

               [ab                     setBaseDN: [entry dn]

                                         IDField: @"cn"

                                         CNField: @"displayName"

--- SoObjects/SOGo/NSCalendarDate+SOGo.m.orig	2015-09-16 18:41:36 UTC

+++ SoObjects/SOGo/NSCalendarDate+SOGo.m

@@ -88,9 +88,9 @@ static NSString *rfc822Months[] = {@"", 

   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 @@ static NSString *rfc822Months[] = {@"", 

   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];

 }

--- SoObjects/SOGo/NSData+Crypto.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/NSData+Crypto.m

@@ -23,7 +23,7 @@

  * Boston, MA 02111-1307, USA.

  */

-#ifndef __OpenBSD__

+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)

 #include <crypt.h>

 #endif

--- SoObjects/SOGo/NSDictionary+DAV.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/NSDictionary+DAV.m

@@ -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;

--- SoObjects/SOGo/NSString+Utilities.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/NSString+Utilities.m

@@ -309,7 +309,7 @@ static int cssEscapingCount;

           c == 0xD ||

           (c >= 0x20 && c <= 0xD7FF) ||

           (c >= 0xE000 && c <= 0xFFFD) ||

-          (c >= 0x10000 && c <= 0x10FFFF))

+          (c >= (unichar)0x10000 && c <= (unichar)0x10FFFF))

         {

           *(start+j) = c;

           j++;

--- SoObjects/SOGo/SOGoCache.h.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoCache.h

@@ -21,6 +21,7 @@

 #ifndef SOGOCACHE_H

 #define SOGOCACHE_H

+#import <Foundation/Foundation.h>

 #import <Foundation/NSObject.h>

 #include <libmemcached/memcached.h>

--- SoObjects/SOGo/SOGoCacheGCSFolder.h.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoCacheGCSFolder.h

@@ -40,6 +40,8 @@

 - (NSMutableString *) pathForChild: (NSString *) childName;

+- (void) addUserInAcls: (NSString *) user;

+

 - (NSArray *) toOneRelationshipKeys;

 - (NSArray *) toManyRelationshipKeys;

--- SoObjects/SOGo/SOGoCacheGCSFolder.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoCacheGCSFolder.m

@@ -364,7 +364,7 @@ Class SOGoCacheGCSObjectK = Nil;

   if (record)

     {

       if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)

-        objectClass = isa;

+        objectClass = object_getClass(self);

       else

         objectClass = SOGoCacheGCSObjectK;

--- SoObjects/SOGo/SOGoCacheGCSObject.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoCacheGCSObject.m

@@ -87,7 +87,7 @@ static EOAttribute *textColumn = nil;

     {

       tableUrl = nil;

       initialized = NO;

-      objectType = -1;

+      objectType = (SOGoCacheObjectType) -1;

       deleted = NO;

       version = 0;

     }

@@ -383,7 +383,7 @@ static EOAttribute *textColumn = nil;

                            @"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 @@ static EOAttribute *textColumn = nil;

   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 @@ static EOAttribute *textColumn = nil;

   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 @@ static EOAttribute *textColumn = nil;

                          @")"),

                       tableName,

                       pathValue, parentPathValue, objectType,

-                      creationDateValue, lastModifiedValue,

+                      (int)creationDateValue, (int)lastModifiedValue,

                       propsValue];

       isNew = NO;

     }

@@ -590,7 +588,7 @@ static EOAttribute *textColumn = nil;

                          @"      c_version = %d, c_content = %@"

                          @" WHERE c_path = %@"),

                       tableName,

-                      lastModifiedValue, deletedValue, version, propsValue,

+                      (int)lastModifiedValue, (int)deletedValue, (int)version, propsValue,

                     pathValue];

     }

--- SoObjects/SOGo/SOGoCacheObject.h.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoCacheObject.h

@@ -42,8 +42,6 @@

 - (NSCalendarDate *) creationDate;

 - (NSCalendarDate *) lastModified;

--- SoObjects/SOGo/SOGoContentObject.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoContentObject.m

@@ -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

--- SoObjects/SOGo/SOGoFolder.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoFolder.m

@@ -107,7 +107,7 @@

 - (void) setDisplayName: (NSString *) newDisplayName

 {

-  ASSIGN (displayName, newDisplayName);

+  ASSIGN (displayName, [newDisplayName mutableCopy]);

 }

 - (NSString *) displayName

--- SoObjects/SOGo/SOGoGCSFolder.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoGCSFolder.m

@@ -376,12 +376,12 @@ static NSArray *childRecordFields = nil;

   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 @@ static NSArray *childRecordFields = nil;

     {

       currentID = [ids objectAtIndex: count];

       names = [[currentID componentsSeparatedByString: @"/"] objectEnumerator];

-      deleteObject = self;

+      deleteObject = (SOGoContentObject *)self;

       while ((currentName = [names nextObject]))

         {

           deleteObject = [deleteObject lookupName: currentName

--- SoObjects/SOGo/SOGoGroup.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoGroup.m

@@ -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])

--- SoObjects/SOGo/SOGoObject.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoObject.m

@@ -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]];

 }

--- SoObjects/SOGo/SOGoParentFolder.h.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoParentFolder.h

@@ -45,6 +45,7 @@

 - (NSException *) appendPersonalSources;

 - (void) removeSubFolder: (NSString *) subfolderName;

+- (NSException *) appendCollectedSources;

 - (void) setBaseOCSPath: (NSString *) newOCSPath;

--- SoObjects/SOGo/SOGoParentFolder.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SOGoParentFolder.m

@@ -423,6 +423,38 @@ static SoSecurityManager *sm = nil;

   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;

--- SoObjects/SOGo/SQLSource.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/SQLSource.m

@@ -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

--- SoObjects/SOGo/WORequest+SOGo.m.orig	2015-09-16 18:41:31 UTC

+++ SoObjects/SOGo/WORequest+SOGo.m

@@ -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;

 }

--- Tests/Unit/SOGoTest.m.orig	2015-09-16 18:41:31 UTC

+++ Tests/Unit/SOGoTest.m

@@ -245,10 +245,10 @@ NSString *_stringForCharacterAtIndex(NSU

       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;

         }

     }

--- Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m.orig	2015-09-16 18:41:31 UTC

+++ Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m

@@ -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

--- Tests/Unit/TestNGMimeMessageGenerator.m.orig	2015-09-16 18:41:31 UTC

+++ Tests/Unit/TestNGMimeMessageGenerator.m

@@ -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,

--- Tests/Unit/TestVersit.m.orig	2015-09-16 18:41:31 UTC

+++ Tests/Unit/TestVersit.m

@@ -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

--- Tests/Unit/TestiCalRecurrenceCalculator.m.orig	2015-09-16 18:41:31 UTC

+++ Tests/Unit/TestiCalRecurrenceCalculator.m

@@ -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];

--- Tests/Unit/TestiCalTimeZonePeriod.m.orig	2015-09-16 18:41:31 UTC

+++ Tests/Unit/TestiCalTimeZonePeriod.m

@@ -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]));

     }

 }

--- Tools/SOGoEAlarmsNotifier.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoEAlarmsNotifier.m

@@ -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];

 }

--- Tools/SOGoSockDOperation.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoSockDOperation.m

@@ -145,7 +145,7 @@ Class SOGoContactSourceFolderKlass = Nil

     [self _appendEntry: [resultEntries objectAtIndex: count]

               toResult: result];

-  [result appendFormat: @"RESULT\ncode: %", resultCode];

+  [result appendFormat: @"RESULT\ncode: %d", resultCode];

   [responseSocket

     safeWriteData: [result dataUsingEncoding: NSASCIIStringEncoding]];

 }

--- Tools/SOGoToolCreateFolder.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolCreateFolder.m

@@ -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;

     }

--- Tools/SOGoToolExpireUserSessions.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolExpireUserSessions.m

@@ -143,7 +143,7 @@

   else

   {

     if (verbose)

-      NSLog(@"No session to remove", sessionsToDelete);

+      NSLog(@"No session to remove");

   }

   [cm releaseChannel: channel];

--- Tools/SOGoToolManageEAS.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolManageEAS.m

@@ -227,7 +227,7 @@ typedef enum

               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;

--- Tools/SOGoToolRemoveDoubles.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolRemoveDoubles.m

@@ -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,

--- Tools/SOGoToolRenameUser.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolRenameUser.m

@@ -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];

--- Tools/SOGoToolRestore.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolRestore.m

@@ -574,6 +574,7 @@

           NSLog (@"  %@ (%@)",

                  folderKey, [currentFolder objectForKey: @"displayname"]);

         }

+      rc = YES;

     }

   else

     {

--- Tools/SOGoToolUserPreferences.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/SOGoToolUserPreferences.m

@@ -115,7 +115,7 @@ typedef enum

       [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"];

--- Tools/sogo-tool.m.orig	2015-09-16 18:41:31 UTC

+++ Tools/sogo-tool.m

@@ -149,7 +149,7 @@

                   command, [currentTool objectAtIndex: 1]];

     }

-  NSLog (helpString);

+  NSLog (@"%@", helpString);

 }

 - (void) registerTools

--- UI/Common/UIxToolbar.m.orig	2015-09-16 18:41:36 UTC

+++ UI/Common/UIxToolbar.m

@@ -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;

   }

--- UI/Contacts/UIxContactActions.m.orig	2015-09-16 18:41:31 UTC

+++ UI/Contacts/UIxContactActions.m

@@ -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];

--- UI/Contacts/UIxContactFolderActions.m.orig	2015-09-16 18:41:36 UTC

+++ UI/Contacts/UIxContactFolderActions.m

@@ -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"];

     }

--- UI/Contacts/UIxContactFolderProperties.m.orig	2015-09-16 18:41:36 UTC

+++ UI/Contacts/UIxContactFolderProperties.m

@@ -19,6 +19,8 @@

  */

 #import <SOGo/SOGoSystemDefaults.h>

+#import <Contacts/SOGoContactGCSFolder.h>

+#import <NGExtensions/NSURL+misc.h>

 #import "UIxContactFolderProperties.h"

--- UI/Contacts/UIxContactView.m.orig	2015-09-16 18:41:36 UTC

+++ UI/Contacts/UIxContactView.m

@@ -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];

--- UI/MailPartViewers/UIxMailPartHTMLViewer.m.orig	2015-09-16 18:41:31 UTC

+++ UI/MailPartViewers/UIxMailPartHTMLViewer.m

@@ -551,9 +551,9 @@ static NSData* _sanitizeContent(NSData *

                   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 @@ static NSData* _sanitizeContent(NSData *

 /* SaxLexicalHandler */

 - (void) comment: (unichar *) _chars

-          length: (NSUInteger) _len

+          length: (int) _len

 {

   showWhoWeAre();

   if (inStyle)

@@ -807,7 +807,7 @@ static NSData* _sanitizeContent(NSData *

     }

   [dump appendFormat: @"--- end ---\n"];

-  NSLog(dump);

+  NSLog(@"%@", dump);

   [dump release];

 }

--- UI/MailPartViewers/UIxMailPartViewer.m.orig	2015-09-16 18:41:36 UTC

+++ UI/MailPartViewers/UIxMailPartViewer.m

@@ -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"],

--- UI/MailerUI/UIxMailFolderActions.m.orig	2015-09-16 18:41:36 UTC

+++ UI/MailerUI/UIxMailFolderActions.m

@@ -383,7 +383,7 @@

 - (WOResponse *) moveMessagesAction

 {

   SOGoMailFolder *co;

-  SOGoUserSettings *us;

+  SOGoUserSettings *us=nil;

   WOResponse *response;

   NSArray *uids;

   NSString *value, *destinationFolder;

--- UI/MailerUI/UIxMailListActions.h.orig	2015-09-16 18:41:36 UTC

+++ UI/MailerUI/UIxMailListActions.h

@@ -43,7 +43,6 @@

 }

 - (NSString *) defaultSortKey;

--- UI/MailerUI/UIxMailMainFrame.m.orig	2015-09-16 18:41:36 UTC

+++ UI/MailerUI/UIxMailMainFrame.m

@@ -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

--- UI/MainUI/SOGoMicrosoftActiveSyncActions.m.orig	2015-09-16 18:41:32 UTC

+++ UI/MainUI/SOGoMicrosoftActiveSyncActions.m

@@ -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")];

--- UI/PreferencesUI/UIxPreferences.m.orig	2015-09-16 18:41:36 UTC

+++ UI/PreferencesUI/UIxPreferences.m

@@ -1366,15 +1366,15 @@ static NSArray *reminderValues = nil;

           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

--- UI/SOGoUI/SOGoAptFormatter.m.orig	2015-09-16 18:41:32 UTC

+++ UI/SOGoUI/SOGoAptFormatter.m

@@ -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:@")"];

   }

 }

--- UI/Scheduler/UIxCalDateSelector.m.orig	2015-09-16 18:41:32 UTC

+++ UI/Scheduler/UIxCalDateSelector.m

@@ -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

--- UI/Scheduler/UIxCalDayTable.h.orig	2015-09-16 18:41:32 UTC

+++ UI/Scheduler/UIxCalDayTable.h

@@ -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;

--- UI/Scheduler/UIxCalDayTable.m.orig	2015-09-16 18:41:36 UTC

+++ UI/Scheduler/UIxCalDayTable.m