Security bug #205346

(Portage version: 2.1.4_rc14)

4 files changed, 25 insertions, 6 deletions

diff --git a/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog
index 479d94fd755f..aff400300de1 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.33 2008/01/08 07:18:52 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.34 2008/01/27 20:41:44 rl03 Exp $
+
+*mambo-4.6.3-r1 (27 Jan 2008)
+
+  27 Jan 2008; Renat Lumpau <rl03@gentoo.org> -mambo-4.6.3.ebuild,
+  +mambo-4.6.3-r1.ebuild:
+  Security bug #205346
 
 *mambo-4.6.3 (08 Jan 2008)
 
diff --git a/www-apps/mambo/files/digest-mambo-4.6.3 b/www-apps/mambo/files/digest-mambo-4.6.3
deleted file mode 100644
index ee22096122d7..000000000000
--- a/www-apps/mambo/files/digest-mambo-4.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c3b18cac99bb89f9673321eb66572a68 MamboV4.6.3.tar.gz 2586263
-RMD160 010dd8c9ba5bda4f32ea0319b7c7e379bda9bb94 MamboV4.6.3.tar.gz 2586263
-SHA256 cb5d7bb1af22cb0100030e5cddf04ddeb733ffddf4ec74415394944fbe537e03 MamboV4.6.3.tar.gz 2586263
diff --git a/www-apps/mambo/files/digest-mambo-4.6.3-r1 b/www-apps/mambo/files/digest-mambo-4.6.3-r1
new file mode 100644
index 000000000000..a998615488bf
--- /dev/null
+++ b/www-apps/mambo/files/digest-mambo-4.6.3-r1
@@ -0,0 +1,6 @@
+MD5 3ed17c72f751c45daeb67e6f8d5816e1 20080110-Mambo46x-SearchPatch.zip 7274
+RMD160 93c5fc50ba7ad857e3dd2ac9ab27d85b19c52647 20080110-Mambo46x-SearchPatch.zip 7274
+SHA256 55ec8f816605820168980f8583a0e8394e00aff44eef0e9684cd2c67066e1587 20080110-Mambo46x-SearchPatch.zip 7274
+MD5 c3b18cac99bb89f9673321eb66572a68 MamboV4.6.3.tar.gz 2586263
+RMD160 010dd8c9ba5bda4f32ea0319b7c7e379bda9bb94 MamboV4.6.3.tar.gz 2586263
+SHA256 cb5d7bb1af22cb0100030e5cddf04ddeb733ffddf4ec74415394944fbe537e03 MamboV4.6.3.tar.gz 2586263
diff --git a/www-apps/mambo/mambo-4.6.3.ebuild b/www-apps/mambo/mambo-4.6.3-r1.ebuild
index 9edb1783d3c0..ac11ca9e31f6 100644
--- a/www-apps/mambo/mambo-4.6.3.ebuild
+++ b/www-apps/mambo/mambo-4.6.3-r1.ebuild
@@ -1,13 +1,14 @@
 # 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.ebuild,v 1.1 2008/01/08 07:18:52 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild,v 1.1 2008/01/27 20:41:44 rl03 Exp $
 
 inherit webapp depend.php
 
 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"
+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"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
@@ -24,6 +25,15 @@ pkg_setup () {
 	require_php_with_use mysql zlib
 }
 
+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