Update to SOGo-5.6.0

3 files changed, 15 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a810d8702b42..efe25f28bbbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sogo
 	pkgdesc = groupware server built around OpenGroupware.org (OGo) and the SOPE application server
-	pkgver = 5.5.1
+	pkgver = 5.6.0
 	pkgrel = 1
 	url = http://www.sogo.nu/
 	install = sogo.install
@@ -8,7 +8,7 @@ pkgbase = sogo
 	license = GPL
 	makedepends = gcc-objc
 	makedepends = gnustep-make
-	depends = sope>=5.5.1
+	depends = sope>=5.6.0
 	depends = gnustep-base
 	depends = libmemcached
 	depends = memcached
@@ -33,11 +33,11 @@ pkgbase = sogo
 	backup = etc/sogo/sogo.conf
 	backup = etc/httpd/conf/extra/SOGo.conf
 	backup = etc/conf.d/sogo
-	source = https://packages.inverse.ca/SOGo/sources/SOGo-5.5.1.tar.gz
+	source = https://packages.inverse.ca/SOGo/sources/SOGo-5.6.0.tar.gz
 	source = sogo.service
 	source = sogo.confd
-	sha256sums = acde56d070c301f35d4893ec1824a18527bf00f0220ec14cd7cc5c9475b5e830
-	sha256sums = 7565a09d2b9daebaf2814a2bb55bf5bcae4cd3c72426f14a7ad6cd07e337c68b
-	sha256sums = 8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7
+	sha512sums = 61f7da4500d11907326a2ee656f143e4942e19a259a726239132ffa43c157027aa0677d60fd6497d45ee838923bc6d8b9e3449adfce41f8f36d237fc870ec7fb
+	sha512sums = 73de6719ba3c17fb03dba4c7390f1e99ac4adff4c3413b6031ebb807fcef8a3f5eb0b8e3767a9560c2106b2f3470447b52803f5bd2f562b382e99c6382be2879
+	sha512sums = 51803a53f5ae32017281e3c891ae21c126a6adc10529669bd659cc4bffaeaae46a59db34c0c97bbc83e9e3be5e619e4ced170e18b31c1267d3c14ce20b54ccf4
 
 pkgname = sogo
diff --git a/PKGBUILD b/PKGBUILD
index 5138f076b60c..f0a317c96d6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor:  Andre Wayand <aur-sogo@awayand.sleepmail.com>
 pkgname=sogo
 pkgdesc="groupware server built around OpenGroupware.org (OGo) and the SOPE application server"
-pkgver=5.5.1
+pkgver=5.6.0
 pkgrel=1
 arch=('x86_64')
 url="http://www.sogo.nu/"
@@ -40,9 +40,9 @@ backup=('etc/sogo/sogo.conf'
 source=("https://packages.inverse.ca/SOGo/sources/SOGo-${pkgver}.tar.gz"
         "sogo.service"
         "sogo.confd")
-sha256sums=('acde56d070c301f35d4893ec1824a18527bf00f0220ec14cd7cc5c9475b5e830'
-            '7565a09d2b9daebaf2814a2bb55bf5bcae4cd3c72426f14a7ad6cd07e337c68b'
-            '8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7')
+sha512sums=('61f7da4500d11907326a2ee656f143e4942e19a259a726239132ffa43c157027aa0677d60fd6497d45ee838923bc6d8b9e3449adfce41f8f36d237fc870ec7fb'
+            '73de6719ba3c17fb03dba4c7390f1e99ac4adff4c3413b6031ebb807fcef8a3f5eb0b8e3767a9560c2106b2f3470447b52803f5bd2f562b382e99c6382be2879'
+            '51803a53f5ae32017281e3c891ae21c126a6adc10529669bd659cc4bffaeaae46a59db34c0c97bbc83e9e3be5e619e4ced170e18b31c1267d3c14ce20b54ccf4')
 
 build() {
   cd "SOGo-${pkgver}"
@@ -62,11 +62,7 @@ package() {
   install -D -m 0644 "${srcdir}"/SOGo-${pkgver}/Scripts/logrotate \
                      "${pkgdir}"/etc/logrotate.d/sogo
   install -d -m 0755 "${pkgdir}"/usr/lib/sogo/scripts
-  install    -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-update-2.2.17_to_2.3.0{,-mysql}.sh \
-                      "${pkgdir}"/usr/lib/sogo/scripts/
-  install    -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-update-3.0.0-to-combined{,-mysql}.sh \
-                      "${pkgdir}"/usr/lib/sogo/scripts/
-  install    -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-update-3.2.10_to_4.0.0{,-mysql}.sh \
+  install    -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-*.sh \
                       "${pkgdir}"/usr/lib/sogo/scripts/
   install -D -m 0644 "${srcdir}"/sogo.confd \
                      "${pkgdir}"/etc/conf.d/sogo
diff --git a/sogo.install b/sogo.install
index 154630ae2a83..00da42e21efb 100644
--- a/sogo.install
+++ b/sogo.install
@@ -5,8 +5,7 @@ post_install() {
   /usr/sbin/systemctl daemon-reload
   echo "NOTE: If migrating from a version of SOGo prior to 2.3.0, you must run the SQL"
   echo "update script(s) for your SQL server, located in /usr/lib/sogo/scripts."
-  echo "WARNING: Do not run the 3.0.0-to-combined scripts unless you intend to move"
-  echo "to the new table format. Please consult the documentation before doing so."
+  echo "Please consult the documentation before doing so."
 
 }
 
@@ -17,8 +16,7 @@ pre_remove() {
 
 post_upgrade() {
   /usr/sbin/systemctl daemon-reload
-  echo "NOTE: If upgrading from a version of SOGo prior to 2.3.0, you must run the SQL"
-  echo "update script(s) for your SQL server, located in /usr/lib/sogo/scripts."
-  echo "WARNING: Do not run the 3.0.0-to-combined script unless you intend to move"
-  echo "to the new table format. Please consult the documentation before doing so."
+  echo "NOTE: If upgrading SOGo, you must run the SQL update script(s)"
+  echo "applicable to your upgrade, located in /usr/lib/sogo/scripts."
+  echo "Please consult the documentation before doing so."
 }