main/owncloud: upgrade to 9.1

4 files changed, 31 insertions, 63 deletions

diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD
index 496c20b3a1..ea9324d9e0 100644
--- a/main/owncloud/APKBUILD
+++ b/main/owncloud/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname="owncloud"
-pkgver="9.0.3"
+pkgver="9.1.0"
 pkgrel=0
-_contactsver="0.0.0.91"
-_calendarver="1.1"
-_tasksver="0.8.1"
+_contactsver="0.0.0.133"
+_calendarver="1.3.1"
+ _tasksver="0.9.1"
 _documentsver="$pkgver"
 _pdfviewerver="$pkgver"
 _texteditorver="$pkgver"
@@ -30,7 +30,7 @@ replaces="$pkgname-plugins"
 
 source="https://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2
 	$pkgname-contacts-$_contactsver.tar.gz::https://github.com/owncloud/contacts/releases/download/v$_contactsver/contacts.tar.gz
-	$pkgname-calendar-$_calendarver.tar.gz::https://github.com/owncloud/calendar/archive/v$_calendarver.tar.gz
+	$pkgname-calendar-$_calendarver.tar.gz::https://github.com/owncloud/calendar/releases/download/v$_calendarver/calendar.tar.gz
 	$pkgname-documents-$_documentsver.tar.gz::https://github.com/owncloud/documents/archive/v$_documentsver.tar.gz
 	$pkgname-texteditor-$_texteditorver.tar.gz::https://github.com/owncloud/files_texteditor/archive/v$_texteditorver.tar.gz
 	$pkgname-mozilla_sync-$_mozillasyncver.tar.gz::https://github.com/owncloud/mozilla_sync/archive/v$_mozillasyncver.tar.gz
@@ -38,9 +38,6 @@ source="https://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2
 	$pkgname-pdfviewer-$_pdfviewerver.tar.gz::https://github.com/owncloud/files_pdfviewer/archive/v$_pdfviewerver.tar.gz
 	$pkgname-tasks-$_tasksver.tar.gz::https://github.com/owncloud/tasks/archive/v$_tasksver.tar.gz
 	owncloud.config.php
-
-	owncloud-6-always-return-true-isSetLocaleWorking.patch
-	owncloud-9-disable-chmod.patch
 	"
 pkggroups="www-data"
 
@@ -148,7 +145,7 @@ calendar() {
 	arch="noarch"
 	pkgdesc="ownCloud calendar"
 	depends="owncloud"
-	_mv_app src calendar-$_calendarver
+	_mv_app src calendar
 }
 
 documents() {
@@ -231,39 +228,33 @@ videoplayer() {
 	_mv_app pkg files_videoplayer
 }
 
-md5sums="4271795b245248b8bbd406def8f202cc  owncloud-9.0.3.tar.bz2
-ba43f586f627d855039af3f19a93b03c  owncloud-contacts-0.0.0.91.tar.gz
-3a23fd76d55f7f8306b2eee162729670  owncloud-calendar-1.1.tar.gz
-3c504dcdf3f90d3c9017af2632c35ccb  owncloud-documents-9.0.3.tar.gz
-f89518ba9559d5313703028fde550bad  owncloud-texteditor-9.0.3.tar.gz
+md5sums="b044d7c92c6388608059b89327f4f924  owncloud-9.1.0.tar.bz2
+95e032e0b3b16a001f00ec6f34917781  owncloud-contacts-0.0.0.133.tar.gz
+1241880b1cd241968e895a91ff1426d7  owncloud-calendar-1.3.1.tar.gz
+9f2dd60c5fc70fb5ccb55d1dfc416f5c  owncloud-documents-9.1.0.tar.gz
+2f6dfa9d04a8a0430d7874c95e984ac5  owncloud-texteditor-9.1.0.tar.gz
 e98fdb10ff4139b4259e2a183a88975a  owncloud-mozilla_sync-1.4.tar.gz
 8452cdd43587469e680597a2c10c830e  owncloud-music-0.3.11.zip
-cba871276607414075b81fa46c6ae132  owncloud-pdfviewer-9.0.3.tar.gz
-b12ac39aead677329675c27bb549374a  owncloud-tasks-0.8.1.tar.gz
-2c131b3ed0632bef7c372b6ec09f55cb  owncloud.config.php
-f497dbf3a67d14fc9049ca680673c805  owncloud-6-always-return-true-isSetLocaleWorking.patch
-5e393c5cbfa0dc9f5d4d35dbdef3b839  owncloud-9-disable-chmod.patch"
-sha256sums="5cf45c1b75434496635a58fcbece668bc0abb40f04d8304ce6d01e6b75887f60  owncloud-9.0.3.tar.bz2
-9d17b2dab0e0d2de34d9fd7c2ada20a4c159b3d23698f3ab4862b4a81901db17  owncloud-contacts-0.0.0.91.tar.gz
-6da684c75774b4c9f422011de10bc62352e90e16e80c3d6836578096c6d4de21  owncloud-calendar-1.1.tar.gz
-535af12df2f669b80ce9df5d909b12ca553b3053deb951fb63f8f03c7065c983  owncloud-documents-9.0.3.tar.gz
-b0f98fa3b8388592ad3d2121d01111e3f643496837d4843d139686875595053f  owncloud-texteditor-9.0.3.tar.gz
+548166595a706ee604acab74bb8ba0e8  owncloud-pdfviewer-9.1.0.tar.gz
+b7f587c53a5ec8d97383bfe78a325c48  owncloud-tasks-0.9.1.tar.gz
+36f3ae24d8d1a39eb8bf1a40474d8df7  owncloud.config.php"
+sha256sums="26df5f51ae87f83dba93c130a1929278afe69f9426b877e3c5064034bec28ee3  owncloud-9.1.0.tar.bz2
+72b04c4e21fcdd71a37ad7815ff2094db5829163acd7470d7786c06bc21f6263  owncloud-contacts-0.0.0.133.tar.gz
+7bc53045ec9635ad9655e3acce484b6df48ef1f3e702a91edc8ce6ac7a0adf59  owncloud-calendar-1.3.1.tar.gz
+c25b897d3521b8ef13770a57975cdc4075eb17d8413651f1f33362e8bb7bfd7b  owncloud-documents-9.1.0.tar.gz
+ab825ecdc62c60b14026d343eca2618e249d8ac57a087642efd37d821e4a820a  owncloud-texteditor-9.1.0.tar.gz
 314621c290daee93429d881e78d8cae13faaca3205b23860f06450633c5c3b6a  owncloud-mozilla_sync-1.4.tar.gz
 e480e639e48419977f06822aa92f1245c21a43d9aafc156edb6fd097873a73ca  owncloud-music-0.3.11.zip
-3d3c0c7cf1c0a57b441ced6456e04cc1e75ea2715ce5205d619187710b8b9a32  owncloud-pdfviewer-9.0.3.tar.gz
-1120f7c45c98b3bf790e0842808c1c24e5482bd7f7a5667be2216d0f4e1af2f4  owncloud-tasks-0.8.1.tar.gz
-41b9bcd59604b8150e1a865ab37c2cbbe433d49eb3ef2ba2f55c37b3a8cc41c9  owncloud.config.php
-3466ffbd22d4a9f04f4df862f3fb2f695fd1ca4bc6fb4b6a56258958064d5762  owncloud-6-always-return-true-isSetLocaleWorking.patch
-9739810a5f040ff1488559fb17360b65aec94a4024b2f74437785420336d4d72  owncloud-9-disable-chmod.patch"
-sha512sums="9c38307b696bc61012af4e2c18f6c12c5c64423a556aade7fc8fd5035fea30a3bb4fbae8bbf32748ec1c787b1b2c32885a68d0ba379b7400bcede3e255ddef1d  owncloud-9.0.3.tar.bz2
-0831a360f6ef7ee2cec9e9be83086afde4cbcee3bdb4aaaa4de047c771d698d695ae09bd9f0db6a732c84521e21cb232befc839bb8b624e838be67041e21a8ad  owncloud-contacts-0.0.0.91.tar.gz
-530f2aa92a15389a33e5cb3fe3768918fbe8644cf8cfb645559a924c68739d353c9a923a5ec6c344773833249982b71362b2d384256469a6c235c1c95207c341  owncloud-calendar-1.1.tar.gz
-15886695a2b63dfc90f5d13e25d85bae12643d82171d90eebafde86c173a0c8e5808a6d06e05ca2590abaceb1c41ddb6a8bc4ce1273fe134f3307ca5a566afac  owncloud-documents-9.0.3.tar.gz
-1dde20146a43e123801a3d98e5d2e4de833afd092f8865ab821754b8a4b34abe2f462b111d0ea95b08f0cf957c7605b3af729f1bcf4233e396696e52a12729ba  owncloud-texteditor-9.0.3.tar.gz
+53ba1c3ebf98c39f38417426645a678328e4d806a8155f3fcfb3c97474c78863  owncloud-pdfviewer-9.1.0.tar.gz
+4e01d93e5bf5e2ebad2229799889684214c96badf90937b3c7a93c924789789d  owncloud-tasks-0.9.1.tar.gz
+b981af58dddb50d87935186745bf25a1a4547871f4a7ed0e3d000fabd4ec840c  owncloud.config.php"
+sha512sums="aaf7f9c85ea54613001d9a2f10e8ca6706add81c4d56d1f8466a9b6f7406fdbc9f255fb3714543ab66eb315e61d7cb645d1513b944921d75c7c609c3e4f72384  owncloud-9.1.0.tar.bz2
+cc54d7735fcd3693704516a92686aa8b4a449c743844a9603ae0aa90eeb817711a5b758c4d69bb02551576e9a08e2c2dc34b06d96972c9a3f37757bfbb14e085  owncloud-contacts-0.0.0.133.tar.gz
+65e85b786e43d7999caf8baf03f8da3061842ed552015c30b56b100ff7f7c0fa7250ff115178316a9014b885e2f53e9f721cbec893b2faeefd0f64d9543f51a9  owncloud-calendar-1.3.1.tar.gz
+3df575182c5b750b53907f5e372f3b5ed2ddff98fa9bc976563cece6f65c081a7d6ddd2a23d4348f0d74a6116835bb297188e2e2ab291dc9f5a5dcb9dfe777df  owncloud-documents-9.1.0.tar.gz
+2ea6d65f5349fc014553b65bc243bd0def22551cf78cf051f78d68b87344be0b5262ae049a5aae11bee853c8a8d1e48aa52e7515ef85c0ec80aec2908ab15647  owncloud-texteditor-9.1.0.tar.gz
 a279a6e0109aa3b17442265358284583d846f88afa3746005792b93dffbd3396dc1277ce892b2a226496038ec6e8ec7ef2295b981ef8acf1a3fa3c32886623d0  owncloud-mozilla_sync-1.4.tar.gz
 fde1758a512a960985cbbfde9294f77458fad2cb4801daceedac76a58dbb2862f2586cb17376915cdcb47a768c75be46f863834a96f1148eae98285217491d59  owncloud-music-0.3.11.zip
-8fdddd38caa8ac3b89d61fdd9d34a4e76e922a8d3e8e10af777d860096ff1a91b5a4c1b89ed54ee676678cfe8263ba1903e1be49280d050cb19d82969872ccb0  owncloud-pdfviewer-9.0.3.tar.gz
-5b0880cd86588142d32f77dbcdd3fe7406541b790012528ba8efdceb62d0638a7d4b11e91b5fd3f0c5b4f5cfb3ae8213b28a41b4e7fa0fa0a8e978163175ec00  owncloud-tasks-0.8.1.tar.gz
-b4bd206bff5f4871f023344ea03afd52795876d4563da00ccd026c5d976570dfb0923cd218449395e238a2b23de516f6a655a69539bc5a7d0cb67048c94bb15f  owncloud.config.php
-4b2038786571c62129d748bb71262a7cbc966cf4b97482f13bcedaa36fcfa343080a464fc74463a9bd6615c99a10cd590b91cacead62632db36bfd8940173d13  owncloud-6-always-return-true-isSetLocaleWorking.patch
-62f4c4e5f0c23aea98a3cefdd5f08773fc34039ef444d167063f7b1f4640aee48bd108776e6f28f12acec3833f7bcf6b76aaa300c41f5f3fc8fc536c9f6b7586  owncloud-9-disable-chmod.patch"
+49ad1f9694649d563335433d1202f6256551d17471685acd79d4307c330b556eede6c914aec9776da24f18335616746cbaaa1fc037319b6b338cc73e1a7f7580  owncloud-pdfviewer-9.1.0.tar.gz
+13f383251ee16b59f5dfb17a370df824fcb647760179949537616684c5e663079194dae6190c60cacc5f3bffa44797baaef21808bc4930fe893172fe47f3392e  owncloud-tasks-0.9.1.tar.gz
+bf4fac811c54a45b04301b8a13b8e82e292aff1b2eba835c2af734814eb24c537da140aab77cf38bc793cc2d5b78eee0ac71b237c7e2e4ed683685fe341152dd  owncloud.config.php"
diff --git a/main/owncloud/owncloud-6-always-return-true-isSetLocaleWorking.patch b/main/owncloud/owncloud-6-always-return-true-isSetLocaleWorking.patch
deleted file mode 100644
index 59ce980619..0000000000
--- a/main/owncloud/owncloud-6-always-return-true-isSetLocaleWorking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/private/util.php
-+++ b/lib/private/util.php
-@@ -865,7 +865,7 @@
- 
- 		\Patchwork\Utf8\Bootup::initLocale();
- 		if ('' === basename('§')) {
--			return false;
-+			return true;
- 		}
- 		return true;
- 	}
diff --git a/main/owncloud/owncloud-9-disable-chmod.patch b/main/owncloud/owncloud-9-disable-chmod.patch
deleted file mode 100644
index bd70391c81..0000000000
--- a/main/owncloud/owncloud-9-disable-chmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/private/config.php
-+++ b/lib/private/config.php
-@@ -229,7 +229,8 @@
- 		$filePointer = fopen($this->configFilePath, 'r+');
- 
- 		// Prevent others not to read the config
--		chmod($this->configFilePath, 0640);
-+		// Alpine Linux Development - don't do package's job
-+		// chmod($this->configFilePath, 0640);
- 
- 		// File does not exist, this can happen when doing a fresh install
- 		if(!is_resource ($filePointer)) {
diff --git a/main/owncloud/owncloud.config.php b/main/owncloud/owncloud.config.php
index 9b9e6206fb..67add3472c 100644
--- a/main/owncloud/owncloud.config.php
+++ b/main/owncloud/owncloud.config.php
@@ -15,7 +15,7 @@ $CONFIG = array(
     ),
     */
   ),
-  'version' => '9.0.0',
+  'version' => '9.1.0',
   'dbname' => 'owncloud',
   'dbhost' => 'localhost',
   'dbuser' => 'owncloud',