Update to SOGo-5.0.0

3 files changed, 11 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46c8dc091907..aa565d743ec7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = sogo
 	pkgdesc = groupware server built around OpenGroupware.org (OGo) and the SOPE application server
-	pkgver = 4.3.2
-	pkgrel = 2
+	pkgver = 5.0.0
+	pkgrel = 1
 	url = http://www.sogo.nu/
 	install = sogo.install
 	arch = x86_64
 	license = GPL
 	makedepends = gcc-objc
 	makedepends = gnustep-make
-	depends = sope>=4.3.2
+	depends = sope>=5.0.0
 	depends = gnustep-base
 	depends = libmemcached
 	depends = memcached
@@ -27,18 +27,16 @@ pkgbase = sogo
 	backup = etc/sogo/sogo.conf
 	backup = etc/httpd/conf/extra/SOGo.conf
 	backup = etc/conf.d/sogo
-	source = http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-4.3.2.tar.gz
+	source = http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-5.0.0.tar.gz
 	source = sogo.service
 	source = sogo.confd
 	source = sogo_configure.patch
 	source = gcc10-fix.patch
-	source = patch-gnustep-base-1.27.patch
-	sha256sums = ecf22e7763a3113ac86a891abbd0e50f7eac19275428798c34cf742cc83a446b
+	sha256sums = 9002554017ac1324672f7e8de5fc68dea0b7d27640b0e54e1c5b9a88cfddff7d
 	sha256sums = 0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c
 	sha256sums = 8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7
 	sha256sums = e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1
 	sha256sums = 3ed561519ad2a635869dd1d961329b557e1fa8fff0b0c4bc7e0b40926a35b13a
-	sha256sums = 663a9887ce7b31d6d6f4a54e7fe2d84dc2a569a5844a3194f8b9d7ee479f7c67
 
 pkgname = sogo
 
diff --git a/PKGBUILD b/PKGBUILD
index 8311d47e4665..42fe6b807fc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor:  Andre Wayand <aur-sogo@awayand.sleepmail.com>
 pkgname=sogo
 pkgdesc="groupware server built around OpenGroupware.org (OGo) and the SOPE application server"
-pkgver=4.3.2
-pkgrel=2
+pkgver=5.0.0
+pkgrel=1
 arch=('x86_64')
 url="http://www.sogo.nu/"
 license=('GPL')
@@ -14,7 +14,7 @@ replaces=('sogo2')
 install=sogo.install
 makedepends=('gcc-objc'
              'gnustep-make')
-depends=("sope>=${pkgver}" 
+depends=("sope>=${pkgver}"
          'gnustep-base'
          'libmemcached'
          'memcached'
@@ -35,21 +35,18 @@ source=("http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-${pkgver}.tar.gz"
         "sogo.service"
         "sogo.confd"
         "sogo_configure.patch"
-        "gcc10-fix.patch"
-        "patch-gnustep-base-1.27.patch")
-sha256sums=('ecf22e7763a3113ac86a891abbd0e50f7eac19275428798c34cf742cc83a446b'
+        "gcc10-fix.patch")
+sha256sums=('9002554017ac1324672f7e8de5fc68dea0b7d27640b0e54e1c5b9a88cfddff7d'
             '0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c'
             '8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7'
             'e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1'
-            '3ed561519ad2a635869dd1d961329b557e1fa8fff0b0c4bc7e0b40926a35b13a'
-            '663a9887ce7b31d6d6f4a54e7fe2d84dc2a569a5844a3194f8b9d7ee479f7c67')
+            '3ed561519ad2a635869dd1d961329b557e1fa8fff0b0c4bc7e0b40926a35b13a')
 
 prepare() {
   cd "$srcdir/SOGo-${pkgver}"
 
   patch configure ../sogo_configure.patch
   patch -Np1 -i ../gcc10-fix.patch
-  patch -Np1 -i ../patch-gnustep-base-1.27.patch
 }
 
 build() {
diff --git a/patch-gnustep-base-1.27.patch b/patch-gnustep-base-1.27.patch
deleted file mode 100644
index 2aca56d5fd12..000000000000
--- a/patch-gnustep-base-1.27.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
-index 6465236ec..b32e45360 100644
---- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
-+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
-@@ -2211,7 +2211,7 @@ FIXME
- 
-                    // Cache-entry still exists but folder doesn't exists or synchronize flag is not set.
-                    // We ignore the folder and wait for foldersync to do the cleanup.
--                   if (!(mfCollection && [mfCollection synchronize]))
-+                   if (!(mfCollection && [(SOGoGCSFolder*)mfCollection synchronize]))
-                      {
-                        if (debugOn)
-                          [self logWithFormat: @"EAS - Folder %@ not found. Ignoring ...", folderName];
-@@ -2245,7 +2245,7 @@ FIXME
-               realCollectionId = [folderName realCollectionIdWithFolderType: &mergedFolderType];
-               mfCollection = [self collectionFromId: realCollectionId  type: mergedFolderType];
- 
--              if (!(mfCollection && [mfCollection synchronize]))
-+              if (!(mfCollection && [(SOGoGCSFolder*)mfCollection synchronize]))
-                 {
-                   if (debugOn)
-                     [self logWithFormat: @"EAS - Folder %@ not found. Reset personal folder to cleanup", folderName];
-diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
-index 907612c47..0f1b98642 100644
---- a/ActiveSync/SOGoActiveSyncDispatcher.m
-+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
-@@ -977,7 +977,7 @@ void handle_eas_terminate(int signum)
- 	       }
- 
-              // Remove the folder from device if it doesn't exist, or don't want to sync it.
--             if (!currentFolder || !([currentFolder synchronize]))
-+             if (!currentFolder || !([(SOGoGCSFolder*)currentFolder synchronize]))
-                {
-                  // Don't send a delete when MergedFoler is set, we have done it above.
-                  // Windows Phones don't like when a <Delete>-folder is sent twice.
-@@ -1135,7 +1135,7 @@ void handle_eas_terminate(int signum)
-          continue;
- 
-        if (![currentFolder isKindOfClass: [SOGoGCSFolder class]] ||
--           ![currentFolder synchronize])
-+           ![(SOGoGCSFolder*)currentFolder synchronize])
-          {
-            [folders removeObjectAtIndex: count];
-            continue;