Attachment #162272 for bug #203910

Lines 3-9 Link Here

(-)sogo/Makefile (-2 / +14 lines)
3		3
4	PORTNAME= sogo	4	PORTNAME= sogo
5	PORTVERSION= 2.3.2	5	PORTVERSION= 2.3.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= www gnustep	7	CATEGORIES= www gnustep
8	MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/	8	MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
9	DISTNAME= SOGo-${PORTVERSION}	9	DISTNAME= SOGo-${PORTVERSION}
Lines 18-24 Link Here
18	libcurl.so:${PORTSDIR}/ftp/curl	18	libcurl.so:${PORTSDIR}/ftp/curl
19	RUN_DEPENDS:= ${BUILD_DEPENDS}	19	RUN_DEPENDS:= ${BUILD_DEPENDS}
20		20
21	MAKE_JOBS_UNSAFE=yes	21	OPTIONS_DEFINE= ACTIVESYNC
		22	OPTIONS_DEFAULT=
		23	OPTIONS_SUB= yes
		24
		25	ACTIVESYNC_DESC= Enable support for ActiveSync protocol (Experimental)
22		26
23	USERS= sogod	27	USERS= sogod
24	GROUPS= sogod	28	GROUPS= sogod
Lines 36-45 Link Here
36		40
37	.include <bsd.port.options.mk>	41	.include <bsd.port.options.mk>
38		42
		43	.if ${PORT_OPTIONS:MACTIVESYNC}
		44	LIB_DEPENDS+= libwbxml2.so:${PORTSDIR}/textproc/wbxml2
		45	.endif
		46
39	post-patch:	47	post-patch:
40	${GREP} -rlF '/etc/sogo' ${WRKSRC} \	48	${GREP} -rlF '/etc/sogo' ${WRKSRC} \
41	\| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'	49	\| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
42		50
		51	.if ${PORT_OPTIONS:MACTIVESYNC}
		52	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
		53	.endif
		54
43	do-configure:	55	do-configure:
44	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}	56	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
45		57

Line 0 Link Here

(-)sogo/files/patch-ActiveSync_GNUmakefile (+11 lines)
	1	--- ActiveSync/GNUmakefile.orig 2015-09-17 02:41:28.000000000 +0800
	2	+++ ActiveSync/GNUmakefile 2015-10-16 16:55:31.932724851 +0800
	3	@@ -34,7 +34,7 @@
	4	ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
	5	ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/
	6	ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/
	7	-ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
	8	+ADDITIONAL_INCLUDE_DIRS += -I/usr/local/include/libwbxml-1.0/
	9	ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2
	10
	11	-include GNUmakefile.preamble

Line 0 Link Here

(-)sogo/files/patch-Main_SOGo+DAV.m (+11 lines)
	1	--- Main/SOGo+DAV.m.orig 2015-10-12 00:55:36.784513635 +0800
	2	+++ Main/SOGo+DAV.m 2015-10-12 01:05:10.524474393 +0800
	3	@@ -267,7 +267,7 @@
	4	NSObject <DOMNodeList> *list;
	5	NSObject <DOMNode> *valueNode;
	6	NSArray *elements;
	7	- NSString property, match;
	8	+ NSString property=nil, match=nil;
	9
	10	list = [searchElement getElementsByTagName: @"prop"];
	11	if ([list length])

Line 0 Link Here

(-)sogo/files/patch-SOPE_GDLContentStore_GCSChannelManager.m (+11 lines)
	1	--- SOPE/GDLContentStore/GCSChannelManager.m.orig 2015-10-08 10:23:07.630990957 +0800
	2	+++ SOPE/GDLContentStore/GCSChannelManager.m 2015-10-08 10:23:39.389981097 +0800
	3	@@ -500,7 +500,7 @@
	4	ms = [NSMutableString stringWithCapacity: 256];
	5	[ms appendFormat: @"<0x%p[%@]: ", self, NSStringFromClass ([self class])];
	6
	7	- [ms appendFormat: @" #adaptors=%d", [urlToAdaptor count]];
	8	+ [ms appendFormat: @" #adaptors=%d", (int)[urlToAdaptor count]];
	9
	10	[ms appendString: @">"];
	11	return ms;

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_CardElement.m (+11 lines)
	1	--- SOPE/NGCards/CardElement.m.orig 2015-10-08 08:46:14.856388025 +0800
	2	+++ SOPE/NGCards/CardElement.m 2015-10-08 08:48:15.614375777 +0800
	3	@@ -414,7 +414,7 @@
	4	if (group)
	5	[str appendFormat: @"%@ (group: %@)\n", tag, group];
	6	else
	7	- [str appendFormat: @"%@\n", tag, group];
	8	+ [str appendFormat: @"%@\n", tag];
	9
	10	[str appendString: [self versitString]];
	11

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_CardGroup.m (+11 lines)
	1	--- SOPE/NGCards/CardGroup.m.orig 2015-10-08 09:03:57.483310954 +0800
	2	+++ SOPE/NGCards/CardGroup.m 2015-10-08 09:06:25.109300905 +0800
	3	@@ -409,7 +409,7 @@
	4	max = [children count];
	5	if (max > 0)
	6	{
	7	- [str appendFormat: @"\n %d children: {\n", [children count]];
	8	+ [str appendFormat: @"\n %d children: {\n", (int)[children count]];
	9	for (count = 0; count < max; count++)
	10	[str appendFormat: @" %@\n",
	11	[[children objectAtIndex: count] description]];




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




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

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_iCalPerson.m (+11 lines)
	1	--- SOPE/NGCards/iCalPerson.m.orig 2015-10-08 09:29:37.635206447 +0800
	2	+++ SOPE/NGCards/iCalPerson.m 2015-10-08 09:32:16.016193627 +0800
	3	@@ -256,7 +256,7 @@
	4	- (BOOL)isEqual:(id)_other {
	5	if(_other == nil)
	6	return NO;
	7	- if([_other class] != self->isa)
	8	+ if([_other class] != object_getClass(self))
	9	return NO;
	10	if([_other hash] != [self hash])
	11	return NO;




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




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m (+11 lines)
	1	--- SoObjects/Appointments/MSExchangeFreeBusy.m.orig 2015-10-09 16:15:25.499576435 +0800
	2	+++ SoObjects/Appointments/MSExchangeFreeBusy.m 2015-10-09 16:17:52.374562154 +0800
	3	@@ -344,7 +344,7 @@
	4	NSMutableString *s;
	5
	6	s = [NSMutableString stringWithCapacity: 64];
	7	- [s appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
	8	+ [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])];
	9	if (freeBusyViewType)
	10	[s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType];
	11	if (mergedFreeBusy)

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m (+11 lines)
	1	--- SoObjects/Appointments/SOGoAppointmentFolder.m.orig 2015-10-09 15:19:44.154803470 +0800
	2	+++ SoObjects/Appointments/SOGoAppointmentFolder.m 2015-10-09 15:25:42.002786945 +0800
	3	@@ -2387,7 +2387,7 @@
	4	request = [context request];
	5	if (!([request isIPhone] \|\| [request isICal4]))
	6	{
	7	- gdRT = [self groupDavResourceType];
	8	+ gdRT = (NSArray *) [self groupDavResourceType];
	9	gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
	10	XMLNS_GROUPDAV, nil];
	11	[colType addObject: gdVEventCol];




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




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




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h (+11 lines)
	1	--- SoObjects/Appointments/iCalEvent+SOGo.h.orig 2015-10-09 13:42:25.289208627 +0800
	2	+++ SoObjects/Appointments/iCalEvent+SOGo.h 2015-10-09 13:42:56.647202696 +0800
	3	@@ -28,7 +28,7 @@
	4	@interface iCalEvent (SOGoExtensions)
	5
	6	- (BOOL) isStillRelevant;
	7	-- (unsigned int) occurenceInterval;
	8	+- (NSTimeInterval) occurenceInterval;
	9	- (void) updateRecurrenceRulesUntilDate: (NSCalendarDate *) previousEndDate;
	10
	11	@end

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m (+11 lines)
	1	--- SoObjects/Appointments/iCalEvent+SOGo.m.orig 2015-10-09 13:40:11.097214920 +0800
	2	+++ SoObjects/Appointments/iCalEvent+SOGo.m 2015-10-09 13:41:24.319208579 +0800
	3	@@ -259,7 +259,7 @@
	4
	5	- (NSTimeInterval) occurenceInterval
	6	{
	7	- return [[self endDate] timeIntervalSinceDate: [self startDate]];
	8	+ return (NSTimeInterval) [[self endDate] timeIntervalSinceDate: [self startDate]];
	9	}
	10
	11	/**




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m (+11 lines)
	1	--- SoObjects/Contacts/SOGoContactEntryPhoto.m.orig 2015-10-12 00:20:43.010660719 +0800
	2	+++ SoObjects/Contacts/SOGoContactEntryPhoto.m 2015-10-12 00:21:07.660013539 +0800
	3	@@ -59,7 +59,7 @@
	4
	5	[response setHeader: [self davContentType] forKey: @"content-type"];
	6	[response setHeader: [NSString stringWithFormat:@" %d",
	7	- [data length]]
	8	+ (int)[data length]]
	9	forKey: @"content-length"];
	10	[response setContent: data];
	11	}




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m (+11 lines)
	1	--- SoObjects/Contacts/SOGoContactGCSEntry.m.orig 2015-10-10 13:22:12.488337134 +0800
	2	+++ SoObjects/Contacts/SOGoContactGCSEntry.m 2015-10-10 13:23:24.526329978 +0800
	3	@@ -50,7 +50,7 @@
	4
	5	- (Class *) parsingClass
	6	{
	7	- return [NGVCard class];
	8	+ return (Class *)[NGVCard class];
	9	}
	10
	11	/* content */

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Contacts_SOGoContactGCSList.m (+11 lines)
	1	--- SoObjects/Contacts/SOGoContactGCSList.m.orig 2015-10-10 13:25:06.365325835 +0800
	2	+++ SoObjects/Contacts/SOGoContactGCSList.m 2015-10-10 13:25:31.802319847 +0800
	3	@@ -45,7 +45,7 @@
	4
	5	- (Class *) parsingClass
	6	{
	7	- return [NGVList class];
	8	+ return (Class *)[NGVList class];
	9	}
	10
	11




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_NSDictionary+Mail.m (+10 lines)
	1	--- SoObjects/Mailer/NSDictionary+Mail.m.orig 2015-10-14 05:47:30.728396081 +0800
	2	+++ SoObjects/Mailer/NSDictionary+Mail.m 2015-10-14 06:09:50.541304212 +0800
	3	@@ -20,6 +20,7 @@
	4
	5	#import <Foundation/NSDictionary.h>
	6	#import <Foundation/NSString.h>
	7	+#import <NGExtensions/NSString+misc.h>
	8
	9	#import "NSDictionary+Mail.h"
	10

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_NSString+Mail.m (+11 lines)
	1	--- SoObjects/Mailer/NSString+Mail.m.orig 2015-10-12 00:02:53.664734285 +0800
	2	+++ SoObjects/Mailer/NSString+Mail.m 2015-10-12 00:04:12.743725205 +0800
	3	@@ -533,7 +533,7 @@
	4	messageID = [NSMutableString string];
	5	[messageID appendFormat: @"<%@", [SOGoObject globallyUniqueObjectId]];
	6	pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
	7	- [messageID appendFormat: @"@%u>", [pGUID hash]];
	8	+ [messageID appendFormat: @"@%u>", (unsigned int)[pGUID hash]];
	9
	10	return [messageID lowercaseString];
	11	}




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




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m (+11 lines)
	1	--- SoObjects/Mailer/SOGoMailBodyPart.m.orig 2015-10-11 23:55:35.353760677 +0800
	2	+++ SoObjects/Mailer/SOGoMailBodyPart.m 2015-10-11 23:58:39.164751566 +0800
	3	@@ -396,7 +395,7 @@
	4	mimeType = @"application/octet-stream";
	5
	6	[response setHeader: mimeType forKey: @"content-type"];
	7	- [response setHeader: [NSString stringWithFormat:@"%d", [data length]]
	8	+ [response setHeader: [NSString stringWithFormat:@"%d", (int)[data length]]
	9	forKey: @"content-length"];
	10
	11	if (asAttachment)

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailFolder.m (+11 lines)
	1	--- SoObjects/Mailer/SOGoMailFolder.m.orig 2015-10-10 17:21:58.389347307 +0800
	2	+++ SoObjects/Mailer/SOGoMailFolder.m 2015-10-10 17:25:17.473330458 +0800
	3	@@ -1645,7 +1645,7 @@
	4
	5	sortOrderings = [NSMutableArray array];
	6
	7	- if ([self _sortElementIsAscending: sortElement])
	8	+ if ([self _sortElementIsAscending: (NGDOMNodeWithChildren <DOMElement> *)sortElement])
	9	sortOrderingOrder = EOCompareAscending;
	10	else
	11	sortOrderingOrder = EOCompareDescending;




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailLabel.m (+11 lines)
	1	--- SoObjects/Mailer/SOGoMailLabel.m.orig 2015-10-11 18:07:02.705202858 +0800
	2	+++ SoObjects/Mailer/SOGoMailLabel.m 2015-10-11 18:09:13.043193497 +0800
	3	@@ -74,7 +74,7 @@
	4	int i;
	5
	6	allLabels = [NSMutableArray array];
	7	- allKeys = [[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)];
	8	+ allKeys = [[[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)] mutableCopy];
	9
	10	for (i = 0; i < [allKeys count]; i++)
	11	{




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




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_LDAPSource.m (+11 lines)
	1	--- SoObjects/SOGo/LDAPSource.m.orig 2015-10-08 14:56:38.777853673 +0800
	2	+++ SoObjects/SOGo/LDAPSource.m 2015-10-08 15:07:17.767809894 +0800
	3	@@ -1703,7 +1703,7 @@
	4	hostname: hostname
	5	port: [NSString stringWithFormat: @"%d", port]
	6	encryption: encryption
	7	- bindAsCurrentUser: NO];
	8	+ bindAsCurrentUser: [NSString stringWithFormat: @"%d", NO]];
	9	[ab setBaseDN: [entry dn]
	10	IDField: @"cn"
	11	CNField: @"displayName"




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




--- 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__
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
 #include <crypt.h>
 #endif
 
 #include <sys/stat.h>
 #include <fcntl.h>

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_NSDictionary+DAV.m (+11 lines)
	1	--- SoObjects/SOGo/NSDictionary+DAV.m.orig 2015-10-08 17:24:48.307243279 +0800
	2	+++ SoObjects/SOGo/NSDictionary+DAV.m 2015-10-08 17:25:57.354237540 +0800
	3	@@ -46,7 +46,7 @@
	4	{
	5	NSString *newTag;
	6
	7	- newTag = [NSString stringWithFormat: @"n%d", [namespaces count]];
	8	+ newTag = [NSString stringWithFormat: @"n%d", (int)[namespaces count]];
	9	[namespaces setObject: newTag forKey: newNS];
	10
	11	return newTag;

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_NSString+Utilities.m (+11 lines)
	1	--- SoObjects/SOGo/NSString+Utilities.m.orig 2015-10-08 19:36:02.806701634 +0800
	2	+++ SoObjects/SOGo/NSString+Utilities.m 2015-10-08 19:37:02.380693585 +0800
	3	@@ -309,7 +309,7 @@
	4	c == 0xD \|\|
	5	(c >= 0x20 && c <= 0xD7FF) \|\|
	6	(c >= 0xE000 && c <= 0xFFFD) \|\|
	7	- (c >= 0x10000 && c <= 0x10FFFF))
	8	+ (c >= (unichar)0x10000 && c <= (unichar)0x10FFFF))
	9	{
	10	*(start+j) = c;
	11	j++;

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoCache.h (+10 lines)
	1	--- SoObjects/SOGo/SOGoCache.h.orig 2015-10-08 11:12:00.831781718 +0800
	2	+++ SoObjects/SOGo/SOGoCache.h 2015-10-08 11:10:21.287794419 +0800
	3	@@ -21,6 +21,7 @@
	4	#ifndef SOGOCACHE_H
	5	#define SOGOCACHE_H
	6
	7	+#import <Foundation/Foundation.h>
	8	#import <Foundation/NSObject.h>
	9
	10	#include <libmemcached/memcached.h>

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h (+11 lines)
	1	--- SoObjects/SOGo/SOGoCacheGCSFolder.h.orig 2015-10-08 11:19:28.603751311 +0800
	2	+++ SoObjects/SOGo/SOGoCacheGCSFolder.h 2015-10-08 11:35:36.006684174 +0800
	3	@@ -40,6 +40,8 @@
	4
	5	- (NSMutableString ) pathForChild: (NSString ) childName;
	6
	7	+- (void) addUserInAcls: (NSString *) user;
	8	+
	9	- (NSArray *) toOneRelationshipKeys;
	10	- (NSArray *) toManyRelationshipKeys;
	11

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m (+11 lines)
	1	--- SoObjects/SOGo/SOGoCacheGCSFolder.m.orig 2015-10-08 11:13:15.184779897 +0800
	2	+++ SoObjects/SOGo/SOGoCacheGCSFolder.m 2015-10-08 11:17:04.335760701 +0800
	3	@@ -364,7 +364,7 @@
	4	if (record)
	5	{
	6	if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
	7	- objectClass = isa;
	8	+ objectClass = object_getClass(self);
	9	else
	10	objectClass = SOGoCacheGCSObjectK;
	11




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoCacheObject.h (+11 lines)
	1	--- SoObjects/SOGo/SOGoCacheObject.h.orig 2015-10-08 12:13:56.954532500 +0800
	2	+++ SoObjects/SOGo/SOGoCacheObject.h 2015-10-08 12:14:14.781522288 +0800
	3	@@ -42,8 +42,6 @@
	4	- (NSCalendarDate *) creationDate;
	5	- (NSCalendarDate *) lastModified;
	6
	7	-- (NSException *) destroy;
	8	-
	9	@end
	10
	11	#endif /* SOGOCACHEOBJECT_H */




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoFolder.m (+11 lines)
	1	--- SoObjects/SOGo/SOGoFolder.m.orig 2015-10-08 12:48:00.753385180 +0800
	2	+++ SoObjects/SOGo/SOGoFolder.m 2015-10-08 12:50:18.720380410 +0800
	3	@@ -107,7 +107,7 @@
	4
	5	- (void) setDisplayName: (NSString *) newDisplayName
	6	{
	7	- ASSIGN (displayName, newDisplayName);
	8	+ ASSIGN (displayName, [newDisplayName mutableCopy]);
	9	}
	10
	11	- (NSString *) displayName




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




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




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

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.h (+10 lines)
	1	--- SoObjects/SOGo/SOGoParentFolder.h.orig 2015-10-08 14:18:51.757012268 +0800
	2	+++ SoObjects/SOGo/SOGoParentFolder.h 2015-10-08 14:23:51.190988564 +0800
	3	@@ -45,6 +45,7 @@
	4
	5	- (NSException *) appendPersonalSources;
	6	- (void) removeSubFolder: (NSString *) subfolderName;
	7	+- (NSException *) appendCollectedSources;
	8
	9	- (void) setBaseOCSPath: (NSString *) newOCSPath;
	10




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




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




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




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




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

Line 0 Link Here

(-)sogo/files/patch-Tests_Unit_TestNGMimeMessageGenerator.m (+11 lines)
	1	--- Tests/Unit/TestNGMimeMessageGenerator.m.orig 2015-10-13 23:27:44.267969037 +0800
	2	+++ Tests/Unit/TestNGMimeMessageGenerator.m 2015-10-13 23:29:30.792958515 +0800
	3	@@ -117,7 +117,7 @@
	4	NSString *diff = [self stringFromDiffBetween: [NSString stringWithString: resultString]
	5	and: [NSString stringWithString: expected]];
	6	NSString *testErrorMsg = [NSString
	7	- stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %u lengthExpected: %u",
	8	+ stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %lu lengthExpected: %lu",
	9	header,
	10	resultString,
	11	expected,




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




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




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




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

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoSockDOperation.m (+11 lines)
	1	--- Tools/SOGoSockDOperation.m.orig 2015-10-13 21:11:15.463535399 +0800
	2	+++ Tools/SOGoSockDOperation.m 2015-10-13 21:14:55.685516664 +0800
	3	@@ -145,7 +145,7 @@
	4	[self _appendEntry: [resultEntries objectAtIndex: count]
	5	toResult: result];
	6
	7	- [result appendFormat: @"RESULT\ncode: %", resultCode];
	8	+ [result appendFormat: @"RESULT\ncode: %d", resultCode];
	9	[responseSocket
	10	safeWriteData: [result dataUsingEncoding: NSASCIIStringEncoding]];
	11	}

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoToolCreateFolder.m (+11 lines)
	1	--- Tools/SOGoToolCreateFolder.m.orig 2015-10-13 09:24:13.755455090 +0800
	2	+++ Tools/SOGoToolCreateFolder.m 2015-10-13 09:42:15.600381213 +0800
	3	@@ -97,7 +97,7 @@
	4	rc = [self createFolder: folder withFM: fm];
	5	if (!rc)
	6	{
	7	- NSLog (@"Create directory failed at path %s", folder);
	8	+ NSLog (@"Create directory failed at path %@", folder);
	9	return NO;
	10	}
	11

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoToolExpireUserSessions.m (+11 lines)
	1	--- Tools/SOGoToolExpireUserSessions.m.orig 2015-10-13 23:42:49.782904725 +0800
	2	+++ Tools/SOGoToolExpireUserSessions.m 2015-10-13 23:43:53.893900318 +0800
	3	@@ -143,7 +143,7 @@
	4	else
	5	{
	6	if (verbose)
	7	- NSLog(@"No session to remove", sessionsToDelete);
	8	+ NSLog(@"No session to remove");
	9	}
	10
	11	[cm releaseChannel: channel];

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoToolManageEAS.m (+11 lines)
	1	--- Tools/SOGoToolManageEAS.m.orig 2015-10-13 09:50:19.138347381 +0800
	2	+++ Tools/SOGoToolManageEAS.m 2015-10-13 19:29:28.210951778 +0800
	3	@@ -227,7 +227,7 @@
	4
	5	NSMutableString *sql;
	6
	7	- sql = [NSMutableString stringWithFormat: @"DELETE FROM %@" @" WHERE c_path like '/%@%'", [oc tableName], deviceId];
	8	+ sql = [NSMutableString stringWithFormat: @"DELETE FROM %@ WHERE c_path like '/%@'", [oc tableName], deviceId];
	9
	10	[oc performBatchSQLQueries: [NSArray arrayWithObject: sql]];
	11	rc = YES;

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoToolRemoveDoubles.m (+11 lines)
	1	--- Tools/SOGoToolRemoveDoubles.m.orig 2015-09-17 02:41:31.000000000 +0800
	2	+++ Tools/SOGoToolRemoveDoubles.m 2015-10-15 10:55:54.609166337 +0800
	3	@@ -175,7 +175,7 @@
	4
	5	now = [NSCalendarDate date];
	6	delSql = [NSString stringWithFormat: @"UPDATE %@"
	7	- @" SET c_deleted = 1, c_lastmodified = %d,"
	8	+ @" SET c_deleted = 1, c_lastmodified = %lu,"
	9	@" c_content = ''"
	10	@" WHERE c_name = '%@'",
	11	tableName,




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

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoToolRestore.m (+10 lines)
	1	--- Tools/SOGoToolRestore.m.orig 2015-10-13 23:45:35.646896281 +0800
	2	+++ Tools/SOGoToolRestore.m 2015-10-13 23:46:38.256887925 +0800
	3	@@ -574,6 +574,7 @@
	4	NSLog (@" %@ (%@)",
	5	folderKey, [currentFolder objectForKey: @"displayname"]);
	6	}
	7	+ rc = YES;
	8	}
	9	else
	10	{

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoToolUserPreferences.m (+11 lines)
	1	--- Tools/SOGoToolUserPreferences.m.orig 2015-10-13 09:43:41.234378222 +0800
	2	+++ Tools/SOGoToolUserPreferences.m 2015-10-13 09:48:36.693354816 +0800
	3	@@ -115,7 +115,7 @@
	4	[theKey caseInsensitiveCompare: @"Vacation"] == NSOrderedSame)
	5	{
	6	/* credentials file handling */
	7	- NSString credsFilename, authname, *authpwd;
	8	+ NSString credsFilename=nil, authname=nil, *authpwd=nil;
	9	SOGoCredentialsFile *cf;
	10
	11	credsFilename = [[NSUserDefaults standardUserDefaults] stringForKey: @"p"];

Line 0 Link Here

(-)sogo/files/patch-Tools_sogo-tool.m (+11 lines)
	1	--- Tools/sogo-tool.m.orig 2015-10-13 08:49:02.534602894 +0800
	2	+++ Tools/sogo-tool.m 2015-10-13 08:50:28.020596778 +0800
	3	@@ -149,7 +149,7 @@
	4	command, [currentTool objectAtIndex: 1]];
	5	}
	6
	7	- NSLog (helpString);
	8	+ NSLog (@"%@", helpString);
	9	}
	10
	11	- (void) registerTools

Line 0 Link Here

(-)sogo/files/patch-UI_Common_UIxToolbar.m (+11 lines)
	1	--- UI/Common/UIxToolbar.m.orig 2015-10-12 01:26:49.548386836 +0800
	2	+++ UI/Common/UIxToolbar.m 2015-10-12 01:29:17.906393163 +0800
	3	@@ -166,7 +166,7 @@
	4	[self errorWithFormat:
	5	@"not toolbar configuration found on SoObject: %@ (%@)",
	6	[self clientObject], [[self clientObject] soClass]];
	7	- toolbarConfig = [[NSNull null] retain];
	8	+ toolbarConfig = (NSArray *)[[NSNull null] retain];
	9	return nil;
	10	}
	11

Line 0 Link Here

(-)sogo/files/patch-UI_Contacts_UIxContactActions.m (+11 lines)
	1	--- UI/Contacts/UIxContactActions.m.orig 2015-10-12 01:31:58.756363563 +0800
	2	+++ UI/Contacts/UIxContactActions.m 2015-10-12 02:04:25.062227766 +0800
	3	@@ -141,7 +141,7 @@
	4	content = [NSMutableString string];
	5	response = [context response];
	6
	7	- [content appendFormat: [[self clientObject] contentAsString]];
	8	+ [content appendFormat: @"%@", [[self clientObject] contentAsString]];
	9	[response setHeader: @"text/plain; charset=utf-8"
	10	forKey: @"content-type"];
	11	[response appendContentString: content];




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

Line 0 Link Here

(-)sogo/files/patch-UI_Contacts_UIxContactFolderProperties.m (+11 lines)
	1	--- UI/Contacts/UIxContactFolderProperties.m.orig 2015-10-14 06:34:18.044206978 +0800
	2	+++ UI/Contacts/UIxContactFolderProperties.m 2015-10-14 06:47:09.534149701 +0800
	3	@@ -19,6 +19,8 @@
	4	*/
	5
	6	#import <SOGo/SOGoSystemDefaults.h>
	7	+#import <Contacts/SOGoContactGCSFolder.h>
	8	+#import <NGExtensions/NSURL+misc.h>
	9
	10	#import "UIxContactFolderProperties.h"
	11




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

Line 0 Link Here

(-)sogo/files/patch-UI_MailPartViewers_UIxMailListActions.h (+10 lines)
	1	--- UI/MailerUI/UIxMailListActions.h.orig 2015-10-12 03:45:20.839812321 +0800
	2	+++ UI/MailerUI/UIxMailListActions.h 2015-10-12 03:45:29.934812501 +0800
	3	@@ -43,7 +43,6 @@
	4	}
	5
	6	- (NSString *) defaultSortKey;
	7	-- (NSString *) imap4SortKey;
	8	- (NSString *) imap4SortOrdering;
	9	- (EOQualifier *) searchQualifier;
	10	- (NSString *) msgLabels;

Line 0 Link Here

(-)sogo/files/patch-UI_MailPartViewers_UIxMailMainFrame.m (+11 lines)
	1	--- UI/MailerUI/UIxMailMainFrame.m.orig 2015-10-12 03:31:38.716871414 +0800
	2	+++ UI/MailerUI/UIxMailMainFrame.m 2015-10-12 03:32:31.963865693 +0800
	3	@@ -627,7 +627,7 @@
	4
	5	- (NSString *) columnsDisplayCount
	6	{
	7	- return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]];
	8	+ return [NSString stringWithFormat: @"%d", (int)[[self columnsDisplayOrder] count]];
	9	}
	10
	11	- (void) setCurrentColumn: (NSDictionary *) newCurrentColumn




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

Line 0 Link Here

(-)sogo/files/patch-UI_MailPartViewers_UIxMailPartViewer.m (+11 lines)
	1	--- UI/MailPartViewers/UIxMailPartViewer.m.orig 2015-10-12 02:39:07.719086705 +0800
	2	+++ UI/MailPartViewers/UIxMailPartViewer.m 2015-10-12 02:41:14.554075510 +0800
	3	@@ -270,7 +270,7 @@
	4	if ([filename length])
	5	// We replace any slash by a dash since Apache won't allow encoded slashes by default.
	6	// See http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes
	7	- filename = [filename stringByReplacingString: @"/" withString: @"-"];
	8	+ filename = [[filename stringByReplacingString: @"/" withString: @"-"] mutableCopy];
	9	else
	10	[filename appendFormat: @"%@-%@",
	11	[self labelForKey: @"Untitled"],

Line 0 Link Here

(-)sogo/files/patch-UI_MailerUI_UIxMailFolderActions.m (+11 lines)
	1	--- UI/MailerUI/UIxMailFolderActions.m.orig 2015-10-12 04:08:23.478716523 +0800
	2	+++ UI/MailerUI/UIxMailFolderActions.m 2015-10-12 04:11:58.350711826 +0800
	3	@@ -383,7 +383,7 @@
	4	- (WOResponse *) moveMessagesAction
	5	{
	6	SOGoMailFolder *co;
	7	- SOGoUserSettings *us;
	8	+ SOGoUserSettings *us=nil;
	9	WOResponse *response;
	10	NSArray *uids;
	11	NSString value, destinationFolder;




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




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




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




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




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




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

Line 0 Link Here

(-)sogo/files/patch-UI_Scheduler_UIxCalDayView.m (+11 lines)
	1	--- UI/Scheduler/UIxCalDayView.m.orig 2015-10-13 06:55:05.290075011 +0800
	2	+++ UI/Scheduler/UIxCalDayView.m 2015-10-13 06:55:41.472070500 +0800
	3	@@ -164,7 +164,7 @@
	4
	5	date = [self selectedDate];
	6	hmString = [NSString stringWithFormat:@"%.2d%.2d",
	7	- [date hourOfDay], [date minuteOfHour]];
	8	+ (int)[date hourOfDay], (int)[date minuteOfHour]];
	9	qp = [[self queryParameters] mutableCopy];
	10	[self setSelectedDateQueryParameter:date inDictionary:qp];
	11	[qp setObject: hmString forKey:@"hm"];




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

Line 0 Link Here

(-)sogo/files/patch-UI_Scheduler_UIxCalMonthView.m (+11 lines)
	1	--- UI/Scheduler/UIxCalMonthView.m.orig 2015-10-13 06:56:35.930068918 +0800
	2	+++ UI/Scheduler/UIxCalMonthView.m 2015-10-13 06:57:08.272061713 +0800
	3	@@ -299,7 +299,7 @@
	4
	5	[classes appendFormat: @"day weekOf%d week%dof%d day%d",
	6	numberOfWeeks,
	7	- [weeksToDisplay indexOfObject: currentWeek],
	8	+ (int)[weeksToDisplay indexOfObject: currentWeek],
	9	numberOfWeeks, dayOfWeek];
	10	if (realDayOfWeek == 0 \|\| realDayOfWeek == 6)
	11	[classes appendString: @" weekEndDay"];




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

Line 0 Link Here

(-)sogo/files/patch-UI_Scheduler_UIxComponentEditor.m (+11 lines)
	1	--- UI/Scheduler/UIxComponentEditor.m.orig 2015-10-13 08:34:49.429762100 +0800
	2	+++ UI/Scheduler/UIxComponentEditor.m 2015-10-13 08:39:58.917637567 +0800
	3	@@ -2472,7 +2472,7 @@
	4	content = [NSMutableString string];
	5	response = [context response];
	6
	7	- [content appendFormat: [[self clientObject] contentAsString]];
	8	+ [content appendFormat: @"%@", [[self clientObject] contentAsString]];
	9	[response setHeader: @"text/plain; charset=utf-8"
	10	forKey: @"content-type"];
	11	[response appendContentString: content];

Line 0 Link Here

(-)sogo/files/patch-UI_Scheduler_UIxRecurrenceEditor.m (+11 lines)
	1	--- UI/Scheduler/UIxRecurrenceEditor.m.orig 2015-10-13 08:43:32.796623156 +0800
	2	+++ UI/Scheduler/UIxRecurrenceEditor.m 2015-10-13 08:44:08.401625528 +0800
	3	@@ -148,7 +148,7 @@
	4	[shortWeekDaysList retain];
	5	}
	6
	7	- id = [NSString stringWithFormat: @"weekDay%i", [shortWeekDaysList indexOfObject: item]];
	8	+ id = [NSString stringWithFormat: @"weekDay%i", (int)[shortWeekDaysList indexOfObject: item]];
	9
	10	return id;
	11	}

Lines 564-569 Link Here

(-)sogo/pkg-plist (+4 lines)
564	GNUstep/Local/Library/OCSTypeModels/appointment.ocs	564	GNUstep/Local/Library/OCSTypeModels/appointment.ocs
565	GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs	565	GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs
566	GNUstep/Local/Library/OCSTypeModels/contact.ocs	566	GNUstep/Local/Library/OCSTypeModels/contact.ocs
		567	%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/ActiveSync
		568	%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/Resources/Info-gnustep.plist
		569	%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/Resources/product.plist
		570	%%ACTIVESYNC%%GNUstep/Local/Library/SOGo/ActiveSync.SOGo/stamp.make
567	GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/AdministrationUI	571	GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/AdministrationUI
568	GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Arabic.lproj/Localizable.strings	572	GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Arabic.lproj/Localizable.strings
569	GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Basque.lproj/Localizable.strings	573	GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Basque.lproj/Localizable.strings

Return to bug 203910

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m (+24 lines)
	1	--- SOPE/NGCards/NSCalendarDate+NGCards.m.orig 2015-10-08 08:22:33.220485498 +0800
	2	+++ SOPE/NGCards/NSCalendarDate+NGCards.m 2015-10-08 08:24:16.099475908 +0800
	3	@@ -32,16 +32,16 @@
	4	- (NSString *) iCalFormattedDateTimeString
	5	{
	6	return [NSString stringWithFormat: @"%.4d%.2d%.2dT%.2d%.2d%.2d",
	7	- [self yearOfCommonEra], [self monthOfYear],
	8	- [self dayOfMonth], [self hourOfDay],
	9	- [self minuteOfHour], [self secondOfMinute]];
	10	+ (int)[self yearOfCommonEra], (int)[self monthOfYear],
	11	+ (int)[self dayOfMonth], (int)[self hourOfDay],
	12	+ (int)[self minuteOfHour], (int)[self secondOfMinute]];
	13	}
	14
	15	- (NSString *) iCalFormattedDateString
	16	{
	17	return [NSString stringWithFormat: @"%.4d%.2d%.2d",
	18	- [self yearOfCommonEra], [self monthOfYear],
	19	- [self dayOfMonth]];
	20	+ (int)[self yearOfCommonEra], (int)[self monthOfYear],
	21	+ (int)[self dayOfMonth]];
	22	}
	23
	24	@end

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m (+20 lines)
	1	--- SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m.orig 2015-10-08 19:30:05.019721919 +0800
	2	+++ SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m 2015-10-08 19:31:47.705714765 +0800
	3	@@ -348,7 +348,7 @@
	4	if ([byDayMask occursOnDay: currentWeekDay])
	5	{
	6	if ([bySetPos containsObject:
	7	- [NSString stringWithFormat: @"%d", currentPos]])
	8	+ [NSString stringWithFormat: @"%d", (int)currentPos]])
	9	monthDays[monthDay+1] = YES;
	10	currentPos++;
	11	}
	12	@@ -362,7 +362,7 @@
	13	if ([byDayMask occursOnDay: currentWeekDay])
	14	{
	15	if ([bySetPos containsObject:
	16	- [NSString stringWithFormat: @"%d", currentPos]])
	17	+ [NSString stringWithFormat: @"%d", (int)currentPos]])
	18	monthDays[monthDay] = YES;
	19	currentPos--;
	20	}

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_iCalRecurranceRule.m (+15 lines)
	1	--- SOPE/NGCards/iCalRecurrenceRule.m.orig 2015-10-08 09:37:28.117175437 +0800
	2	+++ SOPE/NGCards/iCalRecurrenceRule.m 2015-10-08 09:50:57.392119166 +0800
	3	@@ -309,10 +309,10 @@
	4	else if ([frequency isEqualToString:@"SECONDLY"])
	5	freq = iCalRecurrenceFrequenceSecondly;
	6	else
	7	- freq = NSNotFound;
	8	+ freq = (iCalRecurrenceFrequency) NSNotFound;
	9	}
	10	else
	11	- freq = NSNotFound;
	12	+ freq = (iCalRecurrenceFrequency) NSNotFound;
	13
	14	return freq;
	15	}

Line 0 Link Here

(-)sogo/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m (+20 lines)
	1	--- SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m.orig 2015-10-08 10:17:21.303008853 +0800
	2	+++ SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m 2015-10-08 10:18:24.511005649 +0800
	3	@@ -1045,7 +1045,7 @@
	4	if (debugOn)
	5	{
	6	NSLog(@"%s: trying to decode data (0x%p,len=%d) ...",
	7	- __PRETTY_FUNCTION__, _data, [_data length]);
	8	+ __PRETTY_FUNCTION__, _data, (int)[_data length]);
	9	}
	10
	11	if ((len = [_data length]) == 0)
	12	@@ -1164,7 +1164,7 @@
	13	if (debugOn)
	14	{
	15	NSLog(@"%s: trying to parse string (0x%p,len=%d) ...",
	16	- __PRETTY_FUNCTION__, _source, [_source length]);
	17	+ __PRETTY_FUNCTION__, _source, (int)[_source length]);
	18	}
	19	if (!_sysId) _sysId = @"<string>";
	20	[self _parseString: _source];

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m (+25 lines)
	1	--- SoObjects/Appointments/SOGoCalendarComponent.m.orig 2015-10-09 13:51:16.100168977 +0800
	2	+++ SoObjects/Appointments/SOGoCalendarComponent.m 2015-10-09 14:20:59.057046917 +0800
	3	@@ -140,6 +140,13 @@
	4	return aclManager;
	5	}
	6
	7	+- (NSException ) changeParticipationStatus: (NSString ) newPartStat
	8	+ withDelegate: (iCalPerson *) delegate
	9	+ alarm: (iCalAlarm *) alarm;
	10	+{
	11	+ return nil;
	12	+}
	13	+
	14	- (id) init
	15	{
	16	if ((self = [super init]))
	17	@@ -171,7 +178,7 @@
	18
	19	- (Class *) parsingClass
	20	{
	21	- return [iCalCalendar class];
	22	+ return (Class *) [iCalCalendar class];
	23	}
	24
	25	- (NSString *) davContentType

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m (+14 lines)
	1	--- SoObjects/Appointments/iCalAlarm+SOGo.m.orig 2015-10-09 13:32:17.705247981 +0800
	2	+++ SoObjects/Appointments/iCalAlarm+SOGo.m 2015-10-09 13:36:28.503254126 +0800
	3	@@ -102,9 +102,9 @@
	4	}
	5
	6	if ([reminderReference caseInsensitiveCompare: @"BEFORE"] == NSOrderedSame)
	7	- aValue = [NSString stringWithString: @"-P"];
	8	+ aValue = (NSString *) @"-P";
	9	else
	10	- aValue = [NSString stringWithString: @"P"];
	11	+ aValue = (NSString *) @"P";
	12
	13	if ([reminderUnit caseInsensitiveCompare: @"MINUTES"] == NSOrderedSame \|\|
	14	[reminderUnit caseInsensitiveCompare: @"HOURS"] == NSOrderedSame)

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Contacts_NGVCard+SOGo.m (+26 lines)
	1	--- SoObjects/Contacts/NGVCard+SOGo.m.orig 2015-10-09 16:20:14.044553480 +0800
	2	+++ SoObjects/Contacts/NGVCard+SOGo.m 2015-10-09 17:29:21.144266488 +0800
	3	@@ -297,7 +297,7 @@
	4
	5	if (year && month && day)
	6	[self setBday: [NSString stringWithFormat: @"%.4d-%.2d-%.2d",
	7	- year, month, day]];
	8	+ (int)year, (int)month, (int)day]];
	9	else
	10	[self setBday: @""];
	11
	12	@@ -614,11 +614,11 @@
	13	birthDay = [[self bday] asCalendarDate];
	14	if (birthDay)
	15	{
	16	- stringValue = [NSString stringWithFormat: @"%.4d", [birthDay yearOfCommonEra]];
	17	+ stringValue = [NSString stringWithFormat: @"%.4d", (int)[birthDay yearOfCommonEra]];
	18	[self _setValue: @"birthyear" to: stringValue inLDIFRecord: ldifRecord];
	19	- stringValue = [NSString stringWithFormat: @"%.2d", [birthDay monthOfYear]];
	20	+ stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay monthOfYear]];
	21	[self _setValue: @"birthmonth" to: stringValue inLDIFRecord: ldifRecord];
	22	- stringValue = [NSString stringWithFormat: @"%.2d", [birthDay dayOfMonth]];
	23	+ stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay dayOfMonth]];
	24	[self _setValue: @"birthday" to: stringValue inLDIFRecord: ldifRecord];
	25	}
	26	[self _setValue: @"description" to: [self note] inLDIFRecord: ldifRecord];

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Contacts_SOGoContactFolders.m (+15 lines)
	1	--- SoObjects/Contacts/SOGoContactFolders.m.orig 2015-10-09 17:53:48.355169269 +0800
	2	+++ SoObjects/Contacts/SOGoContactFolders.m 2015-10-10 12:59:10.048433423 +0800
	3	@@ -268,9 +268,9 @@
	4	SOGoUser *currentUser;
	5	id <SOGoSource> source;
	6
	7	- if ([sourceID isEqualToString: @"personal"])
	8	- result = [NSException exceptionWithHTTPStatus: 403
	9	- reason: (@"folder '%@' cannot be deleted", sourceID)];
	10	+ if ([sourceID isEqualToString: @"personal"]){
	11	+ result = [NSException exceptionWithHTTPStatus: 403 reason: [NSString stringWithFormat: (@"folder '%@' cannot be deleted"), sourceID]];
	12	+ }
	13	else
	14	{
	15	result = nil;

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m (+20 lines)
	1	--- SoObjects/Contacts/SOGoContactSourceFolder.m.orig 2015-10-10 13:26:34.980316221 +0800
	2	+++ SoObjects/Contacts/SOGoContactSourceFolder.m 2015-10-10 13:53:49.996206010 +0800
	3	@@ -94,7 +94,7 @@
	4	{
	5	if (![newDisplayName length])
	6	newDisplayName = newName;
	7	- ASSIGN (displayName, newDisplayName);
	8	+ ASSIGN (displayName, [newDisplayName mutableCopy]);
	9	}
	10
	11	return self;
	12	@@ -657,7 +657,7 @@
	13	BOOL otherIsPersonal;
	14
	15	otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
	16	- \|\| ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
	17	+ \|\| ([otherFolder isKindOfClass: object_getClass(self)] && [otherFolder isPersonalSource]));
	18
	19	if (isPersonalSource)
	20	{

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailAccounts.m (+28 lines)
	1	--- SoObjects/Mailer/SOGoMailAccounts.m.orig 2015-09-17 02:41:30.000000000 +0800
	2	+++ SoObjects/Mailer/SOGoMailAccounts.m 2015-10-14 05:44:19.467409671 +0800
	3	@@ -41,6 +41,8 @@
	4
	5	#define XMLNS_INVERSEDAV @"urn:inverse:params:xml:ns:inverse-dav"
	6
	7	+// TODO: prune redundant methods
	8	+
	9	@implementation SOGoMailAccounts
	10
	11	- (NSArray *) mailAccounts
	12	@@ -206,6 +208,9 @@
	13	</D:multistatus>
	14
	15	*/
	16	+
	17	+/* No longer in use, causes objc-method-access warning
	18	+
	19	- (NSException ) setDavMailsLabels: (NSString ) newLabels
	20	{
	21	id <DOMElement> documentElement, labelNode;
	22	@@ -253,5 +258,6 @@
	23
	24	return nil;
	25	}
	26	+*/
	27
	28	@end /* SOGoMailAccounts */

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m (+14 lines)
	1	--- SoObjects/Mailer/SOGoMailBaseObject.m.orig 2015-09-17 02:41:30.000000000 +0800
	2	+++ SoObjects/Mailer/SOGoMailBaseObject.m 2015-10-14 02:16:23.980269983 +0800
	3	@@ -32,9 +32,11 @@
	4	#import <NGExtensions/NSString+misc.h>
	5	#import <NGExtensions/NSURL+misc.h>
	6	#import <NGImap4/NGImap4Connection.h>
	7	+#import <NGImap4/NGImap4Client.h>
	8
	9	#import <SOGo/SOGoCache.h>
	10	#import <SOGo/SOGoUser.h>
	11	+#import <SOGo/WORequest+SOGo.h>
	12
	13	#import "SOGoMailAccount.h"
	14	#import "SOGoMailManager.h"

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailForward.m (+15 lines)
	1	--- SoObjects/Mailer/SOGoMailForward.m.orig 2015-10-12 00:00:08.490746039 +0800
	2	+++ SoObjects/Mailer/SOGoMailForward.m 2015-10-12 00:02:19.963732575 +0800
	3	@@ -73,10 +73,10 @@
	4
	5	- (NSString *) newLine
	6	{
	7	- NSString *rc = [NSString stringWithString: @" "];
	8	+ NSString *rc = @" ";
	9
	10	if (htmlComposition)
	11	- rc = [NSString stringWithString: @"<br/>"];
	12	+ rc = @"<br/>";
	13
	14	return rc;
	15	}

Line 0 Link Here

(-)sogo/files/patch-SoObjects_Mailer_SOGoMailObject.m (+46 lines)
	1	--- SoObjects/Mailer/SOGoMailObject.m.orig 2015-10-12 00:48:44.033544034 +0800
	2	+++ SoObjects/Mailer/SOGoMailObject.m 2015-10-12 00:51:09.761535745 +0800
	3	@@ -765,7 +765,7 @@
	4	[part objectForKey: @"type"],
	5	[part objectForKey: @"subtype"]];
	6
	7	- if (!filename)
	8	+ if (!filename) {
	9	// We might end up here because of MUA that actually strips the
	10	// Content-Disposition (and thus, the filename) when mails containing
	11	// attachments have been forwarded. Thunderbird (2.x) does just that
	12	@@ -773,10 +773,14 @@
	13	if ([mimeType hasPrefix: @"application/"] \|\|
	14	[mimeType hasPrefix: @"audio/"] \|\|
	15	[mimeType hasPrefix: @"image/"] \|\|
	16	- [mimeType hasPrefix: @"video/"])
	17	+ [mimeType hasPrefix: @"video/"]) {
	18	filename = [NSString stringWithFormat: @"unknown_%@", path];
	19	- else if ([mimeType isEqualToString: @"message/rfc822"])
	20	- filename = [NSString stringWithFormat: @"email_%@.eml", path];
	21	+ }
	22	+ else {
	23	+ if ([mimeType isEqualToString: @"message/rfc822"])
	24	+ filename = [NSString stringWithFormat: @"email_%@.eml", path];
	25	+ }
	26	+ }
	27
	28
	29	if (filename)
	30	@@ -820,13 +824,13 @@
	31	{
	32	currentPart = [subparts objectAtIndex: i-1];
	33	if (path)
	34	- newPath = [NSString stringWithFormat: @"%@.%d", path, i];
	35	+ newPath = [NSString stringWithFormat: @"%@.%d", path, (int)i];
	36	else
	37	- newPath = [NSString stringWithFormat: @"%d", i];
	38	+ newPath = [NSString stringWithFormat: @"%d", (int)i];
	39	[self _fetchFileAttachmentKeysInPart: currentPart
	40	intoArray: keys
	41	withPath: newPath
	42	- andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, i]];
	43	+ andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, (int)i]];
	44	}
	45	}
	46	else

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_BSONCodec.m (+20 lines)
	1	--- SoObjects/SOGo/BSONCodec.m.orig 2015-10-08 10:27:25.726969480 +0800
	2	+++ SoObjects/SOGo/BSONCodec.m 2015-10-08 10:44:13.473901101 +0800
	3	@@ -310,7 +310,7 @@
	4
	5	case 'q': return 0x12;
	6	default:
	7	- [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
	8	+ [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], (char *)NSStringFromSelector(_cmd), encoding];
	9	}
	10	return 0;
	11	}
	12	@@ -385,7 +385,7 @@
	13	}
	14
	15
	16	- [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
	17	+ [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], (char *)NSStringFromSelector(_cmd), encoding];
	18	return nil;
	19	}
	20

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m (+28 lines)
	1	--- SoObjects/SOGo/NSCalendarDate+SOGo.m.orig 2015-10-08 15:27:02.130727407 +0800
	2	+++ SoObjects/SOGo/NSCalendarDate+SOGo.m 2015-10-08 15:30:00.529714242 +0800
	3	@@ -88,9 +88,9 @@
	4	NSString *str;
	5
	6	str = [NSString stringWithFormat: @"%.4d%.2d%.2d",
	7	- [self yearOfCommonEra],
	8	- [self monthOfYear],
	9	- [self dayOfMonth]];
	10	+ (int)[self yearOfCommonEra],
	11	+ (int)[self monthOfYear],
	12	+ (int)[self dayOfMonth]];
	13
	14	return str;
	15	}
	16	@@ -107,9 +107,9 @@
	17
	18	return
	19	[NSString stringWithFormat: @"%@, %.2d %@ %d %.2d:%.2d:%.2d %+.4d",
	20	- rfc822Days[[self dayOfWeek]], [self dayOfMonth],
	21	- rfc822Months[[self monthOfYear]], [self yearOfCommonEra],
	22	- [self hourOfDay], [self minuteOfHour], [self secondOfMinute],
	23	+ rfc822Days[[self dayOfWeek]], (int)[self dayOfMonth],
	24	+ rfc822Months[[self monthOfYear]], (int)[self yearOfCommonEra],
	25	+ (int)[self hourOfDay], (int)[self minuteOfHour], (int)[self secondOfMinute],
	26	timeZoneShift];
	27	}
	28

Lines 1-13 Link Here

(-)sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m (-9 / +7 lines)
1	--- SoObjects/SOGo/NSData+Crypto.m.orig 2015-09-16 18:41:31 UTC	1	--- SoObjects/SOGo/NSData+Crypto.m.orig 2015-10-15 09:47:42.622448275 +0800
2	+++ SoObjects/SOGo/NSData+Crypto.m	2	+++ SoObjects/SOGo/NSData+Crypto.m 2015-10-15 09:47:56.039449839 +0800
3	@@ -23,10 +23,6 @@	3	@@ -23,7 +23,7 @@
4	* Boston, MA 02111-1307, USA.	4	* Boston, MA 02111-1307, USA.
5	*/	5	*/
6		6
7	-#ifndef __OpenBSD__	7	-#ifndef __OpenBSD__
8	-#include <crypt.h>	8	+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
9	-#endif	9	#include <crypt.h>
10	-	10	#endif
11	#include <sys/types.h>	11
12	#include <sys/stat.h>
13	#include <fcntl.h>

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m (+68 lines)
		1	--- SoObjects/SOGo/SOGoCacheGCSObject.m.orig 2015-10-08 11:38:29.151675385 +0800
		2	+++ SoObjects/SOGo/SOGoCacheGCSObject.m 2015-10-08 12:09:29.854549665 +0800
		3	@@ -87,7 +87,7 @@
		4	{
		5	tableUrl = nil;
		6	initialized = NO;
		7	- objectType = -1;
		8	+ objectType = (SOGoCacheObjectType) -1;
		9	deleted = NO;
		10	version = 0;
		11	}
		12	@@ -383,7 +383,7 @@
		13	@"SELECT * FROM %@ WHERE c_path = %@",
		14	tableName, pathValue];
		15	if (startVersion > -1)
		16	- [sql appendFormat: @" AND c_version > %d", startVersion];
		17	+ [sql appendFormat: @" AND c_version > %d", (int)startVersion];
		18
		19	/* execution */
		20	records = [self performSQLQuery: sql];
		21	@@ -411,18 +411,16 @@
		22
		23	tableName = [self tableName];
		24	adaptor = [self tableChannelAdaptor];
		25	- pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
		26	- forAttribute: textColumn];
		27
		28	/* query */
		29	sql = [NSMutableString stringWithFormat:
		30	@"SELECT * FROM %@ WHERE c_type = %d AND c_deleted <> 1", tableName, objectType];
		31
		32	if (startVersion > -1)
		33	- [sql appendFormat: @" AND c_version > %d", startVersion];
		34	+ [sql appendFormat: @" AND c_version > %d", (int)startVersion];
		35
		36	if (deviceId) {
		37	- pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@%", deviceId]
		38	+ pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
		39	forAttribute: textColumn];
		40	[sql appendFormat: @" AND c_path like %@", pathValue];
		41	}
		42	@@ -546,7 +544,7 @@
		43
		44	lastModifiedValue = (NSInteger) [lastModified timeIntervalSince1970];
		45
		46	- if (objectType == -1)
		47	+ if (objectType == (SOGoCacheObjectType) -1)
		48	[NSException raise: @"SOGoCacheIOException"
		49	format: @"object type has not been set for object '%@'",
		50	self];
		51	@@ -576,7 +574,7 @@
		52	@")"),
		53	tableName,
		54	pathValue, parentPathValue, objectType,
		55	- creationDateValue, lastModifiedValue,
		56	+ (int)creationDateValue, (int)lastModifiedValue,
		57	propsValue];
		58	isNew = NO;
		59	}
		60	@@ -590,7 +588,7 @@
		61	@" c_version = %d, c_content = %@"
		62	@" WHERE c_path = %@"),
		63	tableName,
		64	- lastModifiedValue, deletedValue, version, propsValue,
65	+ (int)lastModifiedValue, (int)deletedValue, (int)version, propsValue,
66	pathValue];
67	}
68

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoContentObject.m (+39 lines)
	1	--- SoObjects/SOGo/SOGoContentObject.m.orig 2015-10-08 12:31:02.045459297 +0800
	2	+++ SoObjects/SOGo/SOGoContentObject.m 2015-10-08 12:43:44.313403665 +0800
	3	@@ -94,7 +94,7 @@
	4	{
	5	[self subclassResponsibility: _cmd];
	6
	7	- return nil;
	8	+ return (Class *) nil;
	9	}
	10
	11	- (void) _setRecord: (NSDictionary *) objectRecord
	12	@@ -254,6 +254,9 @@
	13	- (NSException ) moveToFolder: (SOGoGCSFolder ) newFolder
	14	{
	15	[self subclassResponsibility: _cmd];
	16	+
	17	+ // TODO: Add exception handling code and return it
	18	+ return (NSException *) nil;
	19	}
	20
	21	- (NSException *) delete
	22	@@ -345,7 +348,7 @@
	23
	24	/* attempt a save */
	25
	26	- error = [self saveComponent: [[self parsingClass] parseSingleFromSource: [rq contentAsString]]
	27	+ error = [self saveComponent: [(id)[self parsingClass] parseSingleFromSource: [rq contentAsString]]
	28	baseVersion: baseVersion];
	29	if (error)
	30	response = (WOResponse *) error;
	31	@@ -410,7 +413,7 @@
	32	else
	33	length = 0;
	34
	35	- return [NSString stringWithFormat: @"%u", length];
	36	+ return [NSString stringWithFormat: @"%u", (unsigned int)length];
	37	}
	38
	39	- (NSException *) davMoveToTargetObject: (id) _target

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoGCSFolder.m (+27 lines)
	1	--- SoObjects/SOGo/SOGoGCSFolder.m.orig 2015-09-17 02:41:31.000000000 +0800
	2	+++ SoObjects/SOGo/SOGoGCSFolder.m 2015-10-08 13:05:51.848316611 +0800
	3	@@ -376,12 +376,12 @@
	4	if (!displayName)
	5	{
	6	if (activeUserIsOwner)
	7	- displayName = [self _displayNameFromOwner];
	8	+ displayName = [[self _displayNameFromOwner] mutableCopy];
	9	else
	10	{
	11	- displayName = [self _displayNameFromSubscriber];
	12	+ displayName = [[self _displayNameFromSubscriber] mutableCopy];
	13	if (!displayName)
	14	- displayName = [self _displayNameFromOwner];
	15	+ displayName = [[self _displayNameFromOwner] mutableCopy];
	16	}
	17	[displayName retain];
	18	}
	19	@@ -829,7 +829,7 @@
	20	{
	21	currentID = [ids objectAtIndex: count];
	22	names = [[currentID componentsSeparatedByString: @"/"] objectEnumerator];
	23	- deleteObject = self;
	24	+ deleteObject = (SOGoContentObject *)self;
	25	while ((currentName = [names nextObject]))
	26	{
	27	deleteObject = [deleteObject lookupName: currentName

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoGroup.m (+20 lines)
	1	--- SoObjects/SOGo/SOGoGroup.m.orig 2015-10-09 07:05:53.364848141 +0800
	2	+++ SoObjects/SOGo/SOGoGroup.m 2015-10-09 11:05:52.535853113 +0800
	3	@@ -135,7 +135,7 @@
	4	{
	5	NSArray *allSources;
	6	NGLdapEntry *entry;
	7	- NSObject <SOGoSource> *source;
	8	+ NSObject <SOGoSource, SOGoDNSource> *source;
	9	id o;
	10	NSEnumerator *gclasses;
	11	NSString *gclass;
	12	@@ -154,7 +154,7 @@
	13
	14	for (i = 0; i < [allSources count]; i++)
	15	{
	16	- source = [[SOGoUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
	17	+ source = (NSObject <SOGoSource, SOGoDNSource> *) [[SOGoUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
	18
	19	// Our different sources might not all implements groups support
	20	if ([source respondsToSelector: theSelector])

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoObject.m (+29 lines)
	1	--- SoObjects/SOGo/SOGoObject.m.orig 2015-10-08 12:15:33.034523424 +0800
	2	+++ SoObjects/SOGo/SOGoObject.m 2015-10-08 12:28:36.114468163 +0800
	3	@@ -1066,7 +1066,7 @@
	4	[_ms appendFormat:@" name=%@", nameInContainer];
	5	if (container)
	6	[_ms appendFormat:@" container=0x%08X/%@",
	7	- container, [container valueForKey:@"nameInContainer"]];
	8	+ (unsigned int)container, [container valueForKey:@"nameInContainer"]];
	9	}
	10
	11	- (NSString *) description
	12	@@ -1074,7 +1074,7 @@
	13	NSMutableString *ms;
	14
	15	ms = [NSMutableString stringWithCapacity:64];
	16	- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
	17	+ [ms appendFormat:@"<0x%08X[%@]:", (unsigned int) self, NSStringFromClass([self class])];
	18	[self appendAttributesToDescription:ms];
	19	[ms appendString:@">"];
	20
	21	@@ -1084,7 +1084,7 @@
	22	- (NSString *) loggingPrefix
	23	{
	24	return [NSString stringWithFormat:@"<0x%08X[%@]:%@>",
	25	- self, NSStringFromClass([self class]),
	26	+ (unsigned int) self, NSStringFromClass([self class]),
	27	[self nameInContainer]];
	28	}
	29

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.m (+41 lines)
	1	--- SoObjects/SOGo/SOGoParentFolder.m.orig 2015-10-08 13:26:16.671228360 +0800
	2	+++ SoObjects/SOGo/SOGoParentFolder.m 2015-10-08 14:38:57.340927167 +0800
	3	@@ -423,6 +423,38 @@
	4	return error;
	5	}
	6
	7	+- (NSException *) appendCollectedSources
	8	+{
	9	+ GCSChannelManager *cm;
	10	+ EOAdaptorChannel *fc;
	11	+ NSURL *folderLocation;
	12	+ NSString sql, gcsFolderType;
	13	+ NSException *error;
	14	+
	15	+ cm = [GCSChannelManager defaultChannelManager];
	16	+ folderLocation = [[GCSFolderManager defaultFolderManager] folderInfoLocation];
	17	+ fc = [cm acquireOpenChannelForURL: folderLocation];
	18	+ if ([fc isOpen])
	19	+ {
	20	+ gcsFolderType = [[self class] gcsFolderType];
	21	+
	22	+ sql = [NSString stringWithFormat: (@"SELECT c_path4 FROM %@"
	23	+ @" WHERE c_path2 = '%@'"
	24	+ @" AND c_folder_type = '%@'"),
	25	+ [folderLocation gcsTableName], owner, gcsFolderType];
	26	+
	27	+ error = [self fetchSpecialFolders: sql withChannel: fc andFolderType: SOGoCollectedFolder];
	28	+
	29	+ [cm releaseChannel: fc];
	30	+ }
	31	+ else
	32	+ error = [NSException exceptionWithName: @"SOGoDBException"
	33	+ reason: @"database connection could not be open"
	34	+ userInfo: nil];
	35	+
	36	+ return error;
	37	+}
	38	+
	39	- (NSException *) initSubFolders
	40	{
	41	NSException *error;

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_SQLSource.m (+56 lines)
	1	--- SoObjects/SOGo/SQLSource.m.orig 2015-10-08 15:11:51.598793649 +0800
	2	+++ SoObjects/SOGo/SQLSource.m 2015-10-08 15:17:24.502768818 +0800
	3	@@ -880,7 +880,7 @@
	4
	5	reason = [NSString stringWithFormat: @"method '%@' is not available"
	6	@" for class '%@'", NSStringFromSelector (_cmd),
	7	- NSStringFromClass (isa)];
	8	+ NSStringFromClass (object_getClass(self))];
	9
	10	return [NSException exceptionWithName: @"SQLSourceIOException"
	11	reason: reason
	12	@@ -893,7 +893,7 @@
	13
	14	reason = [NSString stringWithFormat: @"method '%@' is not available"
	15	@" for class '%@'", NSStringFromSelector (_cmd),
	16	- NSStringFromClass (isa)];
	17	+ NSStringFromClass (object_getClass(self))];
	18
	19	return [NSException exceptionWithName: @"SQLSourceIOException"
	20	reason: reason
	21	@@ -906,7 +906,7 @@
	22
	23	reason = [NSString stringWithFormat: @"method '%@' is not available"
	24	@" for class '%@'", NSStringFromSelector (_cmd),
	25	- NSStringFromClass (isa)];
	26	+ NSStringFromClass (object_getClass(self))];
	27
	28	return [NSException exceptionWithName: @"SQLSourceIOException"
	29	reason: reason
	30	@@ -932,7 +932,7 @@
	31
	32	reason = [NSString stringWithFormat: @"method '%@' is not available"
	33	@" for class '%@'", NSStringFromSelector (_cmd),
	34	- NSStringFromClass (isa)];
	35	+ NSStringFromClass (object_getClass(self))];
	36
	37	return [NSException exceptionWithName: @"SQLSourceIOException"
	38	reason: reason
	39	@@ -947,7 +947,7 @@
	40
	41	reason = [NSString stringWithFormat: @"method '%@' is not available"
	42	@" for class '%@'", NSStringFromSelector (_cmd),
	43	- NSStringFromClass (isa)];
	44	+ NSStringFromClass (object_getClass(self))];
	45
	46	return [NSException exceptionWithName: @"SQLSourceIOException"
	47	reason: reason
	48	@@ -961,7 +961,7 @@
	49
	50	reason = [NSString stringWithFormat: @"method '%@' is not available"
	51	@" for class '%@'", NSStringFromSelector (_cmd),
	52	- NSStringFromClass (isa)];
	53	+ NSStringFromClass (object_getClass(self))];
	54
	55	return [NSException exceptionWithName: @"SQLSourceIOException"
	56	reason: reason

Line 0 Link Here

(-)sogo/files/patch-SoObjects_SOGo_WORequest+SOGo.m (+35 lines)
	1	--- SoObjects/SOGo/WORequest+SOGo.m.orig 2015-10-09 11:56:27.945647076 +0800
	2	+++ SoObjects/SOGo/WORequest+SOGo.m 2015-10-09 13:30:08.196266262 +0800
	3	@@ -180,14 +180,24 @@
	4	cc = [self clientCapabilities];
	5
	6	b = (
	7	- [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
	8	- && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound
	9	- \|\| (
	10	- [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
	11	- \|\| [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound
	12	- )
	13	- && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound
	14	- );
	15	+ (
	16	+ (
	17	+ [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
	18	+ && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound
	19	+ )
	20	+ \|\|
	21	+ (
	22	+ [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
	23	+ &&
	24	+ (
	25	+ [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound
	26	+ \|\|
	27	+ [[cc userAgent] rangeOfString: @"Mac_OS_X"].location != NSNotFound
	28	+ )
	29	+ )
	30	+ )
	31	+ && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound
	32	+ );
	33
	34	return b;
	35	}

Line 0 Link Here

(-)sogo/files/patch-Tests_Unit_SOGoTest.m (+15 lines)
	1	--- Tests/Unit/SOGoTest.m.orig 2015-10-13 21:27:11.658467928 +0800
	2	+++ Tests/Unit/SOGoTest.m 2015-10-13 21:28:18.545460408 +0800
	3	@@ -245,10 +245,10 @@
	4	sc2 = _stringForCharacterAtIndex(i, str2, length2);
	5
	6	if ([sc1 isEqualToString: sc2])
	7	- finalSTR = [finalSTR stringByAppendingFormat: @"%u \|%@\|\n", i, sc1];
	8	+ finalSTR = [finalSTR stringByAppendingFormat: @"%lu \|%@\|\n", i, sc1];
	9	else
	10	{
	11	- finalSTR = [finalSTR stringByAppendingFormat: @"%u \|%@\|%@\|<--\n", i, sc1, sc2];
	12	+ finalSTR = [finalSTR stringByAppendingFormat: @"%lu \|%@\|%@\|<--\n", i, sc1, sc2];
	13	differencesFound = YES;
	14	}
	15	}

Line 0 Link Here

(-)sogo/files/patch-Tests_Unit_TestNGMimeAddressHeaderFieldGenerator.m (+23 lines)
	1	--- Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m.orig 2015-10-13 23:08:27.577045766 +0800
	2	+++ Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m 2015-10-13 23:20:49.017995327 +0800
	3	@@ -39,8 +39,8 @@
	4	@"<wolfgang@test.com>", // email between brackets
	5	@"\"<wolfgang@test.com>\" <wolfgang@test.com>", // doubled
	6	@"\"wolfgang@inverse.ca\" <wolfgang@test.com>", // with and without br.
	7	- @"Àñinéoblabla <wolfgang@test.com>", // accented full name
	8	- @"Àñinéoblabla Bla Blé <wolfgang@test.com>", // accented and multiword
	9	+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= <wolfgang@test.com>", // accented full name
	10	+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= <wolfgang@test.com>", // accented and multiword
	11	@"Wolfgang Sourdeau \"Bla Bla\" <wolfgang@test.com>", // partly quoted
	12	@"Wolfgang Sourdeau <wolfgang@test.com>", // full name + email
	13	nil };
	14	@@ -50,8 +50,7 @@
	15	@"\"<wolfgang@test.com>\" <wolfgang@test.com>", // doubled
	16	@"\"wolfgang@inverse.ca\" <wolfgang@test.com>", // with and without br.
	17	@"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= <wolfgang@test.com>", // accented full name
	18	- @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= <wolfgang@test.com>", // accented
	19	- // and multiword
	20	+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= <wolfgang@test.com>", // accented and multiword
	21
	22	/* NOTE: the following are wrong but tolerated for now */
	23	@"Wolfgang Sourdeau \"Bla Bla\" <wolfgang@test.com>", // partly quoted

Line 0 Link Here

(-)sogo/files/patch-Tests_Unit_TestVersit.m (+41 lines)
	1	--- Tests/Unit/TestVersit.m.orig 2015-10-13 22:02:35.703319178 +0800
	2	+++ Tests/Unit/TestVersit.m 2015-10-13 22:10:50.805284923 +0800
	3	@@ -34,6 +34,10 @@
	4
	5	- (void) test_rendering
	6	{
	7	+
	8	+#pragma clang diagnostic push
	9	+#pragma clang diagnostic ignored "-Wobjc-string-compare"
	10	+
	11	CardElement *element;
	12	CardVersitRenderer *renderer;
	13	NSString *result;
	14	@@ -137,10 +141,17 @@
	15	testEquals(result, @"ELEM:NONEMPTY=coucou\r\n");
	16
	17	/** tests about parameters handling could be nice */
	18	+
	19	+#pragma clang diagnostic pop
	20	+
	21	}
	22
	23	- (void) test_parsing
	24	{
	25	+
	26	+#pragma clang diagnostic push
	27	+#pragma clang diagnostic ignored "-Wobjc-string-compare"
	28	+
	29	CardGroup *group;
	30	CardElement *element;
	31	NSString *versit;
	32	@@ -201,6 +212,9 @@
	33	element = [group firstChildWithTag: @"element"];
	34	testEquals([element flattenedValueAtIndex: 0 forKey: @""], @"value");
	35	testEquals([element value: 0 ofAttribute: @"param1"], @"paramvalue1, with comma");
	36	+
	37	+#pragma clang diagnostic pop
	38	+
	39	}
	40
	41	@end

Line 0 Link Here

(-)sogo/files/patch-Tests_Unit_TestiCalRecurrenceCalculator.m (+29 lines)
	1	--- Tests/Unit/TestiCalRecurrenceCalculator.m.orig 2015-10-13 22:24:36.211231500 +0800
	2	+++ Tests/Unit/TestiCalRecurrenceCalculator.m 2015-10-13 23:05:47.988057201 +0800
	3	@@ -107,7 +107,7 @@
	4	[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
	5	testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
	6	}
	7	- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
	8	+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
	9	[currentRule objectAtIndex: 1],
	10	[occurrences count],
	11	[currentRule count] - 2];
	12	@@ -211,7 +211,7 @@
	13	[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
	14	testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
	15	}
	16	- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
	17	+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
	18	[currentRule objectAtIndex: 1],
	19	[occurrences count],
	20	[currentRule count] - 2];
	21	@@ -376,7 +376,7 @@
	22	[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
	23	testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
	24	}
	25	- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
	26	+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
	27	[currentRule objectAtIndex: 1],
	28	[occurrences count],
	29	[currentRule count] - 2];

Line 0 Link Here

(-)sogo/files/patch-Tests_Unit_TestiCalTimeZonePeriod.m (+13 lines)
	1	--- Tests/Unit/TestiCalTimeZonePeriod.m.orig 2015-10-13 22:12:21.064282266 +0800
	2	+++ Tests/Unit/TestiCalTimeZonePeriod.m 2015-10-13 22:23:02.608233950 +0800
	3	@@ -80,8 +80,8 @@
	4	testWithMessage ((NSInteger) [testDate timeIntervalSince1970]
	5	== occurrenceSeconds[count],
	6	([NSString stringWithFormat:
	7	- @"test %d: seconds do not match:"
	8	- @" delta = %d", count, delta]));
	9	+ @"test %ld: seconds do not match:"
	10	+ @" delta = %ld", count, delta]));
	11	}
	12	}
	13

Line 0 Link Here

(-)sogo/files/patch-Tools_SOGoEAlarmsNotifier.m (+13 lines)
	1	--- Tools/SOGoEAlarmsNotifier.m.orig 2015-10-13 21:19:28.942510596 +0800
	2	+++ Tools/SOGoEAlarmsNotifier.m 2015-10-13 21:24:03.748478690 +0800
	3	@@ -81,8 +81,8 @@
	4	timestamp = (int) [[NSDate date] timeIntervalSince1970];
	5	pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
	6
	7	- messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%u>",
	8	- pid, timestamp, sequence, random(), [pGUID hash]];
	9	+ messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%lu>",
	10	+ pid, timestamp, sequence, (unsigned int)random(), [pGUID hash]];
	11
	12	return [messageID lowercaseString];
	13	}