Added joomla-1.5.0 in response to sec issue #204335. Removed insecure

joomla-1.0.13.
(Portage version: 2.1.4_rc7)

5 files changed, 39 insertions, 22 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 6e64168f5d23..486549e0a0b5 100644
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/joomla
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.16 2007/01/03 00:18:02 rl03 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.17 2008/01/23 09:29:55 wrobel Exp $
+
+*joomla-1.5.0 (23 Jan 2008)
+
+  23 Jan 2008; Gunnar Wrobel <wrobel@gentoo.org> files/postinstall-en.txt,
+  -joomla-1.0.13.ebuild, +joomla-1.5.0.ebuild:
+  Added joomla-1.5.0 in response to sec issue #204335. Removed insecure
+  joomla-1.0.13.
 
 *joomla-1.0.12 (03 Jan 2007)
 
diff --git a/www-apps/joomla/files/digest-joomla-1.0.13 b/www-apps/joomla/files/digest-joomla-1.0.13
deleted file mode 100644
index 31798a149925..000000000000
--- a/www-apps/joomla/files/digest-joomla-1.0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed01a4269faf3851a9f8320ac4de12fc Joomla_1.0.13-Stable-Full_Package.tar.bz2 1698797
-RMD160 80bbf606e83df0b8792a819a454e6a059a2a505e Joomla_1.0.13-Stable-Full_Package.tar.bz2 1698797
-SHA256 be91e0d85089d7197a687377076828eaa62253408b544baef528fee0c17e0cfa Joomla_1.0.13-Stable-Full_Package.tar.bz2 1698797
diff --git a/www-apps/joomla/files/digest-joomla-1.5.0 b/www-apps/joomla/files/digest-joomla-1.5.0
new file mode 100644
index 000000000000..ef940c8d6e30
--- /dev/null
+++ b/www-apps/joomla/files/digest-joomla-1.5.0
@@ -0,0 +1,3 @@
+MD5 668bbbe75980e51f71ec5c061387ca5c Joomla-1.5.0.tar.bz2 3255672
+RMD160 cf1c6a9da3d1ae5f125916d347a224a96f7082f5 Joomla-1.5.0.tar.bz2 3255672
+SHA256 56fb0ac8910ff33732efaf48a5ef12e6aefc52219bede34ad5c1a911d4198eef Joomla-1.5.0.tar.bz2 3255672
diff --git a/www-apps/joomla/files/postinstall-en.txt b/www-apps/joomla/files/postinstall-en.txt
index e3a6ef1b3089..86606ab9b16c 100644
--- a/www-apps/joomla/files/postinstall-en.txt
+++ b/www-apps/joomla/files/postinstall-en.txt
@@ -1,24 +1,25 @@
 You are almost done!
 
-  0. Setup the db
+  0. Setup a database (e.g. MySQL: see 
+                       http://www.gentoo.org/doc/en/mysql-howto.xml)
 
-  1. Restart Apache
+  1. Login on http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+     and finish the installation.
+
+
+  2. Move into the directory where you installed Joomla and remove
+     the "installation" folder:
 
-  2. Login on http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
-  and finish the installation. IMPORTANT: the web
-  installer will complain that configuration.php is not writeable. When you
-  are done, create configuration.php in ${MY_INSTALLDIR} and copy the generated
-  configuration into it. Then execute the following:
   # cd ${MY_INSTALLDIR}
-  # chown apache:apache configuration.php
-  # chmod u+w configuration.php
+  # rm -rf installation
 
   3. You can now launch your browser and point it to your Joomla site e.g.
 
   http://${VHOST_HOSTNAME}/${VHOST_APPDIR} -> Main Site
   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/administrator -> Admin
 
-  You can log into Admin using the username 'admin' along with the
-  password that was generated or you chose during the web based install.
+  You can log into the administration view using the username 'admin' 
+  along with the password that was generated or you chose during the
+  web based installation.
 
   Enjoy Joomla!
diff --git a/www-apps/joomla/joomla-1.0.13.ebuild b/www-apps/joomla/joomla-1.5.0.ebuild
index f0c8e8e61a39..426d8d839928 100644
--- a/www-apps/joomla/joomla-1.0.13.ebuild
+++ b/www-apps/joomla/joomla-1.5.0.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.0.13.ebuild,v 1.2 2007/08/10 01:54:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.0.ebuild,v 1.1 2008/01/23 09:29:55 wrobel Exp $
 
 inherit webapp depend.php
 
+MY_PN=${PN/j/J}
+
 DESCRIPTION="Joomla is one of the most powerful Open Source Content Management Systems on the planet."
 HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://downloads.joomlacode.org/frsrelease/1/3/2/13215/Joomla_${PV}-Stable-Full_Package.tar.bz2"
+SRC_URI="http://joomlacode.org/gf/download/frsrelease/5078/21063/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
@@ -14,6 +16,8 @@ S="${WORKDIR}"
 
 IUSE=""
 
+RDEPEND="virtual/httpd-cgi"
+
 need_php
 
 pkg_setup () {
@@ -25,18 +29,23 @@ src_install () {
 	webapp_src_preinst
 	local files="administrator/backups administrator/components
 	administrator/modules administrator/templates cache components
-	images images/banners images/stories language mambots mambots/content
-	mambots/editors mambots/editors-xtd mambots/search mambots/system
-	media modules templates"
+	images images/banners images/stories language
+	media modules templates configuration.php"
 
 	dodoc CHANGELOG.php INSTALL.php
 
 	cp -R . "${D}/${MY_HTDOCSDIR}"
 
+	# Create an empty configuration file that will be writeable
+	#to the web server
+	touch "${D}/${MY_HTDOCSDIR}/configuration.php"
+
 	for file in ${files}; do
 		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
+	webapp_configfile "${MY_HTDOCSDIR}/configuration.php"
+
 	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
 
 	webapp_src_install