Attachment #190052 for bug #225449

View | Details | Raw Unified | Return to bug 225449
Collapse All | Expand All

Lines 1-7 Link Here

(-)www/nextcloud/Makefile (-2 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= nextcloud	3	PORTNAME= nextcloud
4	PORTVERSION= 12.0.4	4	PORTVERSION= 12.0.5
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://download.nextcloud.com/server/prereleases/	6	MASTER_SITES= https://download.nextcloud.com/server/prereleases/
7		7
Lines 42-47 Link Here
42	SMB_RUN_DEPENDS= pecl-smbclient>=0.8.0:net/pecl-smbclient	42	SMB_RUN_DEPENDS= pecl-smbclient>=0.8.0:net/pecl-smbclient
43	SSL_USE= PHP=openssl	43	SSL_USE= PHP=openssl
44		44
		45	.include <bsd.port.pre.mk>
		46
		47	.if !empty(PORT_OPTIONS:MPGSQL) && ${PGSQL_VER} >= 10
		48	EXTRA_PATCHES= ${FILESDIR}/extra-patch-PostgreSQL-10
		49	.endif
		50
45	post-patch:	51	post-patch:
46	@${REINPLACE_CMD} -e 's\|/var/www/\|${WWWDIR}\|' ${WRKSRC}/config/config.sample.php	52	@${REINPLACE_CMD} -e 's\|/var/www/\|${WWWDIR}\|' ${WRKSRC}/config/config.sample.php
47		53
Lines 51-54 Link Here
51	@${RM} ${STAGEDIR}${WWWDIR}/updater/updater.phar	57	@${RM} ${STAGEDIR}${WWWDIR}/updater/updater.phar
52	@${MKDIR} ${STAGEDIR}${WWWDIR}/data	58	@${MKDIR} ${STAGEDIR}${WWWDIR}/data
53		59
54	.include <bsd.port.mk>	60	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)www/nextcloud/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1512583484	1	TIMESTAMP = 1516883682
2	SHA256 (nextcloud-12.0.4.tar.bz2) = 654161a74ceaf9a60c7731d7d6702e6710a972633a97955d16f01abeb09d09b6	2	SHA256 (nextcloud-12.0.5.tar.bz2) = c8be29ace6821079e881818266fe49d28812b5aa0c7d2e76511173d48828ca43
3	SIZE (nextcloud-12.0.4.tar.bz2) = 43583313	3	SIZE (nextcloud-12.0.5.tar.bz2) = 43704324




--- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php.orig	2017-11-27 09:11:23 UTC
+++ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
@@ -289,7 +289,16 @@ class PostgreSqlSchemaManager extends Ab
             $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']);
     }

Return to bug 225449

Lines 1-20 Link Here

(-)www/nextcloud/files/patch-3rdparty_doctrine_dbal_lib_Doctrine_DBAL_Schema_PostgreSqlSchemaManager.php (-20 lines)
1	--- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php.orig 2017-11-27 09:11:23 UTC
2	+++ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
3	@@ -289,7 +289,16 @@ class PostgreSqlSchemaManager extends Ab
4	$sequenceName = $sequence['relname'];
5	}
6
7	- $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
8	+ $version = floatval($this->_conn->getWrappedConnection()->getServerVersion());
9	+
10	+ if ($version >= 10) {
11	+ $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM pg_sequences WHERE schemaname = \'public\' AND sequencename = '.$this->_conn->quote($sequenceName));
12	+ }
13	+ else
14	+ {
15	+ $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
16	+ }
17	+// $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
18
19	return new Sequence($sequenceName, $data[0]['increment_by'], $data[0]['min_value']);
20	}

Lines 3971-3976 Link Here

(-)www/nextcloud/pkg-plist (-1 / +84 lines)
3971	%%WWWDIR%%/apps/activity/l10n/bg.json	3971	%%WWWDIR%%/apps/activity/l10n/bg.json
3972	%%WWWDIR%%/apps/activity/l10n/bn_BD.js	3972	%%WWWDIR%%/apps/activity/l10n/bn_BD.js
3973	%%WWWDIR%%/apps/activity/l10n/bn_BD.json	3973	%%WWWDIR%%/apps/activity/l10n/bn_BD.json
		3974	%%WWWDIR%%/apps/activity/l10n/br.js
		3975	%%WWWDIR%%/apps/activity/l10n/br.json
3974	%%WWWDIR%%/apps/activity/l10n/ca.js	3976	%%WWWDIR%%/apps/activity/l10n/ca.js
3975	%%WWWDIR%%/apps/activity/l10n/ca.json	3977	%%WWWDIR%%/apps/activity/l10n/ca.json
3976	%%WWWDIR%%/apps/activity/l10n/cs.js	3978	%%WWWDIR%%/apps/activity/l10n/cs.js
Lines 4437-4442 Link Here
4437	%%WWWDIR%%/apps/dav/l10n/en_GB.json	4439	%%WWWDIR%%/apps/dav/l10n/en_GB.json
4438	%%WWWDIR%%/apps/dav/l10n/es.js	4440	%%WWWDIR%%/apps/dav/l10n/es.js
4439	%%WWWDIR%%/apps/dav/l10n/es.json	4441	%%WWWDIR%%/apps/dav/l10n/es.json
		4442	%%WWWDIR%%/apps/dav/l10n/es_419.js
		4443	%%WWWDIR%%/apps/dav/l10n/es_419.json
4440	%%WWWDIR%%/apps/dav/l10n/es_AR.js	4444	%%WWWDIR%%/apps/dav/l10n/es_AR.js
4441	%%WWWDIR%%/apps/dav/l10n/es_AR.json	4445	%%WWWDIR%%/apps/dav/l10n/es_AR.json
4442	%%WWWDIR%%/apps/dav/l10n/es_CL.js	4446	%%WWWDIR%%/apps/dav/l10n/es_CL.js
Lines 4469-4474 Link Here
4469	%%WWWDIR%%/apps/dav/l10n/es_SV.json	4473	%%WWWDIR%%/apps/dav/l10n/es_SV.json
4470	%%WWWDIR%%/apps/dav/l10n/es_UY.js	4474	%%WWWDIR%%/apps/dav/l10n/es_UY.js
4471	%%WWWDIR%%/apps/dav/l10n/es_UY.json	4475	%%WWWDIR%%/apps/dav/l10n/es_UY.json
		4476	%%WWWDIR%%/apps/dav/l10n/et_EE.js
		4477	%%WWWDIR%%/apps/dav/l10n/et_EE.json
4472	%%WWWDIR%%/apps/dav/l10n/eu.js	4478	%%WWWDIR%%/apps/dav/l10n/eu.js
4473	%%WWWDIR%%/apps/dav/l10n/eu.json	4479	%%WWWDIR%%/apps/dav/l10n/eu.json
4474	%%WWWDIR%%/apps/dav/l10n/fi.js	4480	%%WWWDIR%%/apps/dav/l10n/fi.js
Lines 4575-4581 Link Here
4575	%%WWWDIR%%/apps/dav/lib/CardDAV/ImageExportPlugin.php	4581	%%WWWDIR%%/apps/dav/lib/CardDAV/ImageExportPlugin.php
4576	%%WWWDIR%%/apps/dav/lib/CardDAV/PhotoCache.php	4582	%%WWWDIR%%/apps/dav/lib/CardDAV/PhotoCache.php
4577	%%WWWDIR%%/apps/dav/lib/CardDAV/Plugin.php	4583	%%WWWDIR%%/apps/dav/lib/CardDAV/Plugin.php
4578	%%WWWDIR%%/apps/dav/lib/CardDAV/SyncJob.php
4579	%%WWWDIR%%/apps/dav/lib/CardDAV/SyncService.php	4584	%%WWWDIR%%/apps/dav/lib/CardDAV/SyncService.php
4580	%%WWWDIR%%/apps/dav/lib/CardDAV/UserAddressBooks.php	4585	%%WWWDIR%%/apps/dav/lib/CardDAV/UserAddressBooks.php
4581	%%WWWDIR%%/apps/dav/lib/CardDAV/Xml/Groups.php	4586	%%WWWDIR%%/apps/dav/lib/CardDAV/Xml/Groups.php
Lines 4704-4709 Link Here
4704	%%WWWDIR%%/apps/encryption/l10n/eo.json	4709	%%WWWDIR%%/apps/encryption/l10n/eo.json
4705	%%WWWDIR%%/apps/encryption/l10n/es.js	4710	%%WWWDIR%%/apps/encryption/l10n/es.js
4706	%%WWWDIR%%/apps/encryption/l10n/es.json	4711	%%WWWDIR%%/apps/encryption/l10n/es.json