Pullup ticket #4082 - requested by ryoon

www/php-owncloud: security update

Revisions pulled up:
- www/php-owncloud/MESSAGE                                      1.10
- www/php-owncloud/Makefile                                     1.25-1.26
- www/php-owncloud/PLIST                                        1.11-1.12
- www/php-owncloud/distinfo                                     1.12-1.13
- www/php-owncloud/options.mk                                   1.4

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Fri Jan 25 20:02:25 UTC 2013

   Modified Files:
   	pkgsrc/www/php-owncloud: MESSAGE Makefile PLIST distinfo options.mk

   Log Message:
   Update to 4.5.6

   * Add PostgreSQL support, not tested.

   Changelog:
   Version 4.5.6 Jan 22th 2013

       Improved language detection
       Improved translations
       Fix link to bugtracker
       Several IE 6/7/8 fixes
       SabreDAV updated to 1.6.6
       Improved error reporting
       Support special characters in mountpoint
       Interpret http 403 and 401 as not authorized in user_webdavauth
       Several fixes for special characters in files and folders
       Improved PostgreSQL support
       Check database names for valid characters
       Fix default email address calculation
       Remove debug output on send password page
       Add SMTP port configuration option
       Only show the max possible upload of 2GB on a 32 bit system
       Show progress during file downloads
       Security: Fix multiple XSS problems: CVE-2013-0201, CVE-2013-0202, CVE-2013-0203
       Security: Fix Code execution in external storage: CVE-2013-0204
       Security: Removed remoteStorage app because of unfixed security problems.

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Mon Feb 25 21:30:18 UTC 2013

   Modified Files:
   	pkgsrc/www/php-owncloud: Makefile PLIST distinfo

   Log Message:
   Update to 4.5.7

   Changelog:
   Version 4.5.7 Feb 20th 2013

       Fix for 3rd party apps dropping the database
       Fix SubAdmins management
       Fix PHP warnings
       Fix compatibility with some CIFS shares
       More robust apps management
       Remove not needed AWS tests
       Improved mime type parsing
       Several sharing fixes
       Offer the option to change the password only supported by the backend
       More robust auto language detection
       Revoke DB rights on install only if the db is newly created
       Fix rendering of database connection error page
       LDAP: update quota more often
       Multiple XSS vulnerabilities (oC-SA-2013-003)
       Multiple CSRF vulnerabilities (oC-SA-2013-004)
       PHP settings disclosure (oC-SA-2013-005)
       Multiple code executions (oC-SA-2013-006)
       Privilege escalation in the calendar application (oC-SA-2013-007)

5 files changed, 14 insertions, 30 deletions

diff --git a/www/php-owncloud/MESSAGE b/www/php-owncloud/MESSAGE
index e62397ba20e..10631752d75 100644
--- a/www/php-owncloud/MESSAGE
+++ b/www/php-owncloud/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.9 2012/11/27 12:11:36 ryoon Exp $
+$NetBSD: MESSAGE,v 1.9.2.1 2013/02/27 13:53:14 tron Exp $
 
 To use ownCloud, you will need to perform the following steps.
 
@@ -34,6 +34,7 @@ To use ownCloud, you will need to perform the following steps.
 
 	extension=pdo_sqlite.so ;if you select sqlite backend.
 	extension=mysql.so ;if you select MySQL backend.
+	extension=pgsql.so ;if you select PostgreSQL backend.
 
 5. Start apache httpd.
 
diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile
index 60b8ca15208..e9709b40b5b 100644
--- a/www/php-owncloud/Makefile
+++ b/www/php-owncloud/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2012/12/24 01:40:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2013/02/27 13:53:14 tron Exp $
 #
 
-DISTNAME=	owncloud-4.5.5
+DISTNAME=	owncloud-4.5.7
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://owncloud.org/releases/
diff --git a/www/php-owncloud/PLIST b/www/php-owncloud/PLIST
index a06897e47c2..c970a4d9753 100644
--- a/www/php-owncloud/PLIST
+++ b/www/php-owncloud/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/12/23 12:34:43 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10.2.1 2013/02/27 13:53:14 tron Exp $
 share/owncloud/.htaccess
 share/owncloud/3rdparty/Archive/Tar.php
 share/owncloud/3rdparty/Console/Getopt.php
@@ -343,10 +343,6 @@ share/owncloud/3rdparty/System.php
 share/owncloud/3rdparty/XML/Parser.php
 share/owncloud/3rdparty/XML/Parser/Simple.php
 share/owncloud/3rdparty/aws-sdk/README.md
-share/owncloud/3rdparty/aws-sdk/_compatibility_test/README.md
-share/owncloud/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility.inc.php
-share/owncloud/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test.php
-share/owncloud/3rdparty/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php
 share/owncloud/3rdparty/aws-sdk/_docs/CHANGELOG.md
 share/owncloud/3rdparty/aws-sdk/_docs/CONTRIBUTORS.md
 share/owncloud/3rdparty/aws-sdk/_docs/DYNAMODBSESSIONHANDLER.html
@@ -1980,21 +1976,6 @@ share/owncloud/apps/media/settings.php
 share/owncloud/apps/media/templates/music.php
 share/owncloud/apps/media/templates/player.php
 share/owncloud/apps/media/templates/settings.php
-share/owncloud/apps/remoteStorage/BearerAuth.php
-share/owncloud/apps/remoteStorage/ajax/revokeToken.php
-share/owncloud/apps/remoteStorage/appinfo/app.php
-share/owncloud/apps/remoteStorage/appinfo/database.xml
-share/owncloud/apps/remoteStorage/appinfo/info.xml
-share/owncloud/apps/remoteStorage/appinfo/version
-share/owncloud/apps/remoteStorage/appinfo/webfinger.php
-share/owncloud/apps/remoteStorage/auth.php
-share/owncloud/apps/remoteStorage/img/remoteStorage.png
-share/owncloud/apps/remoteStorage/lib_remoteStorage.php
-share/owncloud/apps/remoteStorage/oauth_ro_auth.php
-share/owncloud/apps/remoteStorage/settings.php
-share/owncloud/apps/remoteStorage/templates/auth.php
-share/owncloud/apps/remoteStorage/templates/settings.php
-share/owncloud/apps/remoteStorage/webdav.php
 share/owncloud/apps/tasks/ajax/addtask.php
 share/owncloud/apps/tasks/ajax/delete.php
 share/owncloud/apps/tasks/ajax/gettasks.php
diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo
index 865e4ecf805..6fab1340e07 100644
--- a/www/php-owncloud/distinfo
+++ b/www/php-owncloud/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/12/23 12:34:43 ryoon Exp $
+$NetBSD: distinfo,v 1.11.2.1 2013/02/27 13:53:14 tron Exp $
 
-SHA1 (owncloud-4.5.5.tar.bz2) = 72a4649475bcfe4bc1fd0a89b7dc4b95abbd4cd2
-RMD160 (owncloud-4.5.5.tar.bz2) = 95e97d679358184b24283540aa969d9ffdecb39d
-Size (owncloud-4.5.5.tar.bz2) = 9168561 bytes
+SHA1 (owncloud-4.5.7.tar.bz2) = 12c5140e3e6c68ae2e9d19da038c1097892a5310
+RMD160 (owncloud-4.5.7.tar.bz2) = 395c7cc5f3a4dee415dec9801f9a0d581907ebeb
+Size (owncloud-4.5.7.tar.bz2) = 9126728 bytes
diff --git a/www/php-owncloud/options.mk b/www/php-owncloud/options.mk
index 60113456aea..ae95852587a 100644
--- a/www/php-owncloud/options.mk
+++ b/www/php-owncloud/options.mk
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.3 2012/07/10 13:20:19 ryoon Exp $
+# $NetBSD: options.mk,v 1.3.4.1 2013/02/27 13:53:14 tron Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.php-owncloud
 
 PKG_OPTIONS_REQUIRED_GROUPS=	db
-PKG_OPTIONS_GROUP.db=		mysql sqlite
+PKG_OPTIONS_GROUP.db=		mysql sqlite pgsql
 
 PKG_SUGGESTED_OPTIONS=	sqlite
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Use mysql or sqlite backend
+### Use mysql, pgsql, or sqlite backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
@@ -23,4 +23,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
 # installed as version 2 and upgraded to 3 and then 4
 # complained/failed that PDO was not present.
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo_sqlite>=5.2.0:../../databases/php-pdo_sqlite
+.elif !empty(PKG_OPTIONS:Mpgsql)
+DEPENDS+=	${PHP_PKG_PREFIX}-pgsql>=5.2.0:../../databases/php-pgsql
 .endif