From owner-svn-ports-head@freebsd.org Sun May 17 15:31:08 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 95C262DC84C;
Sun, 17 May 2020 15:31:08 +0000 (UTC)
(envelope-from brnrd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 49Q5hX3Kxvz4TDH;
Sun, 17 May 2020 15:31:08 +0000 (UTC)
(envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5467A1291A;
Sun, 17 May 2020 15:31:08 +0000 (UTC)
(envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04HFV8nm083548;
Sun, 17 May 2020 15:31:08 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04HFV7oc083546;
Sun, 17 May 2020 15:31:07 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <202005171531.04HFV7oc083546@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 17 May 2020 15:31:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r535555 - in head/www/nextcloud: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: in head/www/nextcloud: . files
X-SVN-Commit-Revision: 535555
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 May 2020 15:31:08 -0000
Author: brnrd
Date: Sun May 17 15:31:07 2020
New Revision: 535555
URL: https://svnweb.freebsd.org/changeset/ports/535555
Log:
www/nextcloud: Fix install issue Talk app
PR: 246474
Submitted by: grembo
Added:
head/www/nextcloud/files/patch-Issue19433 (contents, props changed)
Modified:
head/www/nextcloud/Makefile
Modified: head/www/nextcloud/Makefile
==============================================================================
--- head/www/nextcloud/Makefile Sun May 17 15:10:44 2020 (r535554)
+++ head/www/nextcloud/Makefile Sun May 17 15:31:07 2020 (r535555)
@@ -2,7 +2,7 @@
PORTNAME= nextcloud
DISTVERSION= 18.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://download.nextcloud.com/server/releases/
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
Added: head/www/nextcloud/files/patch-Issue19433
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nextcloud/files/patch-Issue19433 Sun May 17 15:31:07 2020 (r535555)
@@ -0,0 +1,36 @@
+From 3894dcb756e9c5501e063d6c44af9712f3ef44c1 Mon Sep 17 00:00:00 2001
+From: Joas Schilling <coding@schilljs.com>
+Date: Fri, 14 Feb 2020 11:56:23 +0100
+Subject: [PATCH] Hardcode Talk namespace to fix install due to global route
+
+Signed-off-by: Joas Schilling <coding@schilljs.com>
+---
+ lib/private/AppFramework/App.php | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php
+index a36e013cb68..2cbe623bb27 100644
+--- lib/private/AppFramework/App.php.orig
++++ lib/private/AppFramework/App.php
+@@ -68,8 +68,19 @@ public static function buildAppNamespace(string $appId, string $topNamespace='OC
+ if (isset($appInfo['namespace'])) {
+ self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
+ } else {
+- // if the tag is not found, fall back to uppercasing the first letter
+- self::$nameSpaceCache[$appId] = ucfirst($appId);
++ if ($appId !== 'spreed') {
++ // if the tag is not found, fall back to uppercasing the first letter
++ self::$nameSpaceCache[$appId] = ucfirst($appId);
++ } else {
++ // For the Talk app (appid spreed) the above fallback doesn't work.
++ // This leads to a problem when trying to install it freshly,
++ // because the apps namespace is already registered before the
++ // app is downloaded from the appstore, because of the hackish
++ // global route index.php/call/{token} which is registered via
++ // the core/routes.php so it does not have the app namespace.
++ // @ref https://github.com/nextcloud/server/pull/19433
++ self::$nameSpaceCache[$appId] = 'Talk';
++ }
+ }
+
+ return $topNamespace . self::$nameSpaceCache[$appId];