revbump wrt security bug #102377

(Portage version: 2.0.51.22-r2)

8 files changed, 371 insertions, 11 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index c514b10a4d89..9a2a05af69b4 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2005/07/10 14:39:21 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.13 2005/08/21 16:40:31 rl03 Exp $
+
+*tikiwiki-1.9.0-r1 (21 Aug 2005)
+*tikiwiki-1.8.5-r2 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/xmlrpc2-1.8.5.patch,
+  +files/xmlrpc2-1.9.0.patch, +tikiwiki-1.8.5-r2.ebuild,
+  +tikiwiki-1.9.0-r1.ebuild:
+  revbump wrt security bug #102377
 
   10 Jul 2005; Renat Lumpau <rl03@gentoo.org> -tikiwiki-1.8.4.1.ebuild,
   -tikiwiki-1.8.5.ebuild:
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 6d21a64fea6f..96c0e39f3af1 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,18 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9428e2c5313b6733e9476a441c3eb576 tikiwiki-1.8.5-r1.ebuild 2339
 MD5 3df178d3364ec7a6fd53340327e0cd3b tikiwiki-1.9.0.ebuild 2590
+MD5 9c5710f31dbd15557057b13ce1839356 tikiwiki-1.9.0-r1.ebuild 2582
+MD5 bab8a531e5d59dfc82c51d7421b59e33 tikiwiki-1.8.5-r2.ebuild 2332
 MD5 207e65ab4e7d69b86a9bc2b5f6caf4d7 ChangeLog 3860
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407
 MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r1 68
+MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r2 68
 MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093
+MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0-r1 68
 MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0TMvEzitwsaoONoRAv8eAJsHM8YZ9QeqQHtIh5BS9CzVVC+dpACfduMl
-1qVaC6gko9uRFHQVwmhmm94=
-=uGzt
------END PGP SIGNATURE-----
+MD5 fa74608479ec545de6269e68aec5b4d0 files/xmlrpc2-1.9.0.patch 3526
+MD5 b0cd142123ab0329026609740af1a6ef files/xmlrpc2-1.8.5.patch 3526
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r2 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r2
new file mode 100644
index 000000000000..fd9e2fe7ff1d
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r2
@@ -0,0 +1 @@
+MD5 e64dc5ffcee6699993e90ea1ed8ce1af tikiwiki-1.8.5.tar.bz2 5706055
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0-r1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0-r1
new file mode 100644
index 000000000000..baa90951f379
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0-r1
@@ -0,0 +1 @@
+MD5 524deba410cc17048781b3a999d7b509 tikiwiki-1.9.0.tar.bz2 6007822
diff --git a/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch b/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch
new file mode 100644
index 000000000000..abbe3979c506
--- /dev/null
+++ b/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch
@@ -0,0 +1,85 @@
+===================================================================
+RCS file: /cvsroot/tikiwiki/tiki/commxmlrpc.php,v
+retrieving revision 1.10.2.4
+retrieving revision 1.10.2.5
+diff -u -r1.10.2.4 -r1.10.2.5
+--- tikiwiki/tiki/commxmlrpc.php	2005/01/01 00:04:43	1.10.2.4
++++ tikiwiki/tiki/commxmlrpc.php	2005/08/18 21:39:19	1.10.2.5
+@@ -1,19 +1,18 @@
+ <?php
+ 
+-// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
++// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
+ 
+ // Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ // All Rights Reserved. See copyright.txt for details and a complete list of authors.
+ // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+ 
+-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
++# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
+ include_once("lib/init/initlib.php");
+ include_once ('db/tiki-db.php');
+ 
+ include_once ('lib/tikilib.php');
+ include_once ('lib/userslib.php');
+-include_once ("lib/xmlrpc.inc");
+-include_once ("lib/xmlrpcs.inc");
++include_once ("XML/Server.php");
+ include_once ('lib/commcenter/commlib.php');
+ 
+ $tikilib = new Tikilib($dbTiki);
+@@ -28,7 +27,7 @@
+ 	"sendArticle" => array("function" => "sendArticle")
+ );
+ 
+-$s = new xmlrpc_server($map);
++$s = new XML_RPC_Server($map);
+ 
+ /* Validates the user and returns user information */
+ function sendPage($params) {
+@@ -51,18 +50,18 @@
+ 	$description = $pp->scalarval();
+ 	// 
+ 	if (!$userlib->validate_user($username, $password, '', '')) {
+-		return new xmlrpcresp(0, 101, "Invalid username or password");
++		return new XML_RPC_Response(0, 101, "Invalid username or password");
+ 	}
+ 
+ 	// Verify if the user has tiki_p_sendme_pages
+ 	if (!$userlib->user_has_permission($username, 'tiki_p_sendme_pages')) {
+-		return new xmlrpcresp(0, 101, "Permissions denied user $username cannot send pages to this site");
++		return new XML_RPC_Response(0, 101, "Permissions denied user $username cannot send pages to this site");
+ 	}
+ 
+ 	// Store the page in the tiki_received_pages_table
+ 	$data = base64_decode($data);
+ 	$commlib->receive_page($pageName, $data, $comment, $site, $username, $description);
+-	return new xmlrpcresp(new xmlrpcval(1, "boolean"));
++	return new XML_RPC_Response(new XML_RPC_Value(1, "boolean"));
+ }
+ 
+ function sendArticle($params) {
+@@ -116,12 +115,12 @@
+ 
+ 	// 
+ 	if (!$userlib->validate_user($username, $password, '', '')) {
+-		return new xmlrpcresp(0, 101, "Invalid username or password");
++		return new XML_RPC_Response(0, 101, "Invalid username or password");
+ 	}
+ 
+ 	// Verify if the user has tiki_p_sendme_pages
+ 	if (!$userlib->user_has_permission($username, 'tiki_p_sendme_articles')) {
+-		return new xmlrpcresp(0, 101, "Permissions denied user $username cannot send articles to this site");
++		return new XML_RPC_Response(0, 101, "Permissions denied user $username cannot send articles to this site");
+ 	}
+ 
+ 	// Store the page in the tiki_received_pages_table
+@@ -134,7 +133,7 @@
+ 	$commlib->receive_article($site, $username, $title, $authorName, $size, $use_image, $image_name, $image_type, $image_size,
+ 		$image_x, $image_y, $image_data, $publishDate, $expireDate, $created, $heading, $body, $hash, $author, $type, $rating);
+ 
+-	return new xmlrpcresp(new xmlrpcval(1, "boolean"));
++	return new XML_RPC_Response(new XML_RPC_Value(1, "boolean"));
+ }
+ 
+ ?>
diff --git a/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch b/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
new file mode 100644
index 000000000000..009cfe8fd457
--- /dev/null
+++ b/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
@@ -0,0 +1,85 @@
+===================================================================
+RCS file: /cvsroot/tikiwiki/tiki/commxmlrpc.php,v
+retrieving revision 1.14.2.1
+retrieving revision 1.14.2.2
+diff -u -r1.14.2.1 -r1.14.2.2
+--- tikiwiki/tiki/commxmlrpc.php	2005/01/01 00:11:21	1.14.2.1
++++ tikiwiki/tiki/commxmlrpc.php	2005/08/18 09:13:33	1.14.2.2
+@@ -1,19 +1,18 @@
+ <?php
+ 
+-// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
++// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
+ 
+ // Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ // All Rights Reserved. See copyright.txt for details and a complete list of authors.
+ // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+ 
+-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
++# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
+ include_once("lib/init/initlib.php");
+ include_once ('db/tiki-db.php');
+ 
+ include_once ('lib/tikilib.php');
+ include_once ('lib/userslib.php');
+-include_once ("lib/xmlrpc.inc");
+-include_once ("lib/xmlrpcs.inc");
++include_once ("XML/Server.php");
+ include_once ('lib/commcenter/commlib.php');
+ 
+ $tikilib = new Tikilib($dbTiki);
+@@ -28,7 +27,7 @@
+ 	"sendArticle" => array("function" => "sendArticle")
+ );
+ 
+-$s = new xmlrpc_server($map);
++$s = new XML_RPC_Server($map);
+ 
+ /* Validates the user and returns user information */
+ function sendPage($params) {
+@@ -51,18 +50,18 @@
+ 	$description = $pp->scalarval();
+ 	// 
+ 	if (!$userlib->validate_user($username, $password, '', '')) {
+-		return new xmlrpcresp(0, 101, "Invalid username or password");
++		return new XML_RPC_Response(0, 101, "Invalid username or password");
+ 	}
+ 
+ 	// Verify if the user has tiki_p_sendme_pages
+ 	if (!$userlib->user_has_permission($username, 'tiki_p_sendme_pages')) {
+-		return new xmlrpcresp(0, 101, "Permissions denied user $username cannot send pages to this site");
++		return new XML_RPC_Response(0, 101, "Permissions denied user $username cannot send pages to this site");
+ 	}
+ 
+ 	// Store the page in the tiki_received_pages_table
+ 	$data = base64_decode($data);
+ 	$commlib->receive_page($pageName, $data, $comment, $site, $username, $description);
+-	return new xmlrpcresp(new xmlrpcval(1, "boolean"));
++	return new XML_RPC_Response(new XML_RPC_Value(1, "boolean"));
+ }
+ 
+ function sendArticle($params) {
+@@ -116,12 +115,12 @@
+ 
+ 	// 
+ 	if (!$userlib->validate_user($username, $password, '', '')) {
+-		return new xmlrpcresp(0, 101, "Invalid username or password");
++		return new XML_RPC_Response(0, 101, "Invalid username or password");
+ 	}
+ 
+ 	// Verify if the user has tiki_p_sendme_pages
+ 	if (!$userlib->user_has_permission($username, 'tiki_p_sendme_articles')) {
+-		return new xmlrpcresp(0, 101, "Permissions denied user $username cannot send articles to this site");
++		return new XML_RPC_Response(0, 101, "Permissions denied user $username cannot send articles to this site");
+ 	}
+ 
+ 	// Store the page in the tiki_received_pages_table
+@@ -134,7 +133,7 @@
+ 	$commlib->receive_article($site, $username, $title, $authorName, $size, $use_image, $image_name, $image_type, $image_size,
+ 		$image_x, $image_y, $image_data, $publishDate, $expireDate, $created, $heading, $body, $hash, $author, $type, $rating);
+ 
+-	return new xmlrpcresp(new xmlrpcval(1, "boolean"));
++	return new XML_RPC_Response(new XML_RPC_Value(1, "boolean"));
+ }
+ 
+ ?>
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.5-r2.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.5-r2.ebuild
new file mode 100644
index 000000000000..5ae41999955f
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.8.5-r2.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-r2.ebuild,v 1.1 2005/08/21 16:40:31 rl03 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}/xmlrpc2-${PV}.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
+}
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.0-r1.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..78db9642f79f
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.9.0-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.9.0-r1.ebuild,v 1.1 2005/08/21 16:40:31 rl03 Exp $
+
+inherit webapp eutils
+
+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="mysql postgres graphviz"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+RDEPEND=">=virtual/php-4.3
+	mysql? ( >=dev-db/mysql-4 )
+	postgres? ( dev-db/postgresql )
+	graphviz? ( media-gfx/graphviz )
+"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xmlrpc2-${PV}.patch
+}
+
+pkg_setup () {
+	webapp_pkg_setup
+	einfo "Make sure your PHP is compiled with mysql or postgres support"
+	einfo "If you need PDF generation, make sure your PHP is emerged with xml2"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump files img/wiki
+		img/wiki_up modules/cache temp temp/cache
+		templates_c templates styles maps whelp mods
+		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
+	webapp_serverowned  ${MY_HTDOCSDIR}/tiki-install.php
+
+	# 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
+}
+
+pkg_postinst() {
+	einfo "To setup a MySQL database, run:"
+	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	einfo "If you are using PostgreSQL, consult your documentation"
+	webapp_pkg_postinst
+}