Security bump, bug #142774

(Portage version: 2.1.1_pre5-r2)

5 files changed, 250 insertions, 1 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index ba0999732ce5..7edacb41a100 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.26 2006/06/05 14:52:53 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.27 2006/08/21 14:08:17 dertobi123 Exp $
+
+*drupal-4.7.3 (21 Aug 2006)
+*drupal-4.6.9 (21 Aug 2006)
+
+  21 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  +drupal-4.6.9.ebuild, +drupal-4.7.3.ebuild:
+  Security bump, bug #142774
 
   05 Jun 2006; Roy Marples <uberlord@gentoo.org> drupal-4.7.2.ebuild:
   Depend on virtual/httpd-php instead of apache, #117759.
diff --git a/www-apps/drupal/drupal-4.6.9.ebuild b/www-apps/drupal/drupal-4.6.9.ebuild
new file mode 100644
index 000000000000..37b30727903d
--- /dev/null
+++ b/www-apps/drupal/drupal-4.6.9.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.9.ebuild,v 1.1 2006/08/21 14:08:17 dertobi123 Exp $
+
+inherit webapp eutils
+
+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=""
+
+DEPEND="virtual/php"
+RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
+	>=net-www/apache-1.3"
+
+src_compile() {
+	#Default compile hangs!
+	echo "Nothing to compile"
+}
+
+src_install() {
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	einfo "Installing docs"
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	einfo "Copying main files"
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	# we install the .htaccess file to enable support for clean URLs
+	cp .htaccess ${D}/${MY_HTDOCSDIR}
+
+	# create the files upload directory
+	mkdir ${D}/${MY_HTDOCSDIR}/files
+	webapp_serverowned ${MY_HTDOCSDIR}/files
+
+	#All files must be owned by server
+	for x in `find . -type f -print` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/sites/default/settings.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-4.6.3.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"emerge --config =${PF} \""
+	einfo "if this is a new install."
+	einfo
+}
+
+pkg_config() {
+	# This is the default directory, but we have this portion for the user to
+	# change the default directory if it does not exist.
+	MY_HTDOCSDIR=/usr/share/webapps/${PN}/${PV}/htdocs
+	if [ ! -d ${MY_HTDOCSDIR} ] && \
+		[ ! -d ${MY_HTDOCSDIR}/modules ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ ! -d ${MY_HTDOCSDIR}/language ] ; then
+		einfo "Please specify the directory your drupal installation "
+		einfo "is installed in."
+		echo
+		while true
+		do
+			read -p " Please type in the name of the directory: " MY_HTDOCSDIR
+			[ -d ${MY_HTDOCSDIR} ] && \
+				[ -d ${MY_HTDOCSDIR}/modules ] && \
+				[ -d ${MY_HTDOCSDIR}/themes ] && \
+				[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+				[ -d ${MY_HTDOCSDIR}/language ] && \
+				break || \
+				ewarn "The directory ${MY_HTDOCSDIR} does not exist"
+		done
+	fi
+	if [ -d ${MY_HTDOCSDIR} ] && \
+		[ -d ${MY_HTDOCSDIR}/modules ] && \
+		[ -d ${MY_HTDOCSDIR}/themes ] && \
+		[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ -d ${MY_HTDOCSDIR}/language ] ; then
+		for i in modules themes engines language; do
+			cd ${MY_HTDOCSDIR}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			for item in `cat ${PORTDIR}/www-apps/${PN}/files/${MY_PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
+			done
+		done
+
+		find ${MY_HTDOCSDIR} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${MY_HTDOCSDIR} -type f -exec chmod 644 {} \;
+		find ${MY_HTDOCSDIR} -type d -exec chmod 755 {} \;
+	fi
+}
diff --git a/www-apps/drupal/drupal-4.7.3.ebuild b/www-apps/drupal/drupal-4.7.3.ebuild
new file mode 100644
index 000000000000..3314f16e9e26
--- /dev/null
+++ b/www-apps/drupal/drupal-4.7.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.7.3.ebuild,v 1.1 2006/08/21 14:08:17 dertobi123 Exp $
+
+inherit webapp eutils
+
+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=""
+
+DEPEND="virtual/php"
+RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
+	virtual/httpd-php"
+
+src_compile() {
+	#Default compile hangs!
+	echo "Nothing to compile"
+}
+
+src_install() {
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	einfo "Installing docs"
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	einfo "Copying main files"
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	# we install the .htaccess file to enable support for clean URLs
+	cp .htaccess ${D}/${MY_HTDOCSDIR}
+
+	# create the files upload directory
+	mkdir ${D}/${MY_HTDOCSDIR}/files
+	webapp_serverowned ${MY_HTDOCSDIR}/files
+
+	#All files must be owned by server
+	for x in `find . -type f -print` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/sites/default/settings.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-4.6.3.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"emerge --config =${PF} \""
+	einfo "if this is a new install."
+	einfo
+}
+
+pkg_config() {
+	# This is the default directory, but we have this portion for the user to
+	# change the default directory if it does not exist.
+	MY_HTDOCSDIR=/usr/share/webapps/${PN}/${PV}/htdocs
+	if [ ! -d ${MY_HTDOCSDIR} ] && \
+		[ ! -d ${MY_HTDOCSDIR}/modules ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ ! -d ${MY_HTDOCSDIR}/language ] ; then
+		einfo "Please specify the directory your drupal installation "
+		einfo "is installed in."
+		echo
+		while true
+		do
+			read -p " Please type in the name of the directory: " MY_HTDOCSDIR
+			[ -d ${MY_HTDOCSDIR} ] && \
+				[ -d ${MY_HTDOCSDIR}/modules ] && \
+				[ -d ${MY_HTDOCSDIR}/themes ] && \
+				[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+				[ -d ${MY_HTDOCSDIR}/language ] && \
+				break || \
+				ewarn "The directory ${MY_HTDOCSDIR} does not exist"
+		done
+	fi
+	if [ -d ${MY_HTDOCSDIR} ] && \
+		[ -d ${MY_HTDOCSDIR}/modules ] && \
+		[ -d ${MY_HTDOCSDIR}/themes ] && \
+		[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ -d ${MY_HTDOCSDIR}/language ] ; then
+		for i in modules themes engines language; do
+			cd ${MY_HTDOCSDIR}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			for item in `cat ${PORTDIR}/www-apps/${PN}/files/${MY_PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
+			done
+		done
+
+		find ${MY_HTDOCSDIR} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${MY_HTDOCSDIR} -type f -exec chmod 644 {} \;
+		find ${MY_HTDOCSDIR} -type d -exec chmod 755 {} \;
+	fi
+}
diff --git a/www-apps/drupal/files/digest-drupal-4.6.9 b/www-apps/drupal/files/digest-drupal-4.6.9
new file mode 100644
index 000000000000..861351c3a13a
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.6.9
@@ -0,0 +1,3 @@
+MD5 31573869c0e56de6329ee7d68429917c drupal-4.6.9.tar.gz 455264
+RMD160 afea2337cc8038947ae4301eaa88dc5b5a130128 drupal-4.6.9.tar.gz 455264
+SHA256 7243ec0112202a6f13e8d7d730a36f5ea57d8c768f0ee10e177aeb29cdb60171 drupal-4.6.9.tar.gz 455264
diff --git a/www-apps/drupal/files/digest-drupal-4.7.3 b/www-apps/drupal/files/digest-drupal-4.7.3
new file mode 100644
index 000000000000..646e06f399cd
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.7.3
@@ -0,0 +1,3 @@
+MD5 a5634cc8e9ed9795d5204b7fe9b3d226 drupal-4.7.3.tar.gz 484988
+RMD160 b302287bbae08fe0c3829cc83a6bc4419822dad0 drupal-4.7.3.tar.gz 484988
+SHA256 8f74dbd298ffb7c0ad3bc23a96347a3d2854bdc358fdd84d125e1a3791016c3a drupal-4.7.3.tar.gz 484988