Remove old ebuilds and use upstream's XML-RPC patch so all features of b2evolution are restored.

(Portage version: 2.0.51.22-r2)

8 files changed, 18 insertions, 124 deletions

diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index 4202de6a23db..36bde56a4bad 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,15 @@
 # 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.6 2005/09/05 18:51:24 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.7 2005/09/09 22:03:46 halcy0n Exp $
+
+*b2evolution-0.9.0.12-r2 (09 Sep 2005)
+
+  09 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
+  -files/b2evolution-0.9.0.11.xmlrpc.patch,
+  -files/b2evolution-0.9.0.12-xmlrpc.patch, -b2evolution-0.9.0.12.ebuild,
+  -b2evolution-0.9.0.12-r1.ebuild, +b2evolution-0.9.0.12-r2.ebuild:
+  Remove old ebuilds and use upstream's XML-RPC patch so all features of
+  b2evolution are restored.
 
   06 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
   b2evolution-0.9.0.12-r1.ebuild:
diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
index 95a9c7f890cf..ea4d4b5f200e 100644
--- a/www-apps/b2evolution/Manifest
+++ b/www-apps/b2evolution/Manifest
@@ -1,9 +1,7 @@
 MD5 d9f1ca9c793a77f3757a1194ce88ffc2 ChangeLog 1285
+MD5 13e3fc5e0c82eb2be396bc4706f57a51 b2evolution-0.9.0.12.ebuild 1332
 MD5 a87207b3b148a8e1057c02dad9d02af8 metadata.xml 247
 MD5 adfc3b3d69b4f6d8cbf86089a5617145 b2evolution-0.9.0.12-r1.ebuild 1521
-MD5 13e3fc5e0c82eb2be396bc4706f57a51 b2evolution-0.9.0.12.ebuild 1332
-MD5 b1d08f2bc38239a6757449d0c54d3036 files/digest-b2evolution-0.9.0.12 81
+MD5 52ed054bc30c0f905a7f6e9937cfb84a b2evolution-0.9.0.12-r2.ebuild 1472
+MD5 9853359feda6d8e9a9ee8f59499e9efb files/digest-b2evolution-0.9.0.12-r2 143
 MD5 d584b5d4ec8d7378cbfcc77cde85306d files/postinstall-en.txt 340
-MD5 5a1f32b5f7da0414529e5b8ef583bb44 files/b2evolution-0.9.0.11.xmlrpc.patch 1157
-MD5 5a1f32b5f7da0414529e5b8ef583bb44 files/b2evolution-0.9.0.12-xmlrpc.patch 1157
-MD5 ad953d6f2d11692fe4efd3eeafb0ad0f files/digest-b2evolution-0.9.0.12-r1 144
diff --git a/www-apps/b2evolution/b2evolution-0.9.0.12-r1.ebuild b/www-apps/b2evolution/b2evolution-0.9.0.12-r2.ebuild
index 5a5563c00ad5..9bf417c846b3 100644
--- a/www-apps/b2evolution/b2evolution-0.9.0.12-r1.ebuild
+++ b/www-apps/b2evolution/b2evolution-0.9.0.12-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/09/05 18:51:24 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.0.12-r2.ebuild,v 1.1 2005/09/09 22:03:46 halcy0n Exp $
 
 inherit webapp eutils
 
@@ -8,7 +8,8 @@ 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"
+SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip
+mirror://sourceforge/evocms/xmlrpc_fix_112.zip"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
@@ -25,12 +26,9 @@ 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
+	cp -f ${WORKDIR}/xmlrpc_fix_112/b2evocore/* blogs/b2evocore/
 }
 
 src_install() {
diff --git a/www-apps/b2evolution/b2evolution-0.9.0.12.ebuild b/www-apps/b2evolution/b2evolution-0.9.0.12.ebuild
deleted file mode 100644
index 237ab5dc7186..000000000000
--- a/www-apps/b2evolution/b2evolution-0.9.0.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.ebuild,v 1.1 2005/07/05 23:52:40 halcy0n 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"
-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
-}
-
-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/b2evolution-0.9.0.11.xmlrpc.patch b/www-apps/b2evolution/files/b2evolution-0.9.0.11.xmlrpc.patch
deleted file mode 100644
index 513e08027eac..000000000000
--- a/www-apps/b2evolution/files/b2evolution-0.9.0.11.xmlrpc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- b2evolution/blogs/b2evocore/_functions_xmlrpc.php.old	2005-07-05 10:34:29.000000000 +0200
-+++ b2evolution/blogs/b2evocore/_functions_xmlrpc.php	2005-07-05 10:36:01.000000000 +0200
-@@ -226,7 +226,7 @@
- 		$_xh[$parser]['qt']=0;

- 	  break;

- 	case "NAME":

--	  $_xh[$parser]['st'].="'"; $_xh[$parser]['ac']="";

-+	  $_xh[$parser]['st'].='"'; $_xh[$parser]['ac']="";

- 	  break;

- 	case "FAULT":

- 	  $_xh[$parser]['isf']=1;

-@@ -292,7 +292,7 @@
- 	  $_xh[$parser]['cm']--;

- 	  break;

- 	case "NAME":

--	  $_xh[$parser]['st'].= $_xh[$parser]['ac'] . "' => ";

-+	  $_xh[$parser]['st'].= $_xh[$parser]['ac'] . '" => ';

- 	  break;

- 	case "BOOLEAN":

- 		// special case here: we translate boolean 1 or 0 into PHP

-@@ -313,7 +313,7 @@
- 			// we use double quotes rather than single so backslashification works OK

- 			$_xh[$parser]['st'].="\"". $_xh[$parser]['ac'] . "\""; 

- 		} else if ($_xh[$parser]['qt']==2) {

--			$_xh[$parser]['st'].="base64_decode('". $_xh[$parser]['ac'] . "')"; 

-+			$_xh[$parser]['st'].='base64_decode("'. $_xh[$parser]['ac'] . '")'; 

- 		} else if ($name=="BOOLEAN") {

- 			$_xh[$parser]['st'].=$_xh[$parser]['ac'];

- 		} else {

diff --git a/www-apps/b2evolution/files/b2evolution-0.9.0.12-xmlrpc.patch b/www-apps/b2evolution/files/b2evolution-0.9.0.12-xmlrpc.patch
deleted file mode 100644
index 513e08027eac..000000000000
--- a/www-apps/b2evolution/files/b2evolution-0.9.0.12-xmlrpc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- b2evolution/blogs/b2evocore/_functions_xmlrpc.php.old	2005-07-05 10:34:29.000000000 +0200
-+++ b2evolution/blogs/b2evocore/_functions_xmlrpc.php	2005-07-05 10:36:01.000000000 +0200
-@@ -226,7 +226,7 @@
- 		$_xh[$parser]['qt']=0;

- 	  break;

- 	case "NAME":

--	  $_xh[$parser]['st'].="'"; $_xh[$parser]['ac']="";

-+	  $_xh[$parser]['st'].='"'; $_xh[$parser]['ac']="";

- 	  break;

- 	case "FAULT":

- 	  $_xh[$parser]['isf']=1;

-@@ -292,7 +292,7 @@
- 	  $_xh[$parser]['cm']--;

- 	  break;

- 	case "NAME":

--	  $_xh[$parser]['st'].= $_xh[$parser]['ac'] . "' => ";

-+	  $_xh[$parser]['st'].= $_xh[$parser]['ac'] . '" => ';

- 	  break;

- 	case "BOOLEAN":

- 		// special case here: we translate boolean 1 or 0 into PHP

-@@ -313,7 +313,7 @@
- 			// we use double quotes rather than single so backslashification works OK

- 			$_xh[$parser]['st'].="\"". $_xh[$parser]['ac'] . "\""; 

- 		} else if ($_xh[$parser]['qt']==2) {

--			$_xh[$parser]['st'].="base64_decode('". $_xh[$parser]['ac'] . "')"; 

-+			$_xh[$parser]['st'].='base64_decode("'. $_xh[$parser]['ac'] . '")'; 

- 		} else if ($name=="BOOLEAN") {

- 			$_xh[$parser]['st'].=$_xh[$parser]['ac'];

- 		} else {

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
deleted file mode 100644
index 08b46d82be45..000000000000
--- a/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7f08250c3d08c2c55e75655fbffa2d98 b2evolution-0.9.0.12-2005-05-06.zip 2857939
-MD5 ab25eda6276a17d1ac8e1d5586e67db8 b2evo-xmlrpc.tar.gz 19996
diff --git a/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12 b/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12-r2
index 59ea20911530..d9c7d51613fd 100644
--- a/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12
+++ b/www-apps/b2evolution/files/digest-b2evolution-0.9.0.12-r2
@@ -1 +1,2 @@
 MD5 7f08250c3d08c2c55e75655fbffa2d98 b2evolution-0.9.0.12-2005-05-06.zip 2857939
+MD5 3083b4118e72e1ef87a827c20522bda6 xmlrpc_fix_112.zip 22264