Date: Mon, 12 Sep 2016 05:32:25 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421908 - in head/www/owncloud: . files Message-ID: <201609120532.u8C5WPm9067753@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Mon Sep 12 05:32:24 2016 New Revision: 421908 URL: https://svnweb.freebsd.org/changeset/ports/421908 Log: Fix This issue that prevents most users from using Owncloud on a new install. Upstream bugreport for reference: https://github.com/owncloud/core/issues/25714 Submitted by: Kyle Kneisl <kylekneisl@gmail.com> Added: head/www/owncloud/files/patch-core_Controller_LoginController.php (contents, props changed) Modified: head/www/owncloud/Makefile Modified: head/www/owncloud/Makefile ============================================================================== --- head/www/owncloud/Makefile Mon Sep 12 05:15:44 2016 (r421907) +++ head/www/owncloud/Makefile Mon Sep 12 05:32:24 2016 (r421908) @@ -2,6 +2,7 @@ PORTNAME= owncloud PORTVERSION= 9.1.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.owncloud.org/community/ @@ -21,6 +22,8 @@ USE_OPENSSL= yes OWNCLOUD_USERNAME?= ${WWWOWN} OWNCLOUD_GROUPNAME?= ${WWWGRP} +IGNORE_FILES= ! -name *\.orig + WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes @@ -55,7 +58,8 @@ WITH_OPENSSL_PORT= yes do-install: @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} '${IGNORE_FILES}' @${MKDIR} ${STAGEDIR}${WWWDIR}/data .include <bsd.port.mk> Added: head/www/owncloud/files/patch-core_Controller_LoginController.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/owncloud/files/patch-core_Controller_LoginController.php Mon Sep 12 05:32:24 2016 (r421908) @@ -0,0 +1,11 @@ +--- core/Controller/LoginController.php.orig 2016-09-12 05:18:21 UTC ++++ core/Controller/LoginController.php +@@ -185,7 +185,7 @@ class LoginController extends Controller + } + if ($loginResult === false) { + $this->session->set('loginMessages', [ +- ['invalidpassword'] ++ ['invalidpassword'], [] + ]); + // Read current user and append if possible - we need to return the unmodified user otherwise we will leak the login name + $args = !is_null($user) ? ['user' => $originalUser] : [];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609120532.u8C5WPm9067753>