aboutsummaryrefslogtreecommitdiff
path: root/www/owncloud
diff options
context:
space:
mode:
authorKevin Lo <kevlo@FreeBSD.org>2016-09-12 05:32:24 +0000
committerKevin Lo <kevlo@FreeBSD.org>2016-09-12 05:32:24 +0000
commit5b6f129cc21e70b5b88d835d5217c7cb9d327d45 (patch)
tree2316a6ef7dc0664f72a2f67d077ef2c92178a0fc /www/owncloud
parentd6d633fec86c612eedb756efa77e1ed1649461d8 (diff)
downloadports-5b6f129cc21e70b5b88d835d5217c7cb9d327d45.tar.gz
ports-5b6f129cc21e70b5b88d835d5217c7cb9d327d45.zip
Notes
Diffstat (limited to 'www/owncloud')
-rw-r--r--www/owncloud/Makefile6
-rw-r--r--www/owncloud/files/patch-core_Controller_LoginController.php11
2 files changed, 16 insertions, 1 deletions
diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index 512675e19122..eeaede533b61 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -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>
diff --git a/www/owncloud/files/patch-core_Controller_LoginController.php b/www/owncloud/files/patch-core_Controller_LoginController.php
new file mode 100644
index 000000000000..6bb0498ba975
--- /dev/null
+++ b/www/owncloud/files/patch-core_Controller_LoginController.php
@@ -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] : [];