Version bump, bug #231748, thank John Klehm for report. Fixes security bug #231372, thank Hanno Boeck and our security team for report. Removed vulnerable versions.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-ovz005 i686

7 files changed, 25 insertions, 183 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 9891b7ae334f..da04939275c3 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.46 2008/04/27 06:32:23 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.47 2008/07/14 11:33:12 pva Exp $
+
+*drupal-6.3 (14 Jul 2008)
+*drupal-5.8 (14 Jul 2008)
+
+  14 Jul 2008; Peter Volkov <pva@gentoo.org> -drupal-5.6.ebuild,
+  -drupal-5.7.ebuild, +drupal-5.8.ebuild, -drupal-6.0.ebuild,
+  -drupal-6.1.ebuild, -drupal-6.2.ebuild, +drupal-6.3.ebuild:
+  Version bump, bug #231748, thank John Klehm for report. Fixes security bug
+  #231372, thank Hanno Boeck and our security team for report. Removed
+  vulnerable versions.
 
 *drupal-5.7 (27 Apr 2008)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index e13d36fed75f..31480174fb4e 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,23 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1 2dc808031b46939f115769f8f36f28eefb1e3d75 SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd
-DIST drupal-5.6.tar.gz 754408 RMD160 edce977bcd679d61495f2869c0e1b9f07afed838 SHA1 84d6d3ffa41696fb7c0733a519d8e1539fa342a0 SHA256 bea975adf1b46bb684c359ca9c0f343fbc28d21e8f9ac872334e0f1377e54b6c
-DIST drupal-5.7.tar.gz 754688 RMD160 d3ec089aa74020ed076fbe71896365dd463279c9 SHA1 9cf916e61d260c885b7542f847d4f7661a14ae00 SHA256 60fa0b4d451dc5409f1e340d46c0d5fe4bcd4d832319a6a1cbb602e2e49e39cf
-DIST drupal-6.0.tar.gz 1057166 RMD160 b85788625e5651fcfb2265ccc6968d3f53aa2782 SHA1 3fbb61295fc397a30592be72e369ea7367aae0ca SHA256 aff01e8e36e0260e46bd59c55ed70152f0a081c04027420f5ec28bdbf0268dc1
-DIST drupal-6.1.tar.gz 1057213 RMD160 cbc8a6f022c713b899d804abb55bbd37daee3c48 SHA1 81faeb3beecaa8cc4ee1f441d40a283268e150eb SHA256 9b4ac194ef961ee8b0efd6819fcb4880d66808687a1335f59323c4b1ec580ce8
-DIST drupal-6.2.tar.gz 1058550 RMD160 7b1bed3e98c35dee12d13c46c37888b9ff045a79 SHA1 2cbff1073e15cdc54a620ffb891b16f558ec6fe4 SHA256 750db02a3605ebb445514e878b1b58e405291c88a9645877e80a5705268e44d8
-EBUILD drupal-5.6.ebuild 1239 RMD160 7be03807cc73dc49b14afa812a2d2ce1d8ce3a39 SHA1 2d8bffffe90ab3e1b94310aef79b4c5ff1915a25 SHA256 a3ad8cf5ff76033e2277a00fbbe7ecf8739c44f68c19692323f870f575b1d94c
-EBUILD drupal-5.7.ebuild 1239 RMD160 7c3cb082f45b98b126e458a68e2dd762c431b41e SHA1 36ba0577a97841cb97a436de0a562527dd68439d SHA256 8a12636898645c3e048d3ef1230422349f81720da0f1a73d8cd211c8ba7a6131
-EBUILD drupal-6.0.ebuild 1255 RMD160 de23b4c845b2ae62ed1840606046371bae1c68ac SHA1 4cc6f8eb8bbbac872e98aa23ee4c7300164b0eb7 SHA256 38661f89fd9a8977701ad43e5b3cc46ce6fd96d4844e3abff75d9c781ad699cf
-EBUILD drupal-6.1.ebuild 1255 RMD160 b1726bb6a8466a36be0173032a91d214d2c88214 SHA1 a1c3d14ee25317aff109711832b5f7d78d4fb44d SHA256 fc6da01ebac55c14d3176e3137bda6142e0745eda8bcc7d0591e6b2b366fa721
-EBUILD drupal-6.2.ebuild 1255 RMD160 01dbb706573cbd71cc690e649475ce8c86f6271b SHA1 7258f223cbe7da9bc60eb3d30e81f51883085ce3 SHA256 d94498f366a99921c2e2cda29d48eef6fe6d4124fd2951bb9594cf1d1e66b8a3
-MISC ChangeLog 6223 RMD160 42fa605c1bdfd6a4c07b44f24919bfea2a3af6ae SHA1 ccf1102d6de1c5ec2b5e9eddb5f8dc49164dcd70 SHA256 b3773caa5c78e4ba8030f0b45eca4867949f33febf1e81ce7bfba3678d35030c
+DIST drupal-5.8.tar.gz 756306 RMD160 aca3714e6fdd8e0d4bc3b7e07072144a2a5d7728 SHA1 8c6c462389eb2a051903b829dac797bd06c2919d SHA256 74cdc2172a0c82f937edbadf20ada2839f04a02ad3951be2eea4d09cca201b03
+DIST drupal-6.3.tar.gz 1061653 RMD160 2748ebb42f3216c54fda8c4efae65f8371c9aa7c SHA1 82d4e66bf656a1922824e4c4f17867aa1e2e9a70 SHA256 fc60d8635634b7ea0bca558a84500d7ae53b3f75303ad92cacf0d02374469fe0
+EBUILD drupal-5.8.ebuild 1242 RMD160 9fa4dc2f1615cf774cc7d00dc294943e6d884edf SHA1 38701342271dadc01a70765e858da758825b27ea SHA256 c468353953115bbf20344fd6f82d5a07cb67553a5a45f98c9e6db67010cb0566
+EBUILD drupal-6.3.ebuild 1359 RMD160 5f0915be9d6bf112b7b2573bc13716f0cade36ff SHA1 b6291524093fbc8520ff35410b8f8bd4a436b37e SHA256 c80a9cdee413fb40638e49f55bc393f83b7c62f12e85bd524bbbd39aac8ee5ed
+MISC ChangeLog 6634 RMD160 7c663688f5b1f198e03dc8ef823d8766a530b1c7 SHA1 134c8f060b27441a9f9380e8ee76a31de43b7120 SHA256 cf1c73ca0a30c84c7b684fb7c0eab8b6b9f019497db31a931bcad1c70208d44b
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIFB4VEEcxCpcDQ74RArUeAJ9d9lsuDL9AWPQaBUtLa/8PXoRTOgCgiWGZ
-5uno4jRFQb3ut0h3p1WmZsw=
-=YPEj
------END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-5.6.ebuild b/www-apps/drupal/drupal-5.8.ebuild
index e13153f64777..06e7bce67a8e 100644
--- a/www-apps/drupal/drupal-5.6.ebuild
+++ b/www-apps/drupal/drupal-5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.6.ebuild,v 1.3 2008/04/03 10:16:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.8.ebuild,v 1.1 2008/07/14 11:33:12 pva Exp $
 
 inherit webapp eutils depend.php
 
@@ -21,9 +21,9 @@ pkg_setup() {
 	webapp_pkg_setup
 	has_php
 	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use expat
+		require_php_with_use expat gd
 	else
-		require_php_with_use xml
+		require_php_with_use xml gd
 	fi
 }
 
diff --git a/www-apps/drupal/drupal-6.0.ebuild b/www-apps/drupal/drupal-6.0.ebuild
deleted file mode 100644
index 86abd777b852..000000000000
--- a/www-apps/drupal/drupal-6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.0.ebuild,v 1.3 2008/04/03 10:16:36 hollow 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/default.settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/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.1.ebuild b/www-apps/drupal/drupal-6.1.ebuild
deleted file mode 100644
index f8a29d34f3dd..000000000000
--- a/www-apps/drupal/drupal-6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.1.ebuild,v 1.2 2008/04/03 10:16:36 hollow 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/default.settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/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.2.ebuild b/www-apps/drupal/drupal-6.2.ebuild
deleted file mode 100644
index 612326130f34..000000000000
--- a/www-apps/drupal/drupal-6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.2.ebuild,v 1.1 2008/04/25 11:30:15 hollow 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/default.settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/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.7.ebuild b/www-apps/drupal/drupal-6.3.ebuild
index eb989c6d4df2..a5fb58485ad7 100644
--- a/www-apps/drupal/drupal-5.7.ebuild
+++ b/www-apps/drupal/drupal-6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.7.ebuild,v 1.1 2008/04/27 06:32:23 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.3.ebuild,v 1.1 2008/07/14 11:33:12 pva Exp $
 
 inherit webapp eutils depend.php
 
@@ -21,19 +21,20 @@ pkg_setup() {
 	webapp_pkg_setup
 	has_php
 	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use expat
+		require_php_with_use expat gd
 	else
-		require_php_with_use xml
+		require_php_with_use xml gd
 	fi
 }
 
 src_install() {
 	webapp_src_preinst
 
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt UPGRADE.txt "
 	dodoc ${docs}
-	rm -f ${docs} INSTALL
+	rm -f ${docs} INSTALL COPYRIGHT.txt
 
+	cp sites/default/{default.settings.php,settings.php}
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .