mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
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>
This commit is contained in:
parent
d6d633fec8
commit
5b6f129cc2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=421908
@ -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>
|
||||
|
11
www/owncloud/files/patch-core_Controller_LoginController.php
Normal file
11
www/owncloud/files/patch-core_Controller_LoginController.php
Normal file
@ -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] : [];
|
Loading…
Reference in New Issue
Block a user