Patch for security bug #97648

(Portage version: 2.0.51.19)

5 files changed, 133 insertions, 5 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index 8dc3749f133d..fd416591f5e3 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/tikiwiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.9 2005/03/26 11:37:46 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.10 2005/07/05 23:10:00 stuart Exp $
+
+*tikiwiki-1.8.5-r1 (06 Jul 2005)
+
+  06 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/tikiwiki-1.8.5-xmlrpc.patch, +tikiwiki-1.8.5-r1.ebuild:
+  Added patch for security bug #97648
 
   26 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> tikiwiki-1.8.5.ebuild:
   Added ~amd64 keyword, closes bug #86726.
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 67da87bd0c02..cbc9023bf8ad 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,7 +1,10 @@
-MD5 3116fbb5b7a9c85c6e914f603c71b136 tikiwiki-1.8.5.ebuild 2248
-MD5 2a2e1efea955fef2b47ccb598ed75151 tikiwiki-1.8.4.1.ebuild 2244
 MD5 a70e7cc01542ef06615abb8dd0227308 ChangeLog 3318
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 3a48dbc160debfb2d5b4d4ace3c8af78 files/postinstall-en.txt 1382
-MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5 68
+MD5 2a2e1efea955fef2b47ccb598ed75151 tikiwiki-1.8.4.1.ebuild 2244
+MD5 3116fbb5b7a9c85c6e914f603c71b136 tikiwiki-1.8.5.ebuild 2248
+MD5 6e4328e6832d30266025afbd7a34b55d tikiwiki-1.8.5-r1.ebuild 2342
 MD5 6f2a8966e380c4abbebb0883290d7a21 files/digest-tikiwiki-1.8.4.1 70
+MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5 68
+MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r1 68
+MD5 3a48dbc160debfb2d5b4d4ace3c8af78 files/postinstall-en.txt 1382
+MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1
new file mode 100644
index 000000000000..fd9e2fe7ff1d
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1
@@ -0,0 +1 @@
+MD5 e64dc5ffcee6699993e90ea1ed8ce1af tikiwiki-1.8.5.tar.bz2 5706055
diff --git a/www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch b/www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch
new file mode 100644
index 000000000000..4e037374f58e
--- /dev/null
+++ b/www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch
@@ -0,0 +1,29 @@
+--- tikiwiki-1.8.5/lib/xmlrpc.inc.old	2005-07-04 22:45:18.000000000 +0200
++++ tikiwiki-1.8.5/lib/xmlrpc.inc	2002-10-15 17:42:38.000000000 +0200
+@@ -160,7 +160,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;
+@@ -225,7 +225,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
+@@ -246,7 +246,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/tikiwiki/tikiwiki-1.8.5-r1.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..86e2835be555
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild,v 1.1 2005/07/05 23:10:00 stuart Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
+HOMEPAGE="http://tikiwiki.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~x86 ppc ~sparc ~amd64"
+
+RDEPEND="virtual/php
+	media-gfx/graphviz"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/tikiwiki-1.8.5-xmlrpc.patch
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump img/wiki
+		img/wiki_up modules/cache temp temp/cache
+		templates_c templates styles lib/Galaxia/processes"
+
+
+	# Ensure that directories exist, some don't.
+	# (part of setup.sh)
+	#
+	for DIR in ${DIRS}; do
+		mkdir -p ${DIR}
+	done
+
+	# Remove the execute permission from the setup.sh script
+	# and rename it.  Its actions have been incorporated here.
+	#
+	chmod a-x setup.sh
+	mv setup.sh setup.sh.done
+
+	# Install the minimal doc (points to web page)
+	#
+	dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README
+
+	# The bulk goes into htdocs
+	# but don't copy INSTALL and README
+	cp -a [[:lower:]]* ${D}/${MY_HTDOCSDIR}
+
+	# Recursively set server ownership to allow server to write
+	# This is the rough equivalent of the setup.sh script
+	# provided in the distribution.
+	# Note: Cannot use xargs or find -exec here because 
+	# 		these don't	work with shell functions.
+	#
+	webapp_serverowned ${MY_HTDOCSDIR}
+	for DIR in ${DIRS}; do
+		find ${DIR} | while read DIRENTRY; do
+			webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY}
+		done
+	done
+
+	# Flag files for scripting engine
+	#
+	find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY}
+	done
+
+	# Setup some post-install notes for webapp-config
+	#
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_config() {
+	einfo "Type in your MySQL root password to create an empty tiki database:"
+	mysqladmin -u root -p create tikiwiki
+	einfo ""
+	einfo ""
+	einfo "Now, point your browser to the location of tiki-install.php"
+	einfo "    ==> e.g. http://localhost/tikiwiki/tiki-install.php"
+	einfo ""
+}