Updated mambo in response to sec issue #224513.

(Portage version: 2.1.4.4)

3 files changed, 39 insertions, 35 deletions

diff --git a/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog
index c7836fe7e557..9188b350c70e 100644
--- a/www-apps/mambo/ChangeLog
+++ b/www-apps/mambo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/mambo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.35 2008/02/03 17:08:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.36 2008/06/20 16:10:29 wrobel Exp $
+
+*mambo-4.6.4 (20 Jun 2008)
+
+  20 Jun 2008; wrobel@gentoo.org files/postinstall-en.txt,
+  -mambo-4.6.3-r1.ebuild, +mambo-4.6.4.ebuild:
+  Updated mambo in response to sec issue #224513.
 
   03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mambo-4.6.3-r1.ebuild:
   merge from webapps overlay wrt #208584
diff --git a/www-apps/mambo/files/postinstall-en.txt b/www-apps/mambo/files/postinstall-en.txt
index 242477ce98b9..41c996f2c60f 100644
--- a/www-apps/mambo/files/postinstall-en.txt
+++ b/www-apps/mambo/files/postinstall-en.txt
@@ -1,30 +1,32 @@
 You are almost done!
 
-  0. Setup the db.
+You will need to provide a database for your ${PN} installation.
 
-  1. Restart Apache
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
 
-  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
+http://www.gentoo.org/doc/en/mysql-howto.xml
 
-  3. (Stolen from
-  http://www.mamboserver.com/MOS_FAQs/Installing_Mambo_Open_Source/Installing_Mambo_Open_Source/
-  , which you should also read)
+Once you have a database ready all you need to do is to go to this 
+location
 
-  CONFIGURE MOS
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php
 
-  You can now launch your browser and point it to your MOS site e.g.
+and provide the credentials required for the database access.
 
-  http://${VHOST_HOSTNAME}/${VHOST_APPDIR} -> Main Site
-  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/administrator -> Admin
+After the setup you can launch your browser and point it to your S{PN}
+site e.g.
 
-  You can log into Admin using the username 'admin' along with the
-  password that was generated or you chose during the web based install.
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR} -> Main Site
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/administrator -> Admin
 
-  Enjoy Mambo!
+You can log in as administrator using the username 'admin' along with the
+password that was generated or you chose during the web based installation.
+
+If your site is working fine you should ensure you secure your installation
+by removing the "installation" directory from the installed web application:
+
+  rm -rf ${MY_INSTALLDIR}/installation
+
+Enjoy ${PN}!
diff --git a/www-apps/mambo/mambo-4.6.3-r1.ebuild b/www-apps/mambo/mambo-4.6.4.ebuild
index 91701a359ce8..9d9fed2350aa 100644
--- a/www-apps/mambo/mambo-4.6.3-r1.ebuild
+++ b/www-apps/mambo/mambo-4.6.4.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild,v 1.2 2008/02/03 17:08:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.6.4.ebuild,v 1.1 2008/06/20 16:10:29 wrobel Exp $
 
 inherit webapp depend.php depend.apache
 
 MY_PN="${PN/m/M}"
 DESCRIPTION="Mambo is a dynamic portal engine and content management system"
 HOMEPAGE="http://www.mamboserver.com/"
-SRC_URI="http://mambo-code.org/gf/download/frsrelease/274/437/${MY_PN}V${PV}.tar.gz
-	http://mambo-code.org/gf/download/frsrelease/298/544/20080110-Mambo46x-SearchPatch.zip"
+SRC_URI="http://mambo-code.org/gf/download/frsrelease/369/706/${MY_PN}V${PV}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
@@ -27,23 +26,17 @@ pkg_setup () {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp -f 20080110-Mambo46x-SearchPatch/components/com_search/* components/com_search
-	cp -f 20080110-Mambo46x-SearchPatch/modules/* modules
-	rm -rf 20080110-Mambo46x-SearchPatch
-}
-
 src_install () {
 	webapp_src_preinst
 	local files="administrator/backups administrator/components components
 	images images/banners images/stories mambots mambots/content mambots/search
 	media language administrator/modules administrator/templates cache modules
-	templates mambots/editors mambots/editors-xtd uploadfiles"
+	templates mambots/editors mambots/editors-xtd uploadfiles configuration.php
+	installation/langconfig.php"
 
-	dodoc CHANGELOG.php INSTALL.php README
+	dodoc CHANGELOG.php INSTALL.php
+
+	touch configuration.php
 
 	cp -R [^d]* "${D}/${MY_HTDOCSDIR}"
 
@@ -51,6 +44,9 @@ src_install () {
 		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
+	webapp_configfile "${MY_HTDOCSDIR}/configuration.php"
+	webapp_configfile "${MY_HTDOCSDIR}/installation/langconfig.php"
+
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
 	webapp_src_install