Update to 4.0.4

* php-sqlite is no longer needed at least fresh installation
* Tested with php54 and apache24
* php-xml is needed
* Update MESSAGE

Changelog:
Version 4.0.4 June 28rd 2012

    Fix assigning several groups to a user.
    Fix LDAP connector with AD servers
    Conserve some memory in Contacts App
    Fix a warning in Gallery when deleting files
    Fix a bug in the music scanner

Version 4.0.3 June 23rd 2012

    Added a check if the .htaccess file is working and the data directory is protected or not.
    Added a check if a user is allowed to edit a bookmark or not.
    Fix the bookmarklet
    Fix the timezone in the datepicker
    Fix mimetype detection for cdr files
    Fix the filecache for the /Shared folder
    Fix a potential data corruption bug in the encryption app
    Don¡­t show other users filenames during filesystem cache rebuild
    Fix several XSS bugs
    Performance improvements for WebDAV and Desktop Syncing
    Fix quota calculation
    Improve the LDAP integration and group management
    Fix problems with the pdf viewer
    Fix user account migration
    Implement several CSRF security checks
    Fix a gallery bug where first picture is repeated in the last picture.
    Lot¡­s of calendar fixes
    Fix problem with ¡È/¡É in filenames
    Updated translations
    Several fixes in Contacts
    Lot¡­s of fixes in the Tasks App
    Fix a bug in the filesystem cache with ghost entries

Version 4.0.2 June 11th 2012

    Lot¡Çs of gallery fixes
    More 3rd party apps visible
    Fixed update notifications
    Several calendar fixes
    Several XSS fixes in calendar
    Several improvements in contacts
    Fix infinite redirect during setup for windows hosts
    Several XSS fixes in contacts
    New user password salting
    Several LDAP fixes
    Fix duplicate emails in sharing
    Improved compatibility with Android browser
    Fixed calendar links
    Fixed logging
    Allow ¡È/¡É in filenames
    Updated translations
    Fixed reverse proxy and custom hosts configuration
    Fix contact photo editing
    Don¡Çt allow renaming, deleting and resharing of shared folder

5 files changed, 41 insertions, 29 deletions

diff --git a/www/php-owncloud/MESSAGE b/www/php-owncloud/MESSAGE
index ce41788de5d..17fc448f092 100644
--- a/www/php-owncloud/MESSAGE
+++ b/www/php-owncloud/MESSAGE
@@ -1,12 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2012/06/13 23:16:01 gdt Exp $
+$NetBSD: MESSAGE,v 1.6 2012/07/10 13:20:19 ryoon Exp $
 
 To use ownCloud, you will need to perform the following steps.
 
 1. If you want to use with MySQL server, install databases/mysql51-*
    and enable it, then create database.
 
-2. Install apache httpd server, for example www/apache22 and www/ap-php.
+2. Install apache httpd server, for example www/apache24 and www/ap-php.
 
 3. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf
 
@@ -18,6 +18,7 @@ To use ownCloud, you will need to perform the following steps.
 		Options All
 		Allow from All
 		AllowOverride All
+		Require all granted
 	</Directory>
 
 4. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
@@ -26,12 +27,12 @@ To use ownCloud, you will need to perform the following steps.
 	extension=gd.so
 	extension=json.so
 	extension=mbstring.so
+	extension=pdo.so
+	extension=xml.so
 	extension=zip.so
-	extension=sqlite.so ;if you select sqlite backend.
-	extension=mysql.so ;if you select MySQL backend.
 
-	extension=pdo.so
-	extension=pdo_sqlite.so ; with sqlite backend
+	extension=pdo_sqlite.so ;if you select sqlite backend.
+	extension=mysql.so ;if you select MySQL backend.
 
 5. Start apache httpd.
 
diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile
index 43768b94c26..c7faa68cbb3 100644
--- a/www/php-owncloud/Makefile
+++ b/www/php-owncloud/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/06/17 18:27:19 gdt Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/10 13:20:19 ryoon Exp $
 #
 
-DISTNAME=	owncloud-4.0.1
+DISTNAME=	owncloud-4.0.4
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://owncloud.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,16 +14,12 @@ LICENSE=	gnu-agpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# php-sqlite referenced by default in options.mk does not support
-# php54, so mark this incompatible so pbulk stops croaking.
-# XXX: someone please fix this correctly
-PHP_VERSIONS_ACCEPTED=	53
-
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
-DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
-DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.2.0:../../archivers/php-zip
+DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.3.0:../../textproc/php-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
+DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-xml>=5.3.0:../../textproc/php-xml
+DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
 
 .include "options.mk"
 
diff --git a/www/php-owncloud/PLIST b/www/php-owncloud/PLIST
index 0d2b5228ec8..95a8a33c1f0 100644
--- a/www/php-owncloud/PLIST
+++ b/www/php-owncloud/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/06/09 14:24:05 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/07/10 13:20:19 ryoon Exp $
 share/owncloud/.htaccess
 share/owncloud/3rdparty/Archive/Tar.php
 share/owncloud/3rdparty/Console/Getopt.php
@@ -542,6 +542,7 @@ share/owncloud/3rdparty/when/When.php
 share/owncloud/AUTHORS
 share/owncloud/COPYING-AGPL
 share/owncloud/COPYING-README
+share/owncloud/Changelog
 share/owncloud/README
 share/owncloud/apps/admin_dependencies_chk/appinfo/app.php
 share/owncloud/apps/admin_dependencies_chk/appinfo/info.xml
@@ -643,6 +644,7 @@ share/owncloud/apps/calendar/l10n/es.php
 share/owncloud/apps/calendar/l10n/et_EE.php
 share/owncloud/apps/calendar/l10n/eu.php
 share/owncloud/apps/calendar/l10n/fa.php
+share/owncloud/apps/calendar/l10n/fi_FI.php
 share/owncloud/apps/calendar/l10n/fr.php
 share/owncloud/apps/calendar/l10n/gl.php
 share/owncloud/apps/calendar/l10n/he.php
@@ -728,6 +730,7 @@ share/owncloud/apps/contacts/ajax/loadphoto.php
 share/owncloud/apps/contacts/ajax/oc_photo.php
 share/owncloud/apps/contacts/ajax/savecrop.php
 share/owncloud/apps/contacts/ajax/saveproperty.php
+share/owncloud/apps/contacts/ajax/selectaddressbook.php
 share/owncloud/apps/contacts/ajax/updateaddressbook.php
 share/owncloud/apps/contacts/ajax/uploadimport.php
 share/owncloud/apps/contacts/ajax/uploadphoto.php
@@ -774,6 +777,7 @@ share/owncloud/apps/contacts/l10n/es.php
 share/owncloud/apps/contacts/l10n/et_EE.php
 share/owncloud/apps/contacts/l10n/eu.php
 share/owncloud/apps/contacts/l10n/fa.php
+share/owncloud/apps/contacts/l10n/fi_FI.php
 share/owncloud/apps/contacts/l10n/fr.php
 share/owncloud/apps/contacts/l10n/gl.php
 share/owncloud/apps/contacts/l10n/he.php
@@ -828,6 +832,7 @@ share/owncloud/apps/contacts/templates/part.editaddressbook.php
 share/owncloud/apps/contacts/templates/part.import.php
 share/owncloud/apps/contacts/templates/part.importaddressbook.php
 share/owncloud/apps/contacts/templates/part.no_contacts.php
+share/owncloud/apps/contacts/templates/part.selectaddressbook.php
 share/owncloud/apps/contacts/templates/settings.php
 share/owncloud/apps/contacts/thumbnail.php
 share/owncloud/apps/external/ajax/setsites.php
@@ -884,6 +889,7 @@ share/owncloud/apps/files/l10n/es.php
 share/owncloud/apps/files/l10n/et_EE.php
 share/owncloud/apps/files/l10n/eu.php
 share/owncloud/apps/files/l10n/fa.php
+share/owncloud/apps/files/l10n/fi_FI.php
 share/owncloud/apps/files/l10n/fr.php
 share/owncloud/apps/files/l10n/gl.php
 share/owncloud/apps/files/l10n/he.php
@@ -940,9 +946,11 @@ share/owncloud/apps/files_encryption/lib/cryptstream.php
 share/owncloud/apps/files_encryption/lib/proxy.php
 share/owncloud/apps/files_encryption/settings.php
 share/owncloud/apps/files_encryption/templates/settings.php
+share/owncloud/apps/files_encryption/tests/binary
 share/owncloud/apps/files_encryption/tests/encryption.php
 share/owncloud/apps/files_encryption/tests/proxy.php
 share/owncloud/apps/files_encryption/tests/stream.php
+share/owncloud/apps/files_encryption/tests/zeros
 share/owncloud/apps/files_external/appinfo/app.php
 share/owncloud/apps/files_external/appinfo/info.xml
 share/owncloud/apps/files_external/appinfo/version
@@ -1429,6 +1437,7 @@ share/owncloud/apps/gallery/ajax/thumbnail.php
 share/owncloud/apps/gallery/appinfo/app.php
 share/owncloud/apps/gallery/appinfo/database.xml
 share/owncloud/apps/gallery/appinfo/info.xml
+share/owncloud/apps/gallery/appinfo/update.php
 share/owncloud/apps/gallery/appinfo/version
 share/owncloud/apps/gallery/css/sharing.css
 share/owncloud/apps/gallery/css/styles.css
@@ -1438,8 +1447,8 @@ share/owncloud/apps/gallery/img/loading.gif
 share/owncloud/apps/gallery/img/rename.png
 share/owncloud/apps/gallery/img/share.png
 share/owncloud/apps/gallery/index.php
-share/owncloud/apps/gallery/js/album_cover.js
 share/owncloud/apps/gallery/js/albums.js
+share/owncloud/apps/gallery/js/pictures.js
 share/owncloud/apps/gallery/js/scanner.js
 share/owncloud/apps/gallery/js/sharing.js
 share/owncloud/apps/gallery/l10n/ar.php
@@ -1453,13 +1462,17 @@ share/owncloud/apps/gallery/l10n/es.php
 share/owncloud/apps/gallery/l10n/et_EE.php
 share/owncloud/apps/gallery/l10n/eu.php
 share/owncloud/apps/gallery/l10n/fa.php
+share/owncloud/apps/gallery/l10n/fi_FI.php
 share/owncloud/apps/gallery/l10n/fr.php
 share/owncloud/apps/gallery/l10n/gl.php
+share/owncloud/apps/gallery/l10n/hr.php
 share/owncloud/apps/gallery/l10n/hu_HU.php
 share/owncloud/apps/gallery/l10n/ia.php
+share/owncloud/apps/gallery/l10n/id.php
 share/owncloud/apps/gallery/l10n/it.php
 share/owncloud/apps/gallery/l10n/ja_JP.php
 share/owncloud/apps/gallery/l10n/ko.php
+share/owncloud/apps/gallery/l10n/lb.php
 share/owncloud/apps/gallery/l10n/lt_LT.php
 share/owncloud/apps/gallery/l10n/mk.php
 share/owncloud/apps/gallery/l10n/ms_MY.php
@@ -1483,9 +1496,12 @@ share/owncloud/apps/gallery/l10n/zh_TW.php
 share/owncloud/apps/gallery/lib/album.php
 share/owncloud/apps/gallery/lib/hooks_handlers.php
 share/owncloud/apps/gallery/lib/images_utils.php
+share/owncloud/apps/gallery/lib/managers.php
 share/owncloud/apps/gallery/lib/photo.php
 share/owncloud/apps/gallery/lib/scanner.php
 share/owncloud/apps/gallery/lib/sharing.php
+share/owncloud/apps/gallery/lib/tiles.php
+share/owncloud/apps/gallery/lib/tiles_test.php
 share/owncloud/apps/gallery/sharing.php
 share/owncloud/apps/gallery/templates/index.php
 share/owncloud/apps/gallery/templates/view_album.php
@@ -1527,6 +1543,7 @@ share/owncloud/apps/media/l10n/es.php
 share/owncloud/apps/media/l10n/et_EE.php
 share/owncloud/apps/media/l10n/eu.php
 share/owncloud/apps/media/l10n/fa.php
+share/owncloud/apps/media/l10n/fi_FI.php
 share/owncloud/apps/media/l10n/fr.php
 share/owncloud/apps/media/l10n/gl.php
 share/owncloud/apps/media/l10n/he.php
@@ -1620,14 +1637,12 @@ share/owncloud/apps/user_ldap/settings.php
 share/owncloud/apps/user_ldap/templates/settings.php
 share/owncloud/apps/user_ldap/tests/group_ldap.php
 share/owncloud/apps/user_ldap/user_ldap.php
-share/owncloud/apps/user_migrate/admin.php
 share/owncloud/apps/user_migrate/ajax/export.php
 share/owncloud/apps/user_migrate/appinfo/app.php
 share/owncloud/apps/user_migrate/appinfo/info.xml
 share/owncloud/apps/user_migrate/appinfo/version
 share/owncloud/apps/user_migrate/js/export.js
 share/owncloud/apps/user_migrate/settings.php
-share/owncloud/apps/user_migrate/templates/admin.php
 share/owncloud/apps/user_migrate/templates/settings.php
 share/owncloud/apps/user_openid/appinfo/app.php
 share/owncloud/apps/user_openid/appinfo/info.xml
@@ -2370,6 +2385,7 @@ share/owncloud/settings/l10n/es.php
 share/owncloud/settings/l10n/et_EE.php
 share/owncloud/settings/l10n/eu.php
 share/owncloud/settings/l10n/fa.php
+share/owncloud/settings/l10n/fi_FI.php
 share/owncloud/settings/l10n/fr.php
 share/owncloud/settings/l10n/gl.php
 share/owncloud/settings/l10n/he.php
diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo
index f4ec9125650..9c35b2fff54 100644
--- a/www/php-owncloud/distinfo
+++ b/www/php-owncloud/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/06/09 14:24:05 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2012/07/10 13:20:19 ryoon Exp $
 
-SHA1 (owncloud-4.0.1.tar.bz2) = 9664f9893c7523a766edf579fbbb663741d302a7
-RMD160 (owncloud-4.0.1.tar.bz2) = b7aca14381dd0f96a27898e261a8805b1c733d5a
-Size (owncloud-4.0.1.tar.bz2) = 4560307 bytes
+SHA1 (owncloud-4.0.4.tar.bz2) = 49cadbb77d4faffdfca36781ddcceccbf56ae278
+RMD160 (owncloud-4.0.4.tar.bz2) = c9d8f238b0d3b71f89c7d28f44e75ab6d4eec7b6
+Size (owncloud-4.0.4.tar.bz2) = 4616904 bytes
diff --git a/www/php-owncloud/options.mk b/www/php-owncloud/options.mk
index c0f8b98f7d0..60113456aea 100644
--- a/www/php-owncloud/options.mk
+++ b/www/php-owncloud/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/06/17 18:27:19 gdt Exp $
+# $NetBSD: options.mk,v 1.3 2012/07/10 13:20:19 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.php-owncloud
 
@@ -17,7 +17,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
 .elif !empty(PKG_OPTIONS:Msqlite)
 
 # php-sqlite provides sqlite2
-DEPENDS+=	${PHP_PKG_PREFIX}-sqlite>=5.2.0:../../databases/php-sqlite
+#DEPENDS+=	${PHP_PKG_PREFIX}-sqlite>=5.2.0:../../databases/php-sqlite
 
 # php-pdo_sqlite provides sqlite3.  An owncloud instance that was
 # installed as version 2 and upgraded to 3 and then 4