From owner-svn-ports-head@freebsd.org Mon Sep 12 05:32:26 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FEC8BD6BF8; Mon, 12 Sep 2016 05:32:26 +0000 (UTC) (envelope-from kevlo@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 mx1.freebsd.org (Postfix) with ESMTPS id EAFBAA06; Mon, 12 Sep 2016 05:32:25 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C5WPE9067756; Mon, 12 Sep 2016 05:32:25 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C5WPm9067753; Mon, 12 Sep 2016 05:32:25 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201609120532.u8C5WPm9067753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Mon, 12 Sep 2016 05:32:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421908 - in head/www/owncloud: . files X-SVN-Group: ports-head 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.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 05:32:26 -0000 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 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 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] : [];