4 files changed, 32 insertions, 69 deletions

diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index 4a630666ade9..1edb3a741630 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	owncloud
-PORTVERSION=	9.0.1
-PORTREVISION=	3
+PORTVERSION=	9.0.2
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
 
@@ -22,8 +21,6 @@ USE_OPENSSL=	yes
 OWNCLOUD_USERNAME?=	${WWWOWN}
 OWNCLOUD_GROUPNAME?=	${WWWGRP}
 
-IGNORE_FILES=	! -name *\.orig
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
@@ -58,8 +55,7 @@ WITH_OPENSSL_PORT=	yes
 
 do-install:
 	@${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}
-	@cd ${WRKSRC} && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} '${IGNORE_FILES}'
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/data
diff --git a/www/owncloud/distinfo b/www/owncloud/distinfo
index bcab1d6469a9..37ca2464ae54 100644
--- a/www/owncloud/distinfo
+++ b/www/owncloud/distinfo
@@ -1,2 +1,2 @@
-SHA256 (owncloud-9.0.1.tar.bz2) = 44c98ffa3b957faf3af884cafa1d88c05762b65452592768a926e2c3c3a66615
-SIZE (owncloud-9.0.1.tar.bz2) = 24700669
+SHA256 (owncloud-9.0.2.tar.bz2) = 845c43fe981fa0fd07fc3708f41f1ea15ecb11c2a15c65a4de191fc85b237c74
+SIZE (owncloud-9.0.2.tar.bz2) = 24487988
diff --git a/www/owncloud/files/patch-lib_private_appframework_http_request.php b/www/owncloud/files/patch-lib_private_appframework_http_request.php
deleted file mode 100644
index 0886e884d8f0..000000000000
--- a/www/owncloud/files/patch-lib_private_appframework_http_request.php
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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]);
- 	}
- 
diff --git a/www/owncloud/pkg-plist b/www/owncloud/pkg-plist
index 25b8cd1bce4d..85793696fe00 100644
--- a/www/owncloud/pkg-plist
+++ b/www/owncloud/pkg-plist
@@ -7948,9 +7948,12 @@
 %%WWWDIR%%/core/doc/admin/_images/deprecs-3.png
 %%WWWDIR%%/core/doc/admin/_images/documents_app_enable.png
 %%WWWDIR%%/core/doc/admin/_images/documents_apply_test.png
-%%WWWDIR%%/core/doc/admin/_images/dropbox-allowshare.png
-%%WWWDIR%%/core/doc/admin/_images/dropbox-app.png
-%%WWWDIR%%/core/doc/admin/_images/dropbox-configapp.png
+%%WWWDIR%%/core/doc/admin/_images/dropbox-1.png
+%%WWWDIR%%/core/doc/admin/_images/dropbox-2.png
+%%WWWDIR%%/core/doc/admin/_images/dropbox-3.png
+%%WWWDIR%%/core/doc/admin/_images/dropbox-4.png
+%%WWWDIR%%/core/doc/admin/_images/dropbox-5.png
+%%WWWDIR%%/core/doc/admin/_images/dropbox-6.png
 %%WWWDIR%%/core/doc/admin/_images/dropbox-oc.png
 %%WWWDIR%%/core/doc/admin/_images/dropbox.png
 %%WWWDIR%%/core/doc/admin/_images/enable-app.png
@@ -8016,8 +8019,6 @@
 %%WWWDIR%%/core/doc/admin/_images/ldap-wizard-4-group.png
 %%WWWDIR%%/core/doc/admin/_images/local.png
 %%WWWDIR%%/core/doc/admin/_images/logging-1.png
-%%WWWDIR%%/core/doc/admin/_images/lucene-search-enable.png
-%%WWWDIR%%/core/doc/admin/_images/lucene-search-user.png
 %%WWWDIR%%/core/doc/admin/_images/mount_options.png
 %%WWWDIR%%/core/doc/admin/_images/oc_admin_app_page.png
 %%WWWDIR%%/core/doc/admin/_images/oracle-1.png
@@ -8068,7 +8069,6 @@
 %%WWWDIR%%/core/doc/admin/_sources/configuration_database/db_conversion.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_database/index.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_database/linux_database_configuration.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_database/oracle_db_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/big_file_upload_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/collaborative_documents_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/default_files_configuration.txt
@@ -8088,6 +8088,7 @@
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/external_storage_configuration_gui.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/federated_cloud_sharing_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/file_sharing_configuration.txt
+%%WWWDIR%%/core/doc/admin/_sources/configuration_files/file_versioning.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/files_locking_transactional.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/index.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_files/previews_configuration.txt
@@ -8109,14 +8110,9 @@
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/knowledgebase_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/language_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/logging_configuration.txt
+%%WWWDIR%%/core/doc/admin/_sources/configuration_server/oc_server_tuning.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/occ_command.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_server/performance_tuning/database_best_practice.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_server/performance_tuning/index.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_server/performance_tuning/oc_server_tuning.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_server/performance_tuning/ssl_encryption_app.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_server/performance_tuning/webserver_tips.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/reverse_proxy_configuration.txt
-%%WWWDIR%%/core/doc/admin/_sources/configuration_server/search_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/security_setup_warnings.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/thirdparty_php_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_user/index.txt
@@ -8146,6 +8142,7 @@
 %%WWWDIR%%/core/doc/admin/_sources/enterprise_installation/index.txt
 %%WWWDIR%%/core/doc/admin/_sources/enterprise_installation/license_keys_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/enterprise_installation/linux_installation.txt
+%%WWWDIR%%/core/doc/admin/_sources/enterprise_installation/oracle_db_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/enterprise_installation/supported_apps_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/enterprise_logging/enterprise_logging_apps.txt
 %%WWWDIR%%/core/doc/admin/_sources/enterprise_logging/index.txt
@@ -8162,8 +8159,6 @@
 %%WWWDIR%%/core/doc/admin/_sources/installation/index.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/installation_wizard.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/linux_installation.txt
-%%WWWDIR%%/core/doc/admin/_sources/installation/php_54_installation.txt
-%%WWWDIR%%/core/doc/admin/_sources/installation/php_55_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/selinux_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/source_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/system_requirements.txt
@@ -8277,7 +8272,6 @@
 %%WWWDIR%%/core/doc/admin/configuration_database/db_conversion.html
 %%WWWDIR%%/core/doc/admin/configuration_database/index.html
 %%WWWDIR%%/core/doc/admin/configuration_database/linux_database_configuration.html
-%%WWWDIR%%/core/doc/admin/configuration_database/oracle_db_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_files/big_file_upload_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_files/collaborative_documents_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_files/default_files_configuration.html
@@ -8297,6 +8291,7 @@
 %%WWWDIR%%/core/doc/admin/configuration_files/external_storage_configuration_gui.html
 %%WWWDIR%%/core/doc/admin/configuration_files/federated_cloud_sharing_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_files/file_sharing_configuration.html
+%%WWWDIR%%/core/doc/admin/configuration_files/file_versioning.html
 %%WWWDIR%%/core/doc/admin/configuration_files/files_locking_transactional.html
 %%WWWDIR%%/core/doc/admin/configuration_files/index.html
 %%WWWDIR%%/core/doc/admin/configuration_files/previews_configuration.html
@@ -8318,14 +8313,9 @@
 %%WWWDIR%%/core/doc/admin/configuration_server/knowledgebase_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_server/language_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_server/logging_configuration.html
+%%WWWDIR%%/core/doc/admin/configuration_server/oc_server_tuning.html
 %%WWWDIR%%/core/doc/admin/configuration_server/occ_command.html
-%%WWWDIR%%/core/doc/admin/configuration_server/performance_tuning/database_best_practice.html
-%%WWWDIR%%/core/doc/admin/configuration_server/performance_tuning/index.html
-%%WWWDIR%%/core/doc/admin/configuration_server/performance_tuning/oc_server_tuning.html
-%%WWWDIR%%/core/doc/admin/configuration_server/performance_tuning/ssl_encryption_app.html
-%%WWWDIR%%/core/doc/admin/configuration_server/performance_tuning/webserver_tips.html
 %%WWWDIR%%/core/doc/admin/configuration_server/reverse_proxy_configuration.html
-%%WWWDIR%%/core/doc/admin/configuration_server/search_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_server/security_setup_warnings.html
 %%WWWDIR%%/core/doc/admin/configuration_server/thirdparty_php_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_user/index.html
@@ -8355,6 +8345,7 @@
 %%WWWDIR%%/core/doc/admin/enterprise_installation/index.html
 %%WWWDIR%%/core/doc/admin/enterprise_installation/license_keys_installation.html
 %%WWWDIR%%/core/doc/admin/enterprise_installation/linux_installation.html
+%%WWWDIR%%/core/doc/admin/enterprise_installation/oracle_db_configuration.html
 %%WWWDIR%%/core/doc/admin/enterprise_installation/supported_apps_installation.html
 %%WWWDIR%%/core/doc/admin/enterprise_logging/enterprise_logging_apps.html
 %%WWWDIR%%/core/doc/admin/enterprise_logging/index.html
@@ -8372,8 +8363,6 @@
 %%WWWDIR%%/core/doc/admin/installation/index.html
 %%WWWDIR%%/core/doc/admin/installation/installation_wizard.html
 %%WWWDIR%%/core/doc/admin/installation/linux_installation.html
-%%WWWDIR%%/core/doc/admin/installation/php_54_installation.html
-%%WWWDIR%%/core/doc/admin/installation/php_55_installation.html
 %%WWWDIR%%/core/doc/admin/installation/selinux_configuration.html
 %%WWWDIR%%/core/doc/admin/installation/source_installation.html
 %%WWWDIR%%/core/doc/admin/installation/system_requirements.html
@@ -8398,35 +8387,13 @@
 %%WWWDIR%%/core/doc/admin/search.html
 %%WWWDIR%%/core/doc/admin/searchindex.js
 %%WWWDIR%%/core/doc/admin/whats_new_admin.html
-%%WWWDIR%%/core/doc/user/_images/bookmark_addurl.png
-%%WWWDIR%%/core/doc/user/_images/bookmark_setting.png
-%%WWWDIR%%/core/doc/user/_images/calendar_caldav_icon.png
-%%WWWDIR%%/core/doc/user/_images/calendar_caldav_ios.png
-%%WWWDIR%%/core/doc/user/_images/calendar_caldav_link.png
-%%WWWDIR%%/core/doc/user/_images/calendar_create_event.png
-%%WWWDIR%%/core/doc/user/_images/calendar_create_new.png
-%%WWWDIR%%/core/doc/user/_images/calendar_default.png
-%%WWWDIR%%/core/doc/user/_images/calendar_newtimezone1.png
-%%WWWDIR%%/core/doc/user/_images/calendar_settings.png
-%%WWWDIR%%/core/doc/user/_images/contact_address_book_add.png
-%%WWWDIR%%/core/doc/user/_images/contact_bottombar.png
-%%WWWDIR%%/core/doc/user/_images/contact_crop.jpg
-%%WWWDIR%%/core/doc/user/_images/contact_new.png
-%%WWWDIR%%/core/doc/user/_images/contact_picture.png
-%%WWWDIR%%/core/doc/user/_images/contact_picture_default.png
-%%WWWDIR%%/core/doc/user/_images/contact_syncopt.jpg
 %%WWWDIR%%/core/doc/user/_images/contact_thunderbird-Symbol_Gear.jpg
 %%WWWDIR%%/core/doc/user/_images/contact_thunderbird-Symbol_Impeller.jpg
 %%WWWDIR%%/core/doc/user/_images/contact_thunderbird-URL_config.jpg
-%%WWWDIR%%/core/doc/user/_images/contact_uploadbutton.png
-%%WWWDIR%%/core/doc/user/_images/contact_vcfpick.jpg
-%%WWWDIR%%/core/doc/user/_images/contacts_empty.png
-%%WWWDIR%%/core/doc/user/_images/contacts_settings.png
 %%WWWDIR%%/core/doc/user/_images/create_public_share-6.png
 %%WWWDIR%%/core/doc/user/_images/create_public_share-8.png
 %%WWWDIR%%/core/doc/user/_images/create_public_share-9.png
 %%WWWDIR%%/core/doc/user/_images/direct-share-1.png
-%%WWWDIR%%/core/doc/user/_images/download.png
 %%WWWDIR%%/core/doc/user/_images/encryption1.png
 %%WWWDIR%%/core/doc/user/_images/encryption2.png
 %%WWWDIR%%/core/doc/user/_images/encryption3.png
@@ -8451,7 +8418,6 @@
 %%WWWDIR%%/core/doc/user/_images/files_versioning.png
 %%WWWDIR%%/core/doc/user/_images/gallery-1.png
 %%WWWDIR%%/core/doc/user/_images/gallery-2.png
-%%WWWDIR%%/core/doc/user/_images/gear.png
 %%WWWDIR%%/core/doc/user/_images/kdes.png
 %%WWWDIR%%/core/doc/user/_images/kdes1.png
 %%WWWDIR%%/core/doc/user/_images/kdes2.png
@@ -8474,7 +8440,6 @@
 %%WWWDIR%%/core/doc/user/_images/video_player_2.png
 %%WWWDIR%%/core/doc/user/_images/webdav_dolphin.png
 %%WWWDIR%%/core/doc/user/_images/webdav_gnome3_nautilus.png
-%%WWWDIR%%/core/doc/user/_sources/bookmarks.txt
 %%WWWDIR%%/core/doc/user/_sources/contents.txt
 %%WWWDIR%%/core/doc/user/_sources/documents.txt
 %%WWWDIR%%/core/doc/user/_sources/external_storage/external_storage.txt
@@ -8593,7 +8558,6 @@
 %%WWWDIR%%/core/doc/user/_static/up-pressed.png
 %%WWWDIR%%/core/doc/user/_static/up.png
 %%WWWDIR%%/core/doc/user/_static/websupport.js
-%%WWWDIR%%/core/doc/user/bookmarks.html
 %%WWWDIR%%/core/doc/user/contents.html
 %%WWWDIR%%/core/doc/user/documents.html
 %%WWWDIR%%/core/doc/user/external_storage/external_storage.html
@@ -9782,6 +9746,7 @@
 %%WWWDIR%%/lib/private/releasenotes.php
 %%WWWDIR%%/lib/private/repair.php
 %%WWWDIR%%/lib/private/repair/assetcache.php
+%%WWWDIR%%/lib/private/repair/brokenupdaterrepair.php
 %%WWWDIR%%/lib/private/repair/cleantags.php
 %%WWWDIR%%/lib/private/repair/collation.php
 %%WWWDIR%%/lib/private/repair/dropoldjobs.php
@@ -10107,6 +10072,21 @@
 %%WWWDIR%%/resources/config/ca-bundle.crt
 %%WWWDIR%%/resources/config/mimetypealiases.dist.json
 %%WWWDIR%%/resources/config/mimetypemapping.dist.json
+%%WWWDIR%%/resources/updater-fixes/composer.json
+%%WWWDIR%%/resources/updater-fixes/composer.lock
+%%WWWDIR%%/resources/updater-fixes/composer/LICENSE
+%%WWWDIR%%/resources/updater-fixes/composer/autoload_classmap.php
+%%WWWDIR%%/resources/updater-fixes/composer/installed.json
+%%WWWDIR%%/resources/updater-fixes/icewind/streams/src/DirectoryFilter.php
+%%WWWDIR%%/resources/updater-fixes/icewind/streams/src/DirectoryWrapper.php
+%%WWWDIR%%/resources/updater-fixes/icewind/streams/src/RetryWrapper.php
+%%WWWDIR%%/resources/updater-fixes/icewind/streams/src/SeekableWrapper.php
+%%WWWDIR%%/resources/updater-fixes/sabre/dav/CHANGELOG.md
+%%WWWDIR%%/resources/updater-fixes/sabre/dav/composer.json
+%%WWWDIR%%/resources/updater-fixes/sabre/dav/lib/CalDAV/Plugin.php
+%%WWWDIR%%/resources/updater-fixes/sabre/dav/lib/CardDAV/Backend/PDO.php
+%%WWWDIR%%/resources/updater-fixes/sabre/dav/lib/DAV/CorePlugin.php
+%%WWWDIR%%/resources/updater-fixes/sabre/dav/lib/DAV/Version.php
 %%WWWDIR%%/robots.txt
 %%WWWDIR%%/settings/admin.php
 %%WWWDIR%%/settings/ajax/disableapp.php
@@ -10731,7 +10711,6 @@
 %%WWWDIR%%/updater/vendor/symfony/console/Question/ConfirmationQuestion.php
 %%WWWDIR%%/updater/vendor/symfony/console/Question/Question.php
 %%WWWDIR%%/updater/vendor/symfony/console/README.md
-%%WWWDIR%%/updater/vendor/symfony/console/Resources/bin/hiddeninput.exe
 %%WWWDIR%%/updater/vendor/symfony/console/Shell.php
 %%WWWDIR%%/updater/vendor/symfony/console/Style/OutputStyle.php
 %%WWWDIR%%/updater/vendor/symfony/console/Style/StyleInterface.php