Version bump : security flaw

Package-Manager: portage-2.0.51.22-r2

8 files changed, 176 insertions, 18 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 255cf266edcf..c970c7038585 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.19 2005/08/04 09:08:24 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.20 2005/09/05 01:23:44 st_lim Exp $
+
+*drupal-4.6.3 (05 Sep 2005)
+
+  05 Sep 2005; Lim Swee Tat <st_lim@gentoo.org> files/4.6.0/engines,
+  files/4.6.0/language, files/4.6.0/modules, files/4.6.0/themes,
+  +drupal-4.6.3.ebuild:
+  Version bumped to 4.6.3
 
   04 Aug 2005; Lim Swee Tat <st_lim@gentoo.org> drupal-4.5.2.ebuild,
   drupal-4.6.2.ebuild:
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 9defe27d95f2..78806e9ff8e7 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 32c504666cfbf4b5945eff5786ca636f ChangeLog 1613
+MD5 60f9854d466906a653ae75551aa90f29 ChangeLog 1827
+MD5 3030ce110387954e0e700302032d9eca drupal-4.6.3.ebuild 3755
+MD5 31a7762b97d644514268dab18f853a27 metadata.xml 274
 MD5 e4f9cbc61147e254fac7a43c679cc943 drupal-4.5.2.ebuild 30641
 MD5 e82b6e40e3e223403bb373c04d346d72 drupal-4.6.2.ebuild 3757
-MD5 57ac487dc3baa53dc38afabe1f689999 files/4.6.0/engines 12
-MD5 044a234820dd9d17176aeecb72317f97 files/4.6.0/language 81
-MD5 3ddf6c4a30991fd5618b3f0e88e1b6de files/4.6.0/modules 1455
-MD5 1c97d7ff8b82cf1bbfebde2a2e533d90 files/4.6.0/themes 204
-MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
 MD5 3696ea6a2d2569722c9feebb2c9a7093 files/digest-drupal-4.6.2 64
 MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
-MD5 31a7762b97d644514268dab18f853a27 metadata.xml 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDEhmoI1lqEGTUzyQRAuTDAJ971ugt049XNCEQ3tG4q2qJRHHukwCfQVpN
-LLr3frJ/CpetWJkN7RpcFLA=
-=z3OA
------END PGP SIGNATURE-----
+MD5 35efbdccb8fc0c5155a69dff4283ce9b files/digest-drupal-4.6.3 64
+MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
+MD5 9fab4b6b4888063b5c20ba910a48fdfc files/4.6.0/language 87
+MD5 d7b1b8d876c18ddcbdcacbb3d1810d32 files/4.6.0/themes 259
+MD5 7f7293c73bc101820993496a98f5d4fe files/4.6.0/engines 28
+MD5 71ec4b212a7ef95af70c2d140533e244 files/4.6.0/modules 1802
diff --git a/www-apps/drupal/drupal-4.6.3.ebuild b/www-apps/drupal/drupal-4.6.3.ebuild
new file mode 100644
index 000000000000..e88805d85f16
--- /dev/null
+++ b/www-apps/drupal/drupal-4.6.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.3.ebuild,v 1.1 2005/09/05 01:23:44 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
+HOMEPAGE="http://drupal.org"
+IUSE="mysql"
+
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~ppc ~x86 ~amd64"
+
+DEPEND="virtual/php"
+RDEPEND="mysql? ( dev-db/mysql )"
+
+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.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	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/4.6.0/engines b/www-apps/drupal/files/4.6.0/engines
index d7180787161f..a44e677b2183 100644
--- a/www-apps/drupal/files/4.6.0/engines
+++ b/www-apps/drupal/files/4.6.0/engines
@@ -1 +1,3 @@
 phptemplate
+smarty
+wgsmarty
diff --git a/www-apps/drupal/files/4.6.0/language b/www-apps/drupal/files/4.6.0/language
index ea02f2e1fd45..d4cf19da841d 100644
--- a/www-apps/drupal/files/4.6.0/language
+++ b/www-apps/drupal/files/4.6.0/language
@@ -1,5 +1,6 @@
 drupal-pot
 af
+eu
 pt-br
 ca
 zh-hans
@@ -9,6 +10,7 @@ da
 nl
 fr
 de
+el
 hu
 it
 ja
diff --git a/www-apps/drupal/files/4.6.0/modules b/www-apps/drupal/files/4.6.0/modules
index 9200fc3a1eed..54fe9a9f23a3 100644
--- a/www-apps/drupal/files/4.6.0/modules
+++ b/www-apps/drupal/files/4.6.0/modules
@@ -11,13 +11,16 @@ bbcode_wysiwyg
 blogtheme
 bookreview
 bookmarks
+browscap
 buddylist
 captcha
 chatbox
 codefilter
+comic
 commentcloser
 contact_dir
 contextlinks
+csvfilter
 currency
 customerror
 daily
@@ -27,6 +30,7 @@ distantparent
 donations
 download_counter
 ecommerce
+evaluation
 event
 eventfinder
 excerpt
@@ -35,6 +39,7 @@ fckeditor
 feedback
 filemanager
 filestore2
+flexiblock
 flexinode
 foaf
 folksonomy
@@ -46,6 +51,7 @@ front
 fscache
 gallery
 glossary
+gsitemap
 guestbook
 hof
 helpedit
@@ -60,10 +66,15 @@ indexpage
 inline
 i18n
 interwiki
+jobsearch
 jsdomenu
+latex
+files/projects/ldap_integration-4.5.0.tar.gz
+ldap_integration
 ldap_integration
 legal
 linkattach
+listhandler
 livediscussions
 location
 mail
@@ -73,10 +84,13 @@ marksmarty
 massmailer
 members
 menu_otf
+microfiction
+moviereview
 nodewords
 nodelist
 nmoderation
 node_privacy_byrole
+node_type_filter
 nodevote
 node_import
 notify
@@ -86,11 +100,13 @@ paypal_framework
 paypal_subscription
 album
 poormanscron
+print
 privatemsg
 project
 quote
 quotes
 recipe
+roledelay
 rsvp
 scheduler
 scripturefilter
@@ -98,7 +114,10 @@ securesite
 series
 shoutbox
 sidecontent
+signup
 similar
+simple_access
+simplenews
 simpletest
 site_map
 profile_pages
@@ -110,26 +129,34 @@ trip_search
 statistics_filter
 statistics_trends
 stock
+subscription
 subscriptions
 summary
 survey
 swish
 sxip
 syndication
+tables
 taxonomy_access
+taxonomy_assoc
 taxonomy_block
 taxonomy_browser
 taxonomy_context
 taxonomy_dhtml
+taxonomy_image
 taxonomy_xml
 taxonomy_menu
 taxonomy_multi_edit
+taxonomy_theme
 textile
 theme_editor
+themedev
 tinymce
 trackback
 troll
 urlfilter
+userpoints
+user_related_content
 variable
 video
 vimcolor
@@ -142,3 +169,8 @@ whatsrelated
 wiki
 wordfilter
 workspace
+
+
+
+
+
diff --git a/www-apps/drupal/files/4.6.0/themes b/www-apps/drupal/files/4.6.0/themes
index e28fb31b7555..f30367335d24 100644
--- a/www-apps/drupal/files/4.6.0/themes
+++ b/www-apps/drupal/files/4.6.0/themes
@@ -1,7 +1,10 @@
 adc
+argeebee
 blix
 bluemarine
+bluemarine_smarty
 box_grey
+box_grey_smarty
 civicspace
 democratica
 friendselectric
@@ -12,6 +15,7 @@ gworks
 interlaced
 kubrick
 leaf
+leaf_smarty
 lincolns_revenge
 manji
 marvinclassic
diff --git a/www-apps/drupal/files/digest-drupal-4.6.3 b/www-apps/drupal/files/digest-drupal-4.6.3
new file mode 100644
index 000000000000..2c2f9f78097e
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.6.3
@@ -0,0 +1 @@
+MD5 f436973f02aa2cea15ef1ca90223082b drupal-4.6.3.tar.gz 458095