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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 17 insertions, 119 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/Manifest b/www-apps/drupal/Manifest
index e52b46ef33b7..8a44983a4815 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,11 +1,7 @@
 AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1 2dc808031b46939f115769f8f36f28eefb1e3d75 SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd
-DIST drupal-5.17.tar.gz 766536 RMD160 fb53254f10ad58e11e04e0baf5ffd44bfba8d250 SHA1 4d8445b5ef7adcd87ced8f6c119ea35a6e339fe2 SHA256 4dda1058a6adabb6f9c714b317e5a5177d03410b4764ae82f0be85b08e4a05cf
-DIST drupal-5.18.tar.gz 766788 RMD160 b5d3a8fc6b42623415ced73fe6c34fdd84241693 SHA1 54d0d77759bd6a9335c1701f233c5cc8aa2cae5f SHA256 041900785dc792e9ffc6b5a79ddd9b250ab3af33794e6d8794c2a50f2333b5ce
-DIST drupal-6.11.tar.gz 1078966 RMD160 db89a745dedefb76af3adb2703ba39eb60ba493b SHA1 083fdf4f7248603677b3c294f7ddb060a07d4fa8 SHA256 89d360d667a527235ceb10962cfffd0448194636b7d2b73cf22ff8b13a7d2f1b
-DIST drupal-6.12.tar.gz 1079251 RMD160 0b30b2d87278fbd9892d107b12f1f63b1e9d2d72 SHA1 f012175e3a342c088059f4424db9f877b292fe89 SHA256 774eea054c94f3fa85c7932d0c54612943c9b6f865bde07e93a3b23042c39b98
-EBUILD drupal-5.17.ebuild 1237 RMD160 fc7b105d51eb135708167fcfd0fd5a5123a5f83a SHA1 0cfd0236d1f73663d6f095998ff926f0a5bf8d91 SHA256 e2ce154006c04f49009f5db613bd50c5e59856f2b715832507da96f590016504
-EBUILD drupal-5.18.ebuild 1237 RMD160 faa2d6993c7a89f7cf7a959ea36c5a6b75f0a42e SHA1 71d7f7396dc48125a8f29d2b79d67dd516577b9b SHA256 9ac4f90cdba5cca371045ca04095736f33ff283450f7b22a86866c0fa4c442a7
-EBUILD drupal-6.11.ebuild 1550 RMD160 bfa4d2d6b270bed40594c3676ceaf5a66220afc2 SHA1 f31a45d46da0ef749cd47ab79d4c442c6c96b159 SHA256 4f69653da29968013f741209b20bd5a58020db5cc17933f6ff06bd1034156a42
-EBUILD drupal-6.12.ebuild 1550 RMD160 b5ecfa6e71fdab8af3a1ce974a187eadf2eba3f1 SHA1 fcaa17b1b00a221695244f9bc91648ab9b91301e SHA256 d2dba4720a69d920ca0befd61b9b0372d032cdb5972d328fcf7e8fcb9af8ff1a
-MISC ChangeLog 9175 RMD160 be7e6d65a847b53aa10049fdf2d0d751d725a3d0 SHA1 b59e760d5d36fd740eeb34dfd0d4a87f106a3425 SHA256 f30938d341119833fb9035c3d684ac88c7d85805049ffd36ed4fd099ee23d672
+DIST drupal-5.19.tar.gz 766834 RMD160 3043adb3a4529790ddc4cfde16b9327c57af6d38 SHA1 e14fe2c2e7f7b39be452ce461af3a1a869ca01a7 SHA256 b5a5e788d4bd8ee034bba1326fcfdacadfad0bf1eb01b2adc70ccae3d1190e00
+DIST drupal-6.13.tar.gz 1080373 RMD160 5e08333266cff012c766eac8c62f1c9468d8bb89 SHA1 ac4df01933267261021cc13ea48dea5e9946529b SHA256 f78db63727835aaaee8e438d3952cc7fe41d752757d6ccbfdcd90d4dd00a9eec
+EBUILD drupal-5.19.ebuild 1237 RMD160 8f3a6e9449085df7ddb7d85eae0e35aafd8be380 SHA1 bbc63b8748bf65425c4c6ae2546786781436c0e7 SHA256 054d172cd9db8054eb76e982139d6a042885a6a099b345cb06fe6c11824041dd
+EBUILD drupal-6.13.ebuild 1550 RMD160 2b8e2cac9a487faff45f00e346ec484b8dfab95c SHA1 e7eb5de3a3ed39dd914cbcad33f0c4c5e40eae0f SHA256 91a83e55e4b40eb250164c629646121c13e6d80c1c8f08bc6ef617436da71de0
+MISC ChangeLog 9518 RMD160 f72a82ccbffb7c4f8c3d3c62435d0884ac1f4392 SHA1 78599630da28239340afee55e3490757cfc357dc SHA256 a619774e15da63424e208f51b10da2cdc8cb312c6291a920100bea72b45acf6b
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
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