Updated mambo in response to sec issue #224513.

Package-Manager: portage-2.1.4.4

4 files changed, 47 insertions, 44 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/Manifest b/www-apps/mambo/Manifest
index 5b4611b1a902..93544493d7c2 100644
--- a/www-apps/mambo/Manifest
+++ b/www-apps/mambo/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX postinstall-en.txt 991 RMD160 6030d6f513a42ea02454c1d922a042f0de0fd63c SHA1 5cdada0fa00fe13412baaaa08b58e2eb46505674 SHA256 1e10cf8e67825d49baeeae9180d6a1defd020c5d1fd7eae3bef4eef50e8b6e7e
-DIST 20080110-Mambo46x-SearchPatch.zip 7274 RMD160 93c5fc50ba7ad857e3dd2ac9ab27d85b19c52647 SHA1 eb40b4a8b583d789aee139c791ddc2ac2078545b SHA256 55ec8f816605820168980f8583a0e8394e00aff44eef0e9684cd2c67066e1587
-DIST MamboV4.6.3.tar.gz 2586263 RMD160 010dd8c9ba5bda4f32ea0319b7c7e379bda9bb94 SHA1 967dc1ca69da5eab1cb5d45c94f65d738b1f770d SHA256 cb5d7bb1af22cb0100030e5cddf04ddeb733ffddf4ec74415394944fbe537e03
-EBUILD mambo-4.6.3-r1.ebuild 1708 RMD160 a91b5ed13c4ba455f06054906c0e1268197bfcee SHA1 80532b50372cf55082fb16e72142d76ad5f529d8 SHA256 fef118b417421ecaaf86d2f775b0cc465d0ae7decb77dc5f4a46354cb97e65aa
-MISC ChangeLog 5392 RMD160 602a55535ff7cdf7d4a66fe304633b21bc87fdcb SHA1 fb2c4343629668a39c08f47614254dc80e662b34 SHA256 8f4c2fd56b4e3012509e8210079246a24ad7d379d188763645d29b3d8148acfd
+AUX postinstall-en.txt 1051 RMD160 78da14f511bdfd30f4a902b484c17dde8e6a2bec SHA1 bea41bc7bf8a53fd6906ffdddf3c233c45818905 SHA256 b1b7943d2cf44754878fc20f46337139d18dc9e3e9c43b3dbc4dd8504c400483
+DIST MamboV4.6.4.tar.gz 3313650 RMD160 3f76ea1f8ea5d5e09683c113a79ef6c1438cd880 SHA1 8a3d90c2d841208f94a9530ae304eef8d4d8ce21 SHA256 ae4eb563ac5a03909130ba28fec050080bd6589c7a564c857c81d8c8f32d1629
+EBUILD mambo-4.6.4.ebuild 1585 RMD160 a56a4ce61dd0efd8b9ba8c5061fd99bfc1496ba3 SHA1 711f6ab9abd3302fec0a3eb39e424ecc834746d7 SHA256 1e4e5831dc2a46a09aaa3a5d42f4499a043f09cdd8e253d693ecbc16090a9a3a
+MISC ChangeLog 5577 RMD160 a6c6d9993d58654e05d693a4a09a5bbf6b64073f SHA1 639fdc3734577e67a0e0d426367d8204940205a3 SHA256 7e8c25c02e64bc68acbdcc899d6543110c6abeff40c50c1bb35d12bc64efbd42
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkel9SYACgkQmPFBzbX68WHCagCeJ1dwBVXZb9b224cKDnSmyaE0
-ZyYAn1maC+44aHgB0QveUu3lquRdexpF
-=iV8H
+iD8DBQFIW9Z/EEcxCpcDQ74RAlslAJ9kZws1Cu46LhASkU1e1YUyGHQhSwCggnja
+6QTldleCPleQsrQ+p3eabLo=
+=SPL8
 -----END PGP SIGNATURE-----
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