community/nextcloud: upgrade to 13.0.0-rc2

4 files changed, 16 insertions, 47 deletions

diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index dd0b19e4ed..6507860817 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=nextcloud
-pkgver=12.0.4
-pkgrel=1
+_pkgver="13.0.0RC2"
+pkgver=${_pkgver/RC/_rc}
+pkgrel=0
 pkgdesc="A safe home for all your data"
 url="http://nextcloud.com"
 arch="noarch"
@@ -18,14 +19,14 @@ provides="$pkgname-dav=$pkgver-r$pkgrel
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade"
 subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
 	$pkgname-default-apps:_default_apps"
-source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
+# source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
+source="https://download.nextcloud.com/server/prereleases/nextcloud-$_pkgver.zip
 	nextcloud10-dont-chmod.patch
 	dont-update-htaccess.patch
 	disable-integrity-check-as-default.patch
 	app-encryption-info-add-mcrypt.patch
 	iconv-ascii-translit-not-supported.patch
 	use-external-docs-if-local-not-avail.patch
-	postgresql10.patch
 
 	$pkgname-config.php
 	$pkgname.logrotate
@@ -98,7 +99,7 @@ package() {
 	# Let's not ship upstream's 'updatenotification' app and updater, which
 	# has zero chance of working and a big chance of blowing things up.
 	rm -r ./$wwwdir/apps/updatenotification \
-		./$wwwdir/updater
+		./$wwwdir/lib/private/Updater
 
 	# Replace bundled CA bundle with ours.
 	ln -sf /etc/ssl/certs/ca-certificates.crt ./$wwwdir/resources/config/ca-bundle.crt
@@ -222,14 +223,13 @@ _package_app() {
 	mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/
 }
 
-sha512sums="723f373b8be2fb4c44fdc90f1f357db36c56ea4740597983e2684872ce068e4c12028c3c8584ab1a71ba6df20285db4d15c82c2d22bea8eeaacc061a74c2375c  nextcloud-12.0.4.zip
+sha512sums="c8629f1a22f9c99885760e86d7fe0d5d6b41753c1bb28d18f560fb44aedfae300051f46749f9c7b4904daaab979bd3fa53a922506f30b4c882fb0f991d66efd8  nextcloud-13.0.0RC2.zip
 9c20237c4952ff543171768160c17c3608cc43ad9592fecccaeb337787d566f039f27f30f118359dfff7db58cd12d811c05be15e5994efee57a9ed75787d71f5  nextcloud10-dont-chmod.patch
-ec3921d4d463ed82be0be073af8064048a20f638424d1d39ab46db4252036e87ef2614570be91a5cef0c25c6bcaaf1a2725d2468bdb4a0fbee2b504a4dd0fbc8  dont-update-htaccess.patch
+aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731  dont-update-htaccess.patch
 04783385ca35be9e8b895e91294b082cd2a1f50c4e17dc195901885ecd421db9a6fe45360d7eac623873ae4efad80b92f31ebde59f4ed76d832c8cac450dac85  disable-integrity-check-as-default.patch
-8d3cb1436aa79f1ac0a7b4b3370fcfb5c50dbe811e631cabcb8170fb80da5967a88a15bc39cd04eaccffb3177bdf90fcba2a512e28e034e16d6bc9b445d2d137  app-encryption-info-add-mcrypt.patch
+d6f951cbcb7ca48beb88d77e02a8669677e87bc32189b1eb7e63edc29c293bd6e1ee471c37b622e6b38fd2baf6cf198c872f92b256ffab17c92c31a3a05b5aa0  app-encryption-info-add-mcrypt.patch
 9bd1cdb73928d8e746286a8ededf79262835caee8fdb4a18e117535ed95784b5a0b04fad55c720084dd8ae1ed4fe123be55b41d3100c9bb0333af485084bc4b1  iconv-ascii-translit-not-supported.patch
 478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430  use-external-docs-if-local-not-avail.patch
-98cc88b4c6f24c1704be3fc4eed61d702ea8c126f4a73e5d72e50f04b46d1196b31b7ef218b7392ba334a5af6dd44de21564e05185fba654482f56b97bfa8510  postgresql10.patch
 89c941e2719629ee633421c4c75b55026c1a0a6b255e7f1f2c14612c10325045051b16dc5f17975af4a2a34ec187008de2eb15a53ac4cd06d26a5cbbd79fb73a  nextcloud-config.php
 f224d72799ee5819979089eb58978225454223bee597c938681a4f6279eb49297fe9250ac54ccf8bcb33ae262bce43d085affb77723492ee662263710d4008c9  nextcloud.logrotate
 35cf156839215113b5d8fb8842b4c1e19a50be3c16be7048879fdd808674e4875dbacf3e2dd884fd182258595b7a137d7d3c2dc602a7ff5613c8b65fae0abe67  nextcloud.confd
diff --git a/community/nextcloud/app-encryption-info-add-mcrypt.patch b/community/nextcloud/app-encryption-info-add-mcrypt.patch
index f115fdbead..35b7557ab5 100644
--- a/community/nextcloud/app-encryption-info-add-mcrypt.patch
+++ b/community/nextcloud/app-encryption-info-add-mcrypt.patch
@@ -4,11 +4,12 @@ dependencies can be read in info.xml).
 
 --- a/apps/encryption/appinfo/info.xml
 +++ b/apps/encryption/appinfo/info.xml
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
  	</types>
  	<dependencies>
  		<lib>openssl</lib>
 +		<lib>mcrypt</lib>
- 		<nextcloud min-version="12" max-version="12" />
+ 		<nextcloud min-version="13" max-version="13" />
  	</dependencies>
  	<settings>
+
diff --git a/community/nextcloud/dont-update-htaccess.patch b/community/nextcloud/dont-update-htaccess.patch
index d0e3eb8cc6..aecaebc715 100644
--- a/community/nextcloud/dont-update-htaccess.patch
+++ b/community/nextcloud/dont-update-htaccess.patch
@@ -4,27 +4,15 @@ Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nex
 
 --- a/core/register_command.php
 +++ b/core/register_command.php
-@@ -124,7 +125,6 @@
+@@ -135,7 +135,6 @@
  	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
  	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
  	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 -	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+ 	$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
  
- 	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
- 	$application->add(new OC\Core\Command\Maintenance\Repair(
---- a/lib/private/Setup.php
-+++ b/lib/private/Setup.php
-@@ -387,10 +387,6 @@
- 			// out that this is indeed an ownCloud data directory
- 			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
- 
--			// Update .htaccess files
--			Setup::updateHtaccess();
--			Setup::protectDataDirectory();
--
- 			self::installBackgroundJobs();
- 
- 			//and we are done
+ 	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
+
 --- a/lib/private/Updater.php
 +++ b/lib/private/Updater.php
 @@ -233,14 +233,6 @@
diff --git a/community/nextcloud/postgresql10.patch b/community/nextcloud/postgresql10.patch
deleted file mode 100644
index 7b1a6f40be..0000000000
--- a/community/nextcloud/postgresql10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php.orig  2017-11-05 15:37:27.538064270 +0100
-+++ b/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php 2017-11-05 15:38:54.014644323 +0100
-@@ -289,7 +289,16 @@
-             $sequenceName = $sequence['relname'];
-         }
- 
--        $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
-+        $version = floatval($this->_conn->getWrappedConnection()->getServerVersion());
-+
-+        if ($version >= 10) {
-+           $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM pg_sequences WHERE schemaname = \'public\' AND sequencename = '.$this->_conn->quote($sequenceName));
-+        }
-+        else
-+        {
-+            $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
-+        }
-+//        $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
- 
-         return new Sequence($sequenceName, $data[0]['increment_by'], $data[0]['min_value']);
-     }