Fix for security bug #102375

Package-Manager: portage-2.0.51.22-r2

4 files changed, 70 insertions, 14 deletions

diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index 59c06553a567..c8a328a985d8 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/b2evolution
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.4 2005/07/05 23:52:40 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.5 2005/08/24 07:39:56 stuart Exp $
+
+*b2evolution-0.9.0.12-r1 (24 Aug 2005)
+
+  24 Aug 2005; Stuart Herbert <stuart@gentoo.org>
+  +b2evolution-0.9.0.12-r1.ebuild:
+  Patched for XMLRPC vulnerability; see bug #102375
 
 *b2evolution-0.9.0.12 (05 Jul 2005)
 
diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
index b549db25fd87..2dd57ffbc446 100644
--- a/www-apps/b2evolution/Manifest
+++ b/www-apps/b2evolution/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 13e3fc5e0c82eb2be396bc4706f57a51 b2evolution-0.9.0.12.ebuild 1332
-MD5 8d3164563466ec765321ab56c61538fe ChangeLog 981
+MD5 d72f245f33a3a247f5a2688271990838 ChangeLog 1158
 MD5 a87207b3b148a8e1057c02dad9d02af8 metadata.xml 247
-MD5 5a1f32b5f7da0414529e5b8ef583bb44 files/b2evolution-0.9.0.11.xmlrpc.patch 1157
+MD5 13e3fc5e0c82eb2be396bc4706f57a51 b2evolution-0.9.0.12.ebuild 1332
+MD5 b63af7f382c2447460348498c3ed17fe b2evolution-0.9.0.12-r1.ebuild 1508
 MD5 b1d08f2bc38239a6757449d0c54d3036 files/digest-b2evolution-0.9.0.12 81
 MD5 d584b5d4ec8d7378cbfcc77cde85306d files/postinstall-en.txt 340
+MD5 5a1f32b5f7da0414529e5b8ef583bb44 files/b2evolution-0.9.0.11.xmlrpc.patch 1157
+MD5 ad953d6f2d11692fe4efd3eeafb0ad0f files/digest-b2evolution-0.9.0.12-r1 144
 MD5 5a1f32b5f7da0414529e5b8ef583bb44 files/b2evolution-0.9.0.12-xmlrpc.patch 1157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCza7qTOXg++0VvJQRAhuQAJ9sp+S5tb5ycG4BvISX2dVVNsP52wCfQC22
-aDAH8VSdXS8Edjv0KQra+2A=
-=paDK
------END PGP SIGNATURE-----
diff --git a/www-apps/b2evolution/b2evolution-0.9.0.12-r1.ebuild b/www-apps/b2evolution/b2evolution-0.9.0.12-r1.ebuild
new file mode 100644
index 000000000000..894241ff7e41
--- /dev/null
+++ b/www-apps/b2evolution/b2evolution-0.9.0.12-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.0.12-r1.ebuild,v 1.1 2005/08/24 07:39:56 stuart Exp $
+
+inherit webapp eutils
+
+MY_EXT="-2005-05-06"
+
+DESCRIPTION="Multilingual multiuser multi-blog engine"
+HOMEPAGE="http://www.b2evolution.net"
+SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip http://dev.gentoo.org/~stuart/patches/b2evo-xmlrpc.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+RDEPEND=">=dev-php/mod_php-4.1
+	 >=dev-db/mysql-3.23.23"
+
+DEPEND="${DEPEND} ${RDEPEND}
+	>=net-www/webapp-config-1.10-r5
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#bug 97650
+	epatch ${FILESDIR}/${P}-xmlrpc.patch
+
+	#bug 102375
+	einfo "Patching for XMLRPC injection vulnerability"
+	cp -f ${WORKDIR}/b2evo-xmlrpc/* blogs/b2evocore
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einfo "Installing main files"
+	cp -r blogs/* ${D}${MY_HTDOCSDIR}
+	einfo "Done"
+
+	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
+		doc/upgradefrom_gl.html doc/upgradefrom_miniblog.html doc/upgradefrom_mt.html
+
+	# Identify the configuration files that this app uses
+	# User can want to make changes to these!
+	webapp_serverowned ${MY_HTDOCSDIR}/conf/_config.php
+	webapp_serverowned ${MY_HTDOCSDIR}
+
+	# post-install instructions
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	# now strut stuff
+	webapp_src_install
+}
diff --git a/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12-r1 b/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12-r1
new file mode 100644
index 000000000000..08b46d82be45
--- /dev/null
+++ b/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12-r1
@@ -0,0 +1,2 @@
+MD5 7f08250c3d08c2c55e75655fbffa2d98 b2evolution-0.9.0.12-2005-05-06.zip 2857939
+MD5 ab25eda6276a17d1ac8e1d5586e67db8 b2evo-xmlrpc.tar.gz 19996