Version bump, fixes security issue, bug #276214, thank Alex Legler for report. Removed vulnerable versions.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 12 insertions, 110 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index b3a4f50e89ab..a7631490b249 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.59 2009/05/24 21:51:50 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.60 2009/07/08 11:54:49 pva Exp $
+
+*drupal-6.13 (08 Jul 2009)
+*drupal-5.19 (08 Jul 2009)
+
+  08 Jul 2009; Peter Volkov <pva@gentoo.org> -drupal-5.17.ebuild,
+  -drupal-5.18.ebuild, +drupal-5.19.ebuild, -drupal-6.11.ebuild,
+  -drupal-6.12.ebuild, +drupal-6.13.ebuild:
+  Version bump, fixes security issue, bug #276214, thank Alex Legler for
+  report. Removed vulnerable versions.
 
 *drupal-6.12 (24 May 2009)
 *drupal-5.18 (24 May 2009)
diff --git a/www-apps/drupal/drupal-5.18.ebuild b/www-apps/drupal/drupal-5.18.ebuild
deleted file mode 100644
index 15c7ce7e1751..000000000000
--- a/www-apps/drupal/drupal-5.18.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.18.ebuild,v 1.1 2009/05/24 21:51:50 pva Exp $
-
-inherit webapp eutils depend.php
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use expat
-	else
-		require_php_with_use xml
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
-	dodoc ${docs}
-	rm -f ${docs} INSTALL
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/drupal/drupal-5.17.ebuild b/www-apps/drupal/drupal-5.19.ebuild
index b43e28ac8b38..a68dad1f4e2d 100644
--- a/www-apps/drupal/drupal-5.17.ebuild
+++ b/www-apps/drupal/drupal-5.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.17.ebuild,v 1.1 2009/05/01 17:54:02 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.19.ebuild,v 1.1 2009/07/08 11:54:49 pva Exp $
 
 inherit webapp eutils depend.php
 
diff --git a/www-apps/drupal/drupal-6.12.ebuild b/www-apps/drupal/drupal-6.12.ebuild
deleted file mode 100644
index d61977a405a9..000000000000
--- a/www-apps/drupal/drupal-6.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.12.ebuild,v 1.1 2009/05/24 21:51:50 pva Exp $
-
-inherit webapp eutils depend.php
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		local flags="expat"
-	else
-		local flags="xml"
-	fi
-	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
-			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt
-
-	cp sites/default/{default.settings.php,settings.php}
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/drupal/drupal-6.11.ebuild b/www-apps/drupal/drupal-6.13.ebuild
index 2343ba546215..0564698c06c3 100644
--- a/www-apps/drupal/drupal-6.11.ebuild
+++ b/www-apps/drupal/drupal-6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.11.ebuild,v 1.1 2009/05/01 17:54:02 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.13.ebuild,v 1.1 2009/07/08 11:54:49 pva Exp $
 
 inherit webapp eutils depend.php