svn commit: r414579 - in head/www/owncloud: . files

[Kevin Lo]

Author: kevlo
Date: Wed May  4 03:21:39 2016
New Revision: 414579
URL: https://svnweb.freebsd.org/changeset/ports/414579

Log:
  Add upstream patch to make ownCloud work in php 7.0.6
  
  PR:	209226
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl>

Added:
  head/www/owncloud/files/patch-lib_private_appframework_http_request.php   (contents, props changed)
Modified:
  head/www/owncloud/Makefile

Modified: head/www/owncloud/Makefile
==============================================================================
--- head/www/owncloud/Makefile	Wed May  4 03:12:35 2016	(r414578)
+++ head/www/owncloud/Makefile	Wed May  4 03:21:39 2016	(r414579)
@@ -2,7 +2,7 @@
 
 PORTNAME=	owncloud
 PORTVERSION=	9.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
 
@@ -22,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
@@ -56,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}'
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/data

Added: head/www/owncloud/files/patch-lib_private_appframework_http_request.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/owncloud/files/patch-lib_private_appframework_http_request.php	Wed May  4 03:21:39 2016	(r414579)
@@ -0,0 +1,12 @@
+--- lib/private/appframework/http/request.php.orig	2016-05-04 03:03:50 UTC
++++ lib/private/appframework/http/request.php
+@@ -264,6 +264,9 @@ class Request implements \ArrayAccess, \
+ 	 * @return bool
+ 	 */
+ 	public function __isset($name) {
++		if (in_array($name, $this->allowedKeys, true)) {
++			return true;
++		}
+ 		return isset($this->items['parameters'][$name]);
+ 	}
+