Update to 9.1.1

4 files changed, 15 insertions, 34 deletions

diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index eeaede533b61..a9ed6eae31e9 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	owncloud
-PORTVERSION=	9.1.0
-PORTREVISION=	1
+PORTVERSION=	9.1.1
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
 
diff --git a/www/owncloud/distinfo b/www/owncloud/distinfo
index b64a2693783c..a7c470d0c485 100644
--- a/www/owncloud/distinfo
+++ b/www/owncloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469152672
-SHA256 (owncloud-9.1.0.tar.bz2) = 26df5f51ae87f83dba93c130a1929278afe69f9426b877e3c5064034bec28ee3
-SIZE (owncloud-9.1.0.tar.bz2) = 29055490
+TIMESTAMP = 1476407508
+SHA256 (owncloud-9.1.1.tar.bz2) = a6bf3531ebb7e09a11aaae641bc3af933f339261424782841c640bf9df1ba7b9
+SIZE (owncloud-9.1.1.tar.bz2) = 28984910
diff --git a/www/owncloud/files/patch-core_Controller_LoginController.php b/www/owncloud/files/patch-core_Controller_LoginController.php
deleted file mode 100644
index 6bb0498ba975..000000000000
--- a/www/owncloud/files/patch-core_Controller_LoginController.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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] : [];
diff --git a/www/owncloud/pkg-plist b/www/owncloud/pkg-plist
index d63279cdcbb4..8fe393c0eff9 100644
--- a/www/owncloud/pkg-plist
+++ b/www/owncloud/pkg-plist
@@ -6540,6 +6540,7 @@
 %%WWWDIR%%/apps/files_trashbin/lib/Capabilities.php
 %%WWWDIR%%/apps/files_trashbin/lib/Command/CleanUp.php
 %%WWWDIR%%/apps/files_trashbin/lib/Command/Expire.php
+%%WWWDIR%%/apps/files_trashbin/lib/Command/ExpireTrash.php
 %%WWWDIR%%/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php
 %%WWWDIR%%/apps/files_trashbin/lib/Expiration.php
 %%WWWDIR%%/apps/files_trashbin/lib/Helper.php
@@ -6706,6 +6707,7 @@
 %%WWWDIR%%/apps/files_versions/lib/Capabilities.php
 %%WWWDIR%%/apps/files_versions/lib/Command/CleanUp.php
 %%WWWDIR%%/apps/files_versions/lib/Command/Expire.php
+%%WWWDIR%%/apps/files_versions/lib/Command/ExpireVersions.php
 %%WWWDIR%%/apps/files_versions/lib/Expiration.php
 %%WWWDIR%%/apps/files_versions/lib/Hooks.php
 %%WWWDIR%%/apps/files_versions/lib/Storage.php
@@ -8246,6 +8248,8 @@
 %%WWWDIR%%/core/doc/admin/_images/google-drive6.png
 %%WWWDIR%%/core/doc/admin/_images/google-drive8.png
 %%WWWDIR%%/core/doc/admin/_images/google-drive9.png
+%%WWWDIR%%/core/doc/admin/_images/import-ssl-cert-1.png
+%%WWWDIR%%/core/doc/admin/_images/import-ssl-cert-2.png
 %%WWWDIR%%/core/doc/admin/_images/install-wizard-a.png
 %%WWWDIR%%/core/doc/admin/_images/install-wizard-a1.png
 %%WWWDIR%%/core/doc/admin/_images/install-wizard-a2.png
@@ -8275,11 +8279,6 @@
 %%WWWDIR%%/core/doc/admin/_images/phpinfo.png
 %%WWWDIR%%/core/doc/admin/_images/preview_images.png
 %%WWWDIR%%/core/doc/admin/_images/rackspace.png
-%%WWWDIR%%/core/doc/admin/_images/scaling-1.png
-%%WWWDIR%%/core/doc/admin/_images/scaling-2.png
-%%WWWDIR%%/core/doc/admin/_images/scaling-3.png
-%%WWWDIR%%/core/doc/admin/_images/scaling-4.png
-%%WWWDIR%%/core/doc/admin/_images/scaling-5.png
 %%WWWDIR%%/core/doc/admin/_images/security-setup-warning-1.png
 %%WWWDIR%%/core/doc/admin/_images/sharepoint-1.png
 %%WWWDIR%%/core/doc/admin/_images/sharepoint-2.png
@@ -8315,6 +8314,7 @@
 %%WWWDIR%%/core/doc/admin/_images/workflow-2.png
 %%WWWDIR%%/core/doc/admin/_images/workflow-3.png
 %%WWWDIR%%/core/doc/admin/_images/workflow-4.png
+%%WWWDIR%%/core/doc/admin/_images/workflow-5.png
 %%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
@@ -8354,7 +8354,9 @@
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/email_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/external_sites.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/harden_server.txt
+%%WWWDIR%%/core/doc/admin/_sources/configuration_server/import_ssl_cert.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/index.txt
+%%WWWDIR%%/core/doc/admin/_sources/configuration_server/index_php_less_urls.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/js_css_asset_management_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/knowledgebase_configuration.txt
 %%WWWDIR%%/core/doc/admin/_sources/configuration_server/language_configuration.txt
@@ -8429,10 +8431,6 @@
 %%WWWDIR%%/core/doc/admin/_sources/maintenance/restore.txt
 %%WWWDIR%%/core/doc/admin/_sources/maintenance/update.txt
 %%WWWDIR%%/core/doc/admin/_sources/maintenance/upgrade.txt
-%%WWWDIR%%/core/doc/admin/_sources/operations/considerations_on_monitoring.txt
-%%WWWDIR%%/core/doc/admin/_sources/operations/index.txt
-%%WWWDIR%%/core/doc/admin/_sources/operations/scaling_multiple_machines.txt
-%%WWWDIR%%/core/doc/admin/_sources/operations/theming.txt
 %%WWWDIR%%/core/doc/admin/_sources/release_notes.txt
 %%WWWDIR%%/core/doc/admin/_sources/whats_new_admin.txt
 %%WWWDIR%%/core/doc/admin/_static/ajax-loader.gif
@@ -8555,7 +8553,9 @@
 %%WWWDIR%%/core/doc/admin/configuration_server/email_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_server/external_sites.html
 %%WWWDIR%%/core/doc/admin/configuration_server/harden_server.html
+%%WWWDIR%%/core/doc/admin/configuration_server/import_ssl_cert.html
 %%WWWDIR%%/core/doc/admin/configuration_server/index.html
+%%WWWDIR%%/core/doc/admin/configuration_server/index_php_less_urls.html
 %%WWWDIR%%/core/doc/admin/configuration_server/js_css_asset_management_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_server/knowledgebase_configuration.html
 %%WWWDIR%%/core/doc/admin/configuration_server/language_configuration.html
@@ -8632,10 +8632,6 @@
 %%WWWDIR%%/core/doc/admin/maintenance/update.html
 %%WWWDIR%%/core/doc/admin/maintenance/upgrade.html
 %%WWWDIR%%/core/doc/admin/objects.inv
-%%WWWDIR%%/core/doc/admin/operations/considerations_on_monitoring.html
-%%WWWDIR%%/core/doc/admin/operations/index.html
-%%WWWDIR%%/core/doc/admin/operations/scaling_multiple_machines.html
-%%WWWDIR%%/core/doc/admin/operations/theming.html
 %%WWWDIR%%/core/doc/admin/release_notes.html
 %%WWWDIR%%/core/doc/admin/search.html
 %%WWWDIR%%/core/doc/admin/searchindex.js
@@ -10012,6 +10008,7 @@
 %%WWWDIR%%/lib/private/Repair/RepairInvalidShares.php
 %%WWWDIR%%/lib/private/Repair/RepairLegacyStorages.php
 %%WWWDIR%%/lib/private/Repair/RepairMimeTypes.php
+%%WWWDIR%%/lib/private/Repair/RepairUnmergedShares.php
 %%WWWDIR%%/lib/private/Repair/SearchLuceneTables.php
 %%WWWDIR%%/lib/private/Repair/SharePropagation.php
 %%WWWDIR%%/lib/private/Repair/SqliteAutoincrement.php
@@ -10346,7 +10343,7 @@
 %%WWWDIR%%/lib/public/User.php
 %%WWWDIR%%/lib/public/UserInterface.php
 %%WWWDIR%%/lib/public/Util.php
-@(%%OWNCLOUD_USERNAME%%,%%OWNCLOUD_GROUPNAME%%,750) %%WWWDIR%%/occ
+%%WWWDIR%%/occ
 %%WWWDIR%%/ocs-provider/index.php
 %%WWWDIR%%/ocs/providers.php
 %%WWWDIR%%/ocs/routes.php
@@ -10705,16 +10702,12 @@
 %%WWWDIR%%/updater/vendor/composer/autoload_psr4.php
 %%WWWDIR%%/updater/vendor/composer/autoload_real.php
 %%WWWDIR%%/updater/vendor/composer/installed.json
-%%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/.editorconfig
-%%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/.gitignore
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/.travis.yml
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/CHANGELOG.md
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/LICENSE
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/README.md
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/UPGRADING.md
-%%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/build/packager.php
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/composer.json
-%%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/phpunit.xml.dist
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/src/BatchResults.php
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/src/Client.php
 %%WWWDIR%%/updater/vendor/guzzlehttp/guzzle/src/ClientInterface.php