From owner-svn-ports-all@freebsd.org Tue Jul 26 13:45:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78A5FBA5B68; Tue, 26 Jul 2016 13:45:46 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38C551E32; Tue, 26 Jul 2016 13:45:46 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6QDjjMe074580; Tue, 26 Jul 2016 13:45:45 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6QDjiVj074569; Tue, 26 Jul 2016 13:45:44 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201607261345.u6QDjiVj074569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 26 Jul 2016 13:45:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419107 - in head/www/sogo3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2016 13:45:46 -0000 Author: koobs Date: Tue Jul 26 13:45:44 2016 New Revision: 419107 URL: https://svnweb.freebsd.org/changeset/ports/419107 Log: www/sogo3-activesync: Fix EAS regression in 3.1.4 Sogo 3.1.4 (commited in revision 418789 [1]) introduced a regression causing users to be unable to fetch mail, contacts or calendars via EAS. This was fixed in upstream pull request #217 [2], which this commit backports. [1] http://svnweb.freebsd.org/changeset/ports/418789 [2] https://github.com/inverse-inc/sogo/pull/217 PR: 211237 Submitted by: Martin Waschbüsch Approved by: Euan Thoms (maintainer) Added: head/www/sogo3/files/patch-ActiveSync_SOGoMailObject+ActiveSync.m (contents, props changed) head/www/sogo3/files/patch-ActiveSync_iCalEvent+ActiveSync.m (contents, props changed) head/www/sogo3/files/patch-ActiveSync_iCalToDo+ActiveSync.m (contents, props changed) Modified: head/www/sogo3/Makefile head/www/sogo3/files/patch-ActiveSync_GNUmakefile head/www/sogo3/files/patch-Main_GNUmakefile.preamble head/www/sogo3/files/patch-Tests_Unit_GNUmakefile head/www/sogo3/files/patch-Tools_GNUmakefile.preamble head/www/sogo3/files/patch-configure Modified: head/www/sogo3/Makefile ============================================================================== --- head/www/sogo3/Makefile Tue Jul 26 13:11:40 2016 (r419106) +++ head/www/sogo3/Makefile Tue Jul 26 13:45:44 2016 (r419107) @@ -3,6 +3,7 @@ PORTNAME= sogo3 PORTVERSION= 3.1.4 +PORTREVISION= 1 CATEGORIES= www gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOGo-${PORTVERSION} Modified: head/www/sogo3/files/patch-ActiveSync_GNUmakefile ============================================================================== --- head/www/sogo3/files/patch-ActiveSync_GNUmakefile Tue Jul 26 13:11:40 2016 (r419106) +++ head/www/sogo3/files/patch-ActiveSync_GNUmakefile Tue Jul 26 13:45:44 2016 (r419107) @@ -1,4 +1,4 @@ ---- ActiveSync/GNUmakefile.orig 2015-11-11 19:25:43 UTC +--- ActiveSync/GNUmakefile.orig 2016-07-12 16:56:33 UTC +++ ActiveSync/GNUmakefile @@ -34,7 +34,7 @@ ActiveSync_RESOURCE_FILES += \ ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations Added: head/www/sogo3/files/patch-ActiveSync_SOGoMailObject+ActiveSync.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sogo3/files/patch-ActiveSync_SOGoMailObject+ActiveSync.m Tue Jul 26 13:45:44 2016 (r419107) @@ -0,0 +1,53 @@ +--- ActiveSync/SOGoMailObject+ActiveSync.m.orig 2016-07-20 04:33:03 UTC ++++ ActiveSync/SOGoMailObject+ActiveSync.m +@@ -1003,7 +1003,7 @@ struct GlobalObjectId { + [s appendFormat: @"%@", [globalObjId activeSyncRepresentationInContext: context]]; + + // We set the right message type - we must set AS version to 14.1 for this +- if ([[context valueForKey: @"ASProtocolVersion"] floatValue] >= 14.1) ++ if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 14.1) + [s appendFormat: @"%d", 1]; + + [s appendString: @""]; +@@ -1169,7 +1169,7 @@ struct GlobalObjectId { + truncated = 0; + } + +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + { + [s appendFormat: @"%@", content]; + [s appendFormat: @"%d", truncated]; +@@ -1204,7 +1204,7 @@ struct GlobalObjectId { + { + int i; + +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + [s appendString: @""]; + else + [s appendString: @""]; +@@ -1219,12 +1219,12 @@ struct GlobalObjectId { + // FileReference must be a unique identifier across the whole store. We use the following structure: + // mail// + // mail/INBOX/2 +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + [s appendFormat: @"mail/%@/%@/%@", [[[self container] relativeImap4Name] stringByEscapingURL], [self nameInContainer], [value objectForKey: @"path"]]; + else + [s appendFormat: @"mail/%@/%@/%@", [[[self container] relativeImap4Name] stringByEscapingURL], [self nameInContainer], [value objectForKey: @"path"]]; + +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + { + [s appendFormat: @"%d", 1]; + [s appendFormat: @"%d", [[value objectForKey: @"size"] intValue]]; +@@ -1273,7 +1273,7 @@ struct GlobalObjectId { + [s appendFormat: @""]; + } + +- if ([[context valueForKey: @"ASProtocolVersion"] floatValue] >= 14.0) ++ if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 14.0) + { + id value; + NSString *reference; Added: head/www/sogo3/files/patch-ActiveSync_iCalEvent+ActiveSync.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sogo3/files/patch-ActiveSync_iCalEvent+ActiveSync.m Tue Jul 26 13:45:44 2016 (r419107) @@ -0,0 +1,20 @@ +--- ActiveSync/iCalEvent+ActiveSync.m.orig 2016-07-20 04:33:18 UTC ++++ ActiveSync/iCalEvent+ActiveSync.m +@@ -244,7 +244,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details. + o = [o activeSyncRepresentationInContext: context]; + +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + { + [s appendFormat: @"%@", o]; + [s appendString: @"0"]; +@@ -487,7 +487,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + } + + // FIXME: merge with iCalToDo +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + { + if ((o = [theValues objectForKey: @"Body"])) + [self setComment: o]; Added: head/www/sogo3/files/patch-ActiveSync_iCalToDo+ActiveSync.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sogo3/files/patch-ActiveSync_iCalToDo+ActiveSync.m Tue Jul 26 13:45:44 2016 (r419107) @@ -0,0 +1,20 @@ +--- ActiveSync/iCalToDo+ActiveSync.m.orig 2016-07-20 04:33:29 UTC ++++ ActiveSync/iCalToDo+ActiveSync.m +@@ -127,7 +127,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details. + o = [o activeSyncRepresentationInContext: context]; + +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + { + [s appendFormat: @"%@", o]; + [s appendString: @"0"]; +@@ -161,7 +161,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + [self setSummary: o]; + + // FIXME: merge with iCalEvent +- if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) ++ if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"]) + { + if ((o = [theValues objectForKey: @"Body"])) + [self setComment: o]; Modified: head/www/sogo3/files/patch-Main_GNUmakefile.preamble ============================================================================== --- head/www/sogo3/files/patch-Main_GNUmakefile.preamble Tue Jul 26 13:11:40 2016 (r419106) +++ head/www/sogo3/files/patch-Main_GNUmakefile.preamble Tue Jul 26 13:45:44 2016 (r419107) @@ -1,4 +1,4 @@ ---- Main/GNUmakefile.preamble.orig 2015-09-16 18:41:29 UTC +--- Main/GNUmakefile.preamble.orig 2016-07-12 16:56:34 UTC +++ Main/GNUmakefile.preamble @@ -22,4 +22,4 @@ $(SOGOD)_TOOL_LIBS += \ -lNGObjWeb \ Modified: head/www/sogo3/files/patch-Tests_Unit_GNUmakefile ============================================================================== --- head/www/sogo3/files/patch-Tests_Unit_GNUmakefile Tue Jul 26 13:11:40 2016 (r419106) +++ head/www/sogo3/files/patch-Tests_Unit_GNUmakefile Tue Jul 26 13:45:44 2016 (r419107) @@ -1,7 +1,7 @@ ---- Tests/Unit/GNUmakefile.orig 2015-09-16 18:41:31 UTC +--- Tests/Unit/GNUmakefile.orig 2016-07-12 16:56:44 UTC +++ Tests/Unit/GNUmakefile -@@ -35,7 +35,10 @@ $(TEST_TOOL)_CPPFLAGS += \ - -Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/ +@@ -43,7 +43,10 @@ $(TEST_TOOL)_CPPFLAGS += \ + -Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/ -I../../OpenChange ADDITIONAL_LIB_DIRS += \ - -L../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc \ Modified: head/www/sogo3/files/patch-Tools_GNUmakefile.preamble ============================================================================== --- head/www/sogo3/files/patch-Tools_GNUmakefile.preamble Tue Jul 26 13:11:40 2016 (r419106) +++ head/www/sogo3/files/patch-Tools_GNUmakefile.preamble Tue Jul 26 13:45:44 2016 (r419107) @@ -1,4 +1,4 @@ ---- Tools/GNUmakefile.preamble.orig 2015-09-16 18:41:31 UTC +--- Tools/GNUmakefile.preamble.orig 2016-07-12 16:56:44 UTC +++ Tools/GNUmakefile.preamble @@ -13,4 +13,5 @@ ADDITIONAL_LIB_DIRS += \ -L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \ Modified: head/www/sogo3/files/patch-configure ============================================================================== --- head/www/sogo3/files/patch-configure Tue Jul 26 13:11:40 2016 (r419106) +++ head/www/sogo3/files/patch-configure Tue Jul 26 13:45:44 2016 (r419107) @@ -1,4 +1,4 @@ ---- configure.orig 2016-07-06 11:37:52 UTC +--- configure.orig 2016-07-12 16:56:55 UTC +++ configure @@ -1,4 +1,4 @@ -#!/bin/bash