Fix for security bug #97458

(Portage version: 2.0.51.19)

6 files changed, 81 insertions, 3 deletions

diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index 776d948cb34f..965c4f7faaf9 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/phpwiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.6 2005/06/22 03:17:09 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.7 2005/07/05 22:25:55 stuart Exp $
+
+  05 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +phpwiki-1.3.10.ebuild, files/phpwiki-1.3.10-xmlrpc.patch:
+  Applied patch for security bug #97458
 
   22 Jun 2005; Jason Wever <weeve@gentoo.org> phpwiki-1.3.10.ebuild:
   Added ~sparc keyword.
diff --git a/www-apps/phpwiki/Manifest b/www-apps/phpwiki/Manifest
index cf6e30b30434..0d07866257ce 100644
--- a/www-apps/phpwiki/Manifest
+++ b/www-apps/phpwiki/Manifest
@@ -2,7 +2,10 @@ MD5 cee59bf1b68d04b3261fdb9dd2f02cce ChangeLog 1020
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 59df12ec164dc5e0edc018ff5b723b01 phpwiki-1.2.4.ebuild 805
 MD5 9e54aec0f26142c9be6ccb34c3af281d phpwiki-1.3.10.ebuild 1035
+MD5 a84eca16a8fe910e3d1857c252bc3f77 phpwiki-1.3.10-r1.ebuild 1090
 MD5 61ddc0899b2191583eb5755c954e5f14 files/digest-phpwiki-1.2.4 65
 MD5 c913f380e9beddcca756ea5d0c6fd85f files/postinstall-en.txt 149
 MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10 67
 MD5 92c75a61f01013f717a725a91824cd51 files/postinstall-1.3-en.txt 184
+MD5 3259bf9dc4bef8f25c35478900932b96 files/phpwiki-1.3.10-xmlrpc.patch 959
+MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10-r1 67
diff --git a/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r1 b/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r1
new file mode 100644
index 000000000000..26d9b67c579a
--- /dev/null
+++ b/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r1
@@ -0,0 +1 @@
+MD5 8747352d84836671445a6eb95b2184a7 phpwiki-1.3.10.tar.gz 2072469
diff --git a/www-apps/phpwiki/files/phpwiki-1.3.10-xmlrpc.patch b/www-apps/phpwiki/files/phpwiki-1.3.10-xmlrpc.patch
new file mode 100644
index 000000000000..c51cbfd38f33
--- /dev/null
+++ b/www-apps/phpwiki/files/phpwiki-1.3.10-xmlrpc.patch
@@ -0,0 +1,29 @@
+--- phpwiki-1.3.10/lib/XMLRPC/xmlrpc.inc.old	2005-07-04 22:42:16.000000000 +0200
++++ phpwiki-1.3.10/lib/XMLRPC/xmlrpc.inc	2005-07-04 22:42:18.000000000 +0200
+@@ -197,7 +197,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;
+@@ -274,7 +274,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
+@@ -302,7 +302,7 @@
+ 				}
+ 				elseif ($_xh[$parser]['qt']==2)
+ 				{
+-					$_xh[$parser]['st'].="base64_decode('". $_xh[$parser]['ac'] . "')"; 
++					$_xh[$parser]['st'].='base64_decode("'. $_xh[$parser]['ac'] . '")'; 
+ 				}
+ 				elseif ($name=='BOOLEAN')
+ 				{
diff --git a/www-apps/phpwiki/phpwiki-1.2.4.ebuild b/www-apps/phpwiki/phpwiki-1.2.4.ebuild
index 9011ae15ed90..df0836bf62bd 100644
--- a/www-apps/phpwiki/phpwiki-1.2.4.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.2.4.ebuild,v 1.4 2004/09/03 17:17:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.2.4.ebuild,v 1.5 2005/07/05 22:25:55 stuart Exp $
 
 inherit webapp
 
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
new file mode 100644
index 000000000000..12ad294cb9c5
--- /dev/null
+++ b/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild,v 1.1 2005/07/05 22:25:55 stuart Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="PhpWiki is a WikiWikiWeb clone in PHP"
+HOMEPAGE="http://phpwiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/php-4.0.6
+	net-www/apache"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/phpwiki-1.3.10-xmlrpc.patch
+	rm -f Makefile LICENSE
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -a * ${D}/${MY_HTDOCSDIR}
+	rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,UPGRADING}
+
+	dodoc README INSTALL UPGRADING doc/* schemas/*
+
+	# Create config file from distribution default, and fix up invalid defaults
+	cd ${D}/${MY_HTDOCSDIR}/config
+	sed "s:;DEBUG = 1:DEBUG = 0:" config-dist.ini > config.ini
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-1.3-en.txt
+	webapp_configfile ${MY_HTDOCSDIR}/config/config.ini
+
+	webapp_src_install
+}