Update to 7.0.4

Changelog:
Version 7.0.4 Dec 9th 2014
Added XMLWriter check
Better deleted outdated previews
Store storage credential in session only if needed
Don't disclose relative directory path for single shared files of user
Password reset fixes
Fix enable app only for a specific group
fixing port configuration in trusted domains
LDAP fixes
Make group search case sensitive
Allow admin to change users display name
ldap performance improvements
config.php can now be read only
Several smaller fixes

4 files changed, 97 insertions, 87 deletions

diff --git a/www/php-owncloud/MESSAGE b/www/php-owncloud/MESSAGE
index fac955feb8d..102d9dfc4c8 100644
--- a/www/php-owncloud/MESSAGE
+++ b/www/php-owncloud/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.16 2014/06/29 14:25:17 ryoon Exp $
+$NetBSD: MESSAGE,v 1.17 2014/12/21 13:39:34 ryoon Exp $
 
 To use ownCloud, you will need to perform the following steps.
 
@@ -15,6 +15,8 @@ To use ownCloud, you will need to perform the following steps.
    From http://doc.owncloud.org/server/6.0/admin_manual/installation/installation_source.html .
 
 http {
+	include ${PREFIX}/etc/nginx/mime.types;
+
 	upstream php-handler {
 		server 127.0.0.1:9000;
 	}
diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile
index c1b91b8db54..4aff01a7daf 100644
--- a/www/php-owncloud/Makefile
+++ b/www/php-owncloud/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2014/11/30 00:08:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2014/12/21 13:39:34 ryoon Exp $
 #
 
-DISTNAME=	owncloud-7.0.3
+DISTNAME=	owncloud-7.0.4
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
diff --git a/www/php-owncloud/PLIST b/www/php-owncloud/PLIST
index 5b4ec173cd6..c6cd4b2cf16 100644
--- a/www/php-owncloud/PLIST
+++ b/www/php-owncloud/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2014/11/30 00:08:57 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.27 2014/12/21 13:39:34 ryoon Exp $
 share/owncloud/.htaccess
 share/owncloud/3rdparty/Archive/Tar.php
 share/owncloud/3rdparty/Console/Getopt.php
@@ -4962,6 +4962,7 @@ share/owncloud/apps/files_encryption/tests/migration.php
 share/owncloud/apps/files_encryption/tests/proxy.php
 share/owncloud/apps/files_encryption/tests/share.php
 share/owncloud/apps/files_encryption/tests/stream.php
+share/owncloud/apps/files_encryption/tests/testcase.php
 share/owncloud/apps/files_encryption/tests/trashbin.php
 share/owncloud/apps/files_encryption/tests/util.php
 share/owncloud/apps/files_encryption/tests/webdav.php
@@ -7318,6 +7319,7 @@ share/owncloud/apps/user_ldap/appinfo/install.php
 share/owncloud/apps/user_ldap/appinfo/register_command.php
 share/owncloud/apps/user_ldap/appinfo/update.php
 share/owncloud/apps/user_ldap/appinfo/version
+share/owncloud/apps/user_ldap/command/search.php
 share/owncloud/apps/user_ldap/command/setconfig.php
 share/owncloud/apps/user_ldap/command/showconfig.php
 share/owncloud/apps/user_ldap/command/testconfig.php
@@ -7469,7 +7471,6 @@ share/owncloud/apps/user_ldap/templates/part.wizardcontrols.php
 share/owncloud/apps/user_ldap/templates/settings.php
 share/owncloud/apps/user_ldap/tests/access.php
 share/owncloud/apps/user_ldap/tests/connection.php
-share/owncloud/apps/user_ldap/tests/data/sid.dat
 share/owncloud/apps/user_ldap/tests/group_ldap.php
 share/owncloud/apps/user_ldap/tests/helper.php
 share/owncloud/apps/user_ldap/tests/user/manager.php
@@ -7690,50 +7691,51 @@ share/owncloud/core/doc/admin/_images/users-create.png
 share/owncloud/core/doc/admin/_images/users-groups.png
 share/owncloud/core/doc/admin/_images/win7features.jpg
 share/owncloud/core/doc/admin/_images/winserverroles.jpg
-share/owncloud/core/doc/admin/_sources/configuration/auth_ldap.txt
-share/owncloud/core/doc/admin/_sources/configuration/background_jobs.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration-antivirus.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_3rdparty.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_apps.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_assets.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_automation.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_config_sample_php.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_custom_clients.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_database.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_encryption.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_file_sharing.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_files_locking.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_knowledgebase.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_language.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_logging.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_mail.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_preview.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_reverseproxy.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuration_users.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuring_big_file_upload.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuring_documents.txt
-share/owncloud/core/doc/admin/_sources/configuration/configuring_search.txt
-share/owncloud/core/doc/admin/_sources/configuration/custom_mount_config.txt
-share/owncloud/core/doc/admin/_sources/configuration/custom_mount_config_gui.txt
-share/owncloud/core/doc/admin/_sources/configuration/custom_user_backend.txt
+share/owncloud/core/doc/admin/_sources/configuration/antivirus_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/automatic_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/background_jobs_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/big_file_upload_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/collaborative_documents_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/config_sample_php_parameters.txt
+share/owncloud/core/doc/admin/_sources/configuration/custom_client_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/database_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/email_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/encryption_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/external_storage_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/external_storage_configuration_gui.txt
+share/owncloud/core/doc/admin/_sources/configuration/file_sharing_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/files_locking_enabling.txt
 share/owncloud/core/doc/admin/_sources/configuration/index.txt
-share/owncloud/core/doc/admin/_sources/configuration/server_to_server_managing.txt
-share/owncloud/core/doc/admin/_sources/configuration/xsendfile.txt
+share/owncloud/core/doc/admin/_sources/configuration/js_css_asset_management_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/knowledgebase_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/language_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/logging_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/previews_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/reverse_proxy_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/search_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/server_to_server_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/serving_static_files_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/thirdparty_php_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration/user_auth_ftp_smb_imap.txt
+share/owncloud/core/doc/admin/_sources/configuration/user_auth_ldap.txt
+share/owncloud/core/doc/admin/_sources/configuration/user_configuration.txt
 share/owncloud/core/doc/admin/_sources/contents.txt
 share/owncloud/core/doc/admin/_sources/index.txt
-share/owncloud/core/doc/admin/_sources/installation/configuration_hiawatha.txt
-share/owncloud/core/doc/admin/_sources/installation/configuration_lighttpd.txt
-share/owncloud/core/doc/admin/_sources/installation/configuration_nginx.txt
-share/owncloud/core/doc/admin/_sources/installation/configuration_yaws.txt
+share/owncloud/core/doc/admin/_sources/installation/appliance_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/apps_management_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/hiawatha_configuration.txt
 share/owncloud/core/doc/admin/_sources/installation/index.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_appliance.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_linux.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_macos.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_others.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_source.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_ucs.txt
-share/owncloud/core/doc/admin/_sources/installation/installation_windows.txt
 share/owncloud/core/doc/admin/_sources/installation/installation_wizard.txt
+share/owncloud/core/doc/admin/_sources/installation/lighttpd_configuration.txt
+share/owncloud/core/doc/admin/_sources/installation/linux_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/macos_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/nginx_configuration.txt
+share/owncloud/core/doc/admin/_sources/installation/others_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/selinux_configuration.txt
+share/owncloud/core/doc/admin/_sources/installation/source_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/ucs_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/windows_installation.txt
+share/owncloud/core/doc/admin/_sources/installation/yaws_configuration.txt
 share/owncloud/core/doc/admin/_sources/issues/index.txt
 share/owncloud/core/doc/admin/_sources/maintenance/backup.txt
 share/owncloud/core/doc/admin/_sources/maintenance/convert_db.txt
@@ -7773,51 +7775,52 @@ share/owncloud/core/doc/admin/_static/underscore.js
 share/owncloud/core/doc/admin/_static/up-pressed.png
 share/owncloud/core/doc/admin/_static/up.png
 share/owncloud/core/doc/admin/_static/websupport.js
-share/owncloud/core/doc/admin/configuration/auth_ldap.html
-share/owncloud/core/doc/admin/configuration/background_jobs.html
-share/owncloud/core/doc/admin/configuration/configuration-antivirus.html
-share/owncloud/core/doc/admin/configuration/configuration_3rdparty.html
-share/owncloud/core/doc/admin/configuration/configuration_apps.html
-share/owncloud/core/doc/admin/configuration/configuration_assets.html
-share/owncloud/core/doc/admin/configuration/configuration_automation.html
-share/owncloud/core/doc/admin/configuration/configuration_config_sample_php.html
-share/owncloud/core/doc/admin/configuration/configuration_custom_clients.html
-share/owncloud/core/doc/admin/configuration/configuration_database.html
-share/owncloud/core/doc/admin/configuration/configuration_encryption.html
-share/owncloud/core/doc/admin/configuration/configuration_file_sharing.html
-share/owncloud/core/doc/admin/configuration/configuration_files_locking.html
-share/owncloud/core/doc/admin/configuration/configuration_knowledgebase.html
-share/owncloud/core/doc/admin/configuration/configuration_language.html
-share/owncloud/core/doc/admin/configuration/configuration_logging.html
-share/owncloud/core/doc/admin/configuration/configuration_mail.html
-share/owncloud/core/doc/admin/configuration/configuration_preview.html
-share/owncloud/core/doc/admin/configuration/configuration_reverseproxy.html
-share/owncloud/core/doc/admin/configuration/configuration_users.html
-share/owncloud/core/doc/admin/configuration/configuring_big_file_upload.html
-share/owncloud/core/doc/admin/configuration/configuring_documents.html
-share/owncloud/core/doc/admin/configuration/configuring_search.html
-share/owncloud/core/doc/admin/configuration/custom_mount_config.html
-share/owncloud/core/doc/admin/configuration/custom_mount_config_gui.html
-share/owncloud/core/doc/admin/configuration/custom_user_backend.html
+share/owncloud/core/doc/admin/configuration/antivirus_configuration.html
+share/owncloud/core/doc/admin/configuration/automatic_configuration.html
+share/owncloud/core/doc/admin/configuration/background_jobs_configuration.html
+share/owncloud/core/doc/admin/configuration/big_file_upload_configuration.html
+share/owncloud/core/doc/admin/configuration/collaborative_documents_configuration.html
+share/owncloud/core/doc/admin/configuration/config_sample_php_parameters.html
+share/owncloud/core/doc/admin/configuration/custom_client_configuration.html
+share/owncloud/core/doc/admin/configuration/database_configuration.html
+share/owncloud/core/doc/admin/configuration/email_configuration.html
+share/owncloud/core/doc/admin/configuration/encryption_configuration.html
+share/owncloud/core/doc/admin/configuration/external_storage_configuration.html
+share/owncloud/core/doc/admin/configuration/external_storage_configuration_gui.html
+share/owncloud/core/doc/admin/configuration/file_sharing_configuration.html
+share/owncloud/core/doc/admin/configuration/files_locking_enabling.html
 share/owncloud/core/doc/admin/configuration/index.html
-share/owncloud/core/doc/admin/configuration/server_to_server_managing.html
-share/owncloud/core/doc/admin/configuration/xsendfile.html
+share/owncloud/core/doc/admin/configuration/js_css_asset_management_configuration.html
+share/owncloud/core/doc/admin/configuration/knowledgebase_configuration.html
+share/owncloud/core/doc/admin/configuration/language_configuration.html
+share/owncloud/core/doc/admin/configuration/logging_configuration.html
+share/owncloud/core/doc/admin/configuration/previews_configuration.html
+share/owncloud/core/doc/admin/configuration/reverse_proxy_configuration.html
+share/owncloud/core/doc/admin/configuration/search_configuration.html
+share/owncloud/core/doc/admin/configuration/server_to_server_configuration.html
+share/owncloud/core/doc/admin/configuration/serving_static_files_configuration.html
+share/owncloud/core/doc/admin/configuration/thirdparty_php_configuration.html
+share/owncloud/core/doc/admin/configuration/user_auth_ftp_smb_imap.html
+share/owncloud/core/doc/admin/configuration/user_auth_ldap.html
+share/owncloud/core/doc/admin/configuration/user_configuration.html
 share/owncloud/core/doc/admin/contents.html
 share/owncloud/core/doc/admin/genindex.html
 share/owncloud/core/doc/admin/index.html
-share/owncloud/core/doc/admin/installation/configuration_hiawatha.html
-share/owncloud/core/doc/admin/installation/configuration_lighttpd.html
-share/owncloud/core/doc/admin/installation/configuration_nginx.html
-share/owncloud/core/doc/admin/installation/configuration_yaws.html
+share/owncloud/core/doc/admin/installation/appliance_installation.html
+share/owncloud/core/doc/admin/installation/apps_management_installation.html
+share/owncloud/core/doc/admin/installation/hiawatha_configuration.html
 share/owncloud/core/doc/admin/installation/index.html
-share/owncloud/core/doc/admin/installation/installation_appliance.html
-share/owncloud/core/doc/admin/installation/installation_linux.html
-share/owncloud/core/doc/admin/installation/installation_macos.html
-share/owncloud/core/doc/admin/installation/installation_others.html
-share/owncloud/core/doc/admin/installation/installation_source.html
-share/owncloud/core/doc/admin/installation/installation_ucs.html
-share/owncloud/core/doc/admin/installation/installation_windows.html
 share/owncloud/core/doc/admin/installation/installation_wizard.html
+share/owncloud/core/doc/admin/installation/lighttpd_configuration.html
+share/owncloud/core/doc/admin/installation/linux_installation.html
+share/owncloud/core/doc/admin/installation/macos_installation.html
+share/owncloud/core/doc/admin/installation/nginx_configuration.html
+share/owncloud/core/doc/admin/installation/others_installation.html
+share/owncloud/core/doc/admin/installation/selinux_configuration.html
+share/owncloud/core/doc/admin/installation/source_installation.html
+share/owncloud/core/doc/admin/installation/ucs_installation.html
+share/owncloud/core/doc/admin/installation/windows_installation.html
+share/owncloud/core/doc/admin/installation/yaws_configuration.html
 share/owncloud/core/doc/admin/issues/index.html
 share/owncloud/core/doc/admin/maintenance/backup.html
 share/owncloud/core/doc/admin/maintenance/convert_db.html
@@ -10146,6 +10149,8 @@ share/owncloud/lib/private/search/result/audio.php
 share/owncloud/lib/private/search/result/file.php
 share/owncloud/lib/private/search/result/folder.php
 share/owncloud/lib/private/search/result/image.php
+share/owncloud/lib/private/security/crypto.php
+share/owncloud/lib/private/security/stringutils.php
 share/owncloud/lib/private/server.php
 share/owncloud/lib/private/serviceunavailableexception.php
 share/owncloud/lib/private/session/internal.php
@@ -10274,6 +10279,8 @@ share/owncloud/lib/public/route/iroute.php
 share/owncloud/lib/public/route/irouter.php
 share/owncloud/lib/public/search/provider.php
 share/owncloud/lib/public/search/result.php
+share/owncloud/lib/public/security/icrypto.php
+share/owncloud/lib/public/security/stringutils.php
 share/owncloud/lib/public/share.php
 share/owncloud/lib/public/template.php
 share/owncloud/lib/public/user.php
@@ -10282,6 +10289,7 @@ share/owncloud/lib/public/util.php
 share/owncloud/lib/repair/collation.php
 share/owncloud/lib/repair/innodb.php
 share/owncloud/lib/repair/preview.php
+share/owncloud/lib/repair/repairconfig.php
 share/owncloud/lib/repair/repairmimetypes.php
 share/owncloud/lib/repair/searchlucenetables.php
 share/owncloud/occ
diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo
index a637257441a..b166d78078f 100644
--- a/www/php-owncloud/distinfo
+++ b/www/php-owncloud/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2014/11/30 00:08:57 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2014/12/21 13:39:34 ryoon Exp $
 
-SHA1 (owncloud-7.0.3.tar.bz2) = aec543589f04c204e47a252b99806f6f49cd9191
-RMD160 (owncloud-7.0.3.tar.bz2) = 157d428503b1fe00ff931a22bf7ce86bd5c4a5e0
-Size (owncloud-7.0.3.tar.bz2) = 28028666 bytes
+SHA1 (owncloud-7.0.4.tar.bz2) = 8ef90181d4708ec2d82c1abf0f6d3a9899250958
+RMD160 (owncloud-7.0.4.tar.bz2) = 28adccde28566adb75f35df5b39db6358ca70378
+Size (owncloud-7.0.4.tar.bz2) = 28027707 bytes