version bump wrt security #234714

Package-Manager: portage-2.1.4.4

4 files changed, 120 insertions, 12 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 5a04b03fd678..c488a176c467 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # 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.49 2008/07/31 20:41:04 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.50 2008/08/18 11:33:44 hollow Exp $
+
+*drupal-6.4 (18 Aug 2008)
+*drupal-5.10 (18 Aug 2008)
+
+  18 Aug 2008; Benedikt Böhm <hollow@gentoo.org> +drupal-5.10.ebuild,
+  +drupal-6.4.ebuild:
+  version bump wrt security #234714
 
 *drupal-5.9 (31 Jul 2008)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 3f6cca58c46e..d4fa71e25dad 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,17 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1 2dc808031b46939f115769f8f36f28eefb1e3d75 SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd
+DIST drupal-5.10.tar.gz 762496 RMD160 d424e59aad91e7e6a95c101b0bdc98c19ae3a686 SHA1 0c722d75608e25039ffee448a450721aba1de64a SHA256 71e44df9cbbc58a4f116b089c82ca8f03cbd2933e4072dca9ca0b0ac3dfc0757
 DIST drupal-5.9.tar.gz 756520 RMD160 115c70e98655129b6d46b3460d264aa96a763419 SHA1 3a24682abce798e294fa6bddb6a3e8ef388882e1 SHA256 aaa915caee70e35e038f8c7d3a2db95e6154d28c5ba9f3dd0a333b9049e8d856
 DIST drupal-6.3.tar.gz 1061653 RMD160 2748ebb42f3216c54fda8c4efae65f8371c9aa7c SHA1 82d4e66bf656a1922824e4c4f17867aa1e2e9a70 SHA256 fc60d8635634b7ea0bca558a84500d7ae53b3f75303ad92cacf0d02374469fe0
+DIST drupal-6.4.tar.gz 1068473 RMD160 07075e994bc904075d0d9991b640160c7ca26301 SHA1 a8c5e9680f394281f53e584f88fe29a3c9cedfd7 SHA256 6abde722d2e75053bb808c0d5d407ef691143e0498ba3570a2789c41e652246a
+EBUILD drupal-5.10.ebuild 1240 RMD160 300456c6ddafebc629d1b06cf418f22b7bd7ee35 SHA1 77bf8d3368379133c1f2ba1517f7ed27bb6275ab SHA256 a588a3628171b8ae63f3f707e28e19c3e3868a777ecfe0eeec4f096d7260f4ed
 EBUILD drupal-5.9.ebuild 1239 RMD160 0efb2b6d2c0f2de41f38fdc43e537d576dce90f7 SHA1 fb3d66106924054b3dacd1af6249eaecf7d5a531 SHA256 d3287f2be9c2333d37521be928839ee89945426f3c5643336f54a59560be6f10
 EBUILD drupal-6.3.ebuild 1549 RMD160 fdacc9d982e9b1366deee35937a07d5b3d427fb6 SHA1 6b470d35d0c45da1798dcc40644c1e3e70f65f92 SHA256 c6e4b08946dfae63e5f6ac576441e405b0611c5cf7615aa644fb2a1e67ecb5d6
-MISC ChangeLog 7007 RMD160 3669a60ab647dd5aa251cc389bd9cc89dfc3eed2 SHA1 748efd7565b6609b7638ca9638e76ca08f34178f SHA256 3c820b0e5db627918ed6db0a8a9709be9996b994edde44b72f64408681f67eea
+EBUILD drupal-6.4.ebuild 1552 RMD160 a6089b29aa79d1e60ee7e3ec5c137e1a3724d7cd SHA1 ba6a04e75464dc087079973fe8d396e79264704f SHA256 e09700f0b3f7e465239055a520c2ef57bff2ad26abdb3bbd9a96db6258894a2c
+MISC ChangeLog 7191 RMD160 4a18efe5b5c925d1e3d3c90beba801aaa9d6a2a8 SHA1 247bc18c105d490900bbdbe6176c0c98bb864bd1 SHA256 023f694e4afbc12cc90a1e65779171548d6ad767889a16ca5c20cb6f2fdf36cc
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIkiNxEEcxCpcDQ74RAsibAJ0VG8Nvi2346cmZy7/Ragx+0mjXKACfY/2C
-1iZ224h4x2nn2K7bjBbu6zQ=
-=Cm4b
------END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-5.10.ebuild b/www-apps/drupal/drupal-5.10.ebuild
new file mode 100644
index 000000000000..b995240831a9
--- /dev/null
+++ b/www-apps/drupal/drupal-5.10.ebuild
@@ -0,0 +1,51 @@
+# 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.10.ebuild,v 1.1 2008/08/18 11:33:44 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/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.4.ebuild b/www-apps/drupal/drupal-6.4.ebuild
new file mode 100644
index 000000000000..c6fdcbde5c07
--- /dev/null
+++ b/www-apps/drupal/drupal-6.4.ebuild
@@ -0,0 +1,56 @@
+# 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.4.ebuild,v 1.1 2008/08/18 11:33:44 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
+		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
+}