Version bump, security bug #448270. Remove vulnerable versions, rename USE=sqlite3 to sqlite to follow php

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

5 files changed, 22 insertions, 110 deletions

diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index b20abee78535..c923bdd12ea0 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/owncloud
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.22 2012/12/04 22:01:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.23 2012/12/27 12:11:57 voyageur Exp $
+
+*owncloud-4.5.5 (27 Dec 2012)
+*owncloud-4.0.10 (27 Dec 2012)
+
+  27 Dec 2012; Bernard Cafarelli <voyageur@gentoo.org> -owncloud-4.0.9.ebuild,
+  +owncloud-4.0.10.ebuild, -owncloud-4.5.2-r1.ebuild, -owncloud-4.5.3.ebuild,
+  -owncloud-4.5.4.ebuild, +owncloud-4.5.5.ebuild:
+  Version bump, security bug #448270. Remove vulnerable versions, rename
+  USE=sqlite3 to sqlite to follow php
 
 *owncloud-4.5.4 (04 Dec 2012)
 
diff --git a/www-apps/owncloud/owncloud-4.5.3.ebuild b/www-apps/owncloud/owncloud-4.0.10.ebuild
index 919fd3eef80c..e01727f19f7c 100644
--- a/www-apps/owncloud/owncloud-4.5.3.ebuild
+++ b/www-apps/owncloud/owncloud-4.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.5.3.ebuild,v 1.1 2012/11/28 10:17:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.10.ebuild,v 1.1 2012/12/27 12:11:57 voyageur Exp $
 
 EAPI=4
 
@@ -12,12 +12,13 @@ SRC_URI="http://owncloud.org/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+curl mysql postgres +sqlite3"
-REQUIRED_USE="|| ( mysql postgres sqlite3 )"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,gd,json,mysql?,pdo,postgres?,sqlite3?,xmlwriter,zip]"
-
+RDEPEND="|| ( >=dev-lang/php-5.4.9[curl?,gd,json,mysql?,pdo,postgres?,sqlite?,xmlwriter,zip]
+	sqlite? ( <dev-lang/php-5.4.9[curl?,gd,json,mysql?,pdo,postgres?,sqlite3,xmlwriter,zip] )
+	!sqlite? ( <dev-lang/php-5.4.9[curl?,gd,json,mysql?,pdo,postgres?,xmlwriter,zip] ) )"
 need_httpd_cgi
 need_php_httpd
 
diff --git a/www-apps/owncloud/owncloud-4.0.9.ebuild b/www-apps/owncloud/owncloud-4.0.9.ebuild
deleted file mode 100644
index ce9545386949..000000000000
--- a/www-apps/owncloud/owncloud-4.0.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.9.ebuild,v 1.1 2012/11/15 09:02:19 voyageur Exp $
-
-EAPI=4
-
-inherit webapp depend.php
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://owncloud.org/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl mysql postgres +sqlite3"
-REQUIRED_USE="|| ( mysql postgres sqlite3 )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,gd,json,mysql?,pdo,postgres?,sqlite3?,xmlwriter,zip]"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="README"
-	dodoc ${docs}
-	rm -f ${docs}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/owncloud/owncloud-4.5.4.ebuild b/www-apps/owncloud/owncloud-4.5.4.ebuild
deleted file mode 100644
index 415ef3cddc2d..000000000000
--- a/www-apps/owncloud/owncloud-4.5.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.5.4.ebuild,v 1.1 2012/12/04 22:01:57 voyageur Exp $
-
-EAPI=4
-
-inherit eutils webapp depend.php
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://owncloud.org/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl mysql postgres +sqlite3"
-REQUIRED_USE="|| ( mysql postgres sqlite3 )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,gd,json,mysql?,pdo,postgres?,sqlite3?,xmlwriter,zip]"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="README"
-	dodoc ${docs}
-	rm -f ${docs}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/owncloud/owncloud-4.5.2-r1.ebuild b/www-apps/owncloud/owncloud-4.5.5.ebuild
index 48474b792ce3..60efc51ff20d 100644
--- a/www-apps/owncloud/owncloud-4.5.2-r1.ebuild
+++ b/www-apps/owncloud/owncloud-4.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.5.2-r1.ebuild,v 1.1 2012/11/22 16:03:52 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.5.5.ebuild,v 1.1 2012/12/27 12:11:57 voyageur Exp $
 
 EAPI=4
 
@@ -12,12 +12,13 @@ SRC_URI="http://owncloud.org/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+curl mysql postgres +sqlite3"
-REQUIRED_USE="|| ( mysql postgres sqlite3 )"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,gd,json,mysql?,pdo,postgres?,sqlite3?,xmlwriter,zip]"
-
+RDEPEND="|| ( >=dev-lang/php-5.4.9[curl?,gd,json,mysql?,pdo,postgres?,sqlite?,xmlwriter,zip]
+	sqlite? ( <dev-lang/php-5.4.9[curl?,gd,json,mysql?,pdo,postgres?,sqlite3,xmlwriter,zip] )
+	!sqlite? ( <dev-lang/php-5.4.9[curl?,gd,json,mysql?,pdo,postgres?,xmlwriter,zip] ) )"
 need_httpd_cgi
 need_php_httpd
 
@@ -27,11 +28,6 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
-src_prepare() {
-	# Fix DoS with postgres backend
-	epatch "${FILESDIR}"/${P}-fix_sabre_connector.patch
-}
-
 src_install() {
 	webapp_src_preinst