summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2014-11-20 11:45:49 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2014-11-20 11:45:49 +0000
commit2f0470cf639ade39b26760676b175d66486b675b (patch)
treebc1eec6e197a58b3d11822e7cfb6a847cf6b8ead /www-apps
parentVersion bump. (diff)
downloadgentoo-2-2f0470cf639ade39b26760676b175d66486b675b.tar.gz
gentoo-2-2f0470cf639ade39b26760676b175d66486b675b.tar.bz2
gentoo-2-2f0470cf639ade39b26760676b175d66486b675b.zip
Version bump to address DRUPAL-SA-CORE-2014-006.
Drop affected versions. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/drupal/ChangeLog10
-rw-r--r--www-apps/drupal/drupal-6.34.ebuild (renamed from www-apps/drupal/drupal-6.33.ebuild)12
-rw-r--r--www-apps/drupal/drupal-7.34.ebuild (renamed from www-apps/drupal/drupal-7.32.ebuild)14
3 files changed, 20 insertions, 16 deletions
diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 48f8ed17cc1d..7db684398103 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for www-apps/drupal
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.109 2014/10/17 13:02:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.110 2014/11/20 11:45:49 jmbsvicetto Exp $
+
+*drupal-6.34 (20 Nov 2014)
+*drupal-7.34 (20 Nov 2014)
+
+ 20 Nov 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +drupal-6.34.ebuild, +drupal-7.34.ebuild, -drupal-6.33.ebuild,
+ -drupal-7.32.ebuild:
+ Version bump to address DRUPAL-SA-CORE-2014-006. Drop affected versions.
*drupal-7.32 (17 Oct 2014)
diff --git a/www-apps/drupal/drupal-6.33.ebuild b/www-apps/drupal/drupal-6.34.ebuild
index dd8529f5826e..14ef0658631d 100644
--- a/www-apps/drupal/drupal-6.33.ebuild
+++ b/www-apps/drupal/drupal-6.34.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.33.ebuild,v 1.1 2014/08/14 12:59:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.34.ebuild,v 1.1 2014/11/20 11:45:49 jmbsvicetto Exp $
EAPI=5
@@ -16,9 +16,15 @@ LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
IUSE="+mysql postgres"
-RDEPEND="virtual/httpd-php
+RDEPEND="
dev-lang/php[gd,pdo,postgres?,xml]
- mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )"
+ virtual/httpd-php
+ mysql? (
+ || (
+ dev-lang/php[mysql]
+ dev-lang/php[mysqli]
+ )
+ )"
need_httpd_cgi
diff --git a/www-apps/drupal/drupal-7.32.ebuild b/www-apps/drupal/drupal-7.34.ebuild
index 7d6d74258bd7..5965a6e62db1 100644
--- a/www-apps/drupal/drupal-7.32.ebuild
+++ b/www-apps/drupal/drupal-7.34.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.32.ebuild,v 1.1 2014/10/17 13:02:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.34.ebuild,v 1.1 2014/11/20 11:45:49 jmbsvicetto Exp $
EAPI=5
@@ -21,12 +21,7 @@ RDEPEND="
virtual/httpd-php
accelerator? ( ||
(
- (
- <dev-lang/php-5.5
- dev-php/pecl-apc
- )
dev-php/xcache
- dev-php/eaccelerator
(
>=dev-lang/php-5.5[opcache]
dev-php/pecl-apcu
@@ -40,12 +35,7 @@ RDEPEND="
dev-lang/php[mysqli]
)
)
- sqlite? (
- || (
- dev-lang/php[sqlite]
- dev-lang/php[sqlite3]
- )
- )
+ sqlite? ( dev-lang/php[sqlite] )
"
need_httpd_cgi