From 5bbfab34b43845085ea5ceeda13f1181f50d6d1b Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 9 Oct 2008 19:19:37 +0000 Subject: Version bump, fixes security issue #240726, thank Tobias Heinlein for report. (Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64) --- www-apps/drupal/ChangeLog | 10 ++++++- www-apps/drupal/drupal-5.10.ebuild | 51 ---------------------------------- www-apps/drupal/drupal-5.11.ebuild | 51 ++++++++++++++++++++++++++++++++++ www-apps/drupal/drupal-5.9.ebuild | 51 ---------------------------------- www-apps/drupal/drupal-6.3.ebuild | 56 -------------------------------------- www-apps/drupal/drupal-6.4.ebuild | 56 -------------------------------------- www-apps/drupal/drupal-6.5.ebuild | 56 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 116 insertions(+), 215 deletions(-) delete mode 100644 www-apps/drupal/drupal-5.10.ebuild create mode 100644 www-apps/drupal/drupal-5.11.ebuild delete mode 100644 www-apps/drupal/drupal-5.9.ebuild delete mode 100644 www-apps/drupal/drupal-6.3.ebuild delete mode 100644 www-apps/drupal/drupal-6.4.ebuild create mode 100644 www-apps/drupal/drupal-6.5.ebuild (limited to 'www-apps/drupal') diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog index c488a176c467..4925b1ca8f74 100644 --- a/www-apps/drupal/ChangeLog +++ b/www-apps/drupal/ChangeLog @@ -1,6 +1,14 @@ # 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.50 2008/08/18 11:33:44 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.51 2008/10/09 19:19:37 pva Exp $ + +*drupal-6.5 (09 Oct 2008) +*drupal-5.11 (09 Oct 2008) + + 09 Oct 2008; Peter Volkov -drupal-5.9.ebuild, + -drupal-5.10.ebuild, +drupal-5.11.ebuild, -drupal-6.3.ebuild, + -drupal-6.4.ebuild, +drupal-6.5.ebuild: + Version bump, fixes security issue #240726, thank Tobias Heinlein for report. *drupal-6.4 (18 Aug 2008) *drupal-5.10 (18 Aug 2008) diff --git a/www-apps/drupal/drupal-5.10.ebuild b/www-apps/drupal/drupal-5.10.ebuild deleted file mode 100644 index b995240831a9..000000000000 --- a/www-apps/drupal/drupal-5.10.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-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-5.11.ebuild b/www-apps/drupal/drupal-5.11.ebuild new file mode 100644 index 000000000000..de4e7b88b6ca --- /dev/null +++ b/www-apps/drupal/drupal-5.11.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.11.ebuild,v 1.1 2008/10/09 19:19:37 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.9.ebuild b/www-apps/drupal/drupal-5.9.ebuild deleted file mode 100644 index 105e2b87862e..000000000000 --- a/www-apps/drupal/drupal-5.9.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-5.9.ebuild,v 1.1 2008/07/31 20:41:05 wrobel 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.3.ebuild b/www-apps/drupal/drupal-6.3.ebuild deleted file mode 100644 index dd803c2c913e..000000000000 --- a/www-apps/drupal/drupal-6.3.ebuild +++ /dev/null @@ -1,56 +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.3.ebuild,v 1.2 2008/07/15 10:50:21 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.4.ebuild b/www-apps/drupal/drupal-6.4.ebuild deleted file mode 100644 index c6fdcbde5c07..000000000000 --- a/www-apps/drupal/drupal-6.4.ebuild +++ /dev/null @@ -1,56 +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.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 -} diff --git a/www-apps/drupal/drupal-6.5.ebuild b/www-apps/drupal/drupal-6.5.ebuild new file mode 100644 index 000000000000..4e6a000c1225 --- /dev/null +++ b/www-apps/drupal/drupal-6.5.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.5.ebuild,v 1.1 2008/10/09 19:19:37 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 +} -- cgit v1.2.3-65-gdbad