Version bump, security bug #153820.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 114 insertions, 5 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index 4b963f407797..e6a1faf3ee81 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/tikiwiki
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.34 2006/09/15 18:34:02 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.35 2006/11/08 04:08:48 rl03 Exp $
+
+*tikiwiki-1.9.6 (08 Nov 2006)
+
+  08 Nov 2006; Renat Lumpau <rl03@gentoo.org> +tikiwiki-1.9.6.ebuild:
+  Version bump, security bug #153820.
 
   15 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   tikiwiki-1.9.5.ebuild:
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index b1a51a598c50..4a4d6b969a0b 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 1396 RMD160 151da6a1f93f1df11d8d0ebac08bf22ec258612e SHA1 efd2d6aff5b8d57f8350cc4072555fa4f634eef4 SHA256 2b6d9b93ab840a7368810b76486050b54b260d40671b36b22a85c2cc6540f8ea
 MD5 250716051f339a0b1315218e13485039 files/postinstall-en.txt 1396
 RMD160 151da6a1f93f1df11d8d0ebac08bf22ec258612e files/postinstall-en.txt 1396
 SHA256 2b6d9b93ab840a7368810b76486050b54b260d40671b36b22a85c2cc6540f8ea files/postinstall-en.txt 1396
 DIST tikiwiki-1.9.4.tar.bz2 6562916 RMD160 670580fba1268737724825e5da50a93a59d61cd1 SHA1 4f5fb40370220636b253b9006d0254c7d2ff41a2 SHA256 6e361e3a6d738851fa2a0e72890f8cadc9d0a1518af95cbd49fbe8562014d754
 DIST tikiwiki-1.9.5.tar.bz2 5940653 RMD160 9617995c6b9300ae2585648b507880342f1f25cb SHA1 6d23cbf50bbaf6629575f121b76ef8cbe53bb0ca SHA256 1ed2290a9342282b87cbf32989a263f1bcbef3a9e90584c2a1483d5f8cbf6d06
+DIST tikiwiki-1.9.6.tar.bz2 6016006 RMD160 744f086889e3b379cb2b5fdb27bd75fa5936bd51 SHA1 1f25831cad97076fa78d738e53cf7c088694f791 SHA256 1231c2ea15e9dc47b94f19a269fbf6f6068d2e84c532cd6d0f78ec98e6119771
 EBUILD tikiwiki-1.9.4.ebuild 2343 RMD160 48767a2801b069028e0572997f656e4c27a76d60 SHA1 8ef32bd797dca273e27d3bf61afd2562906962fb SHA256 47fd1bb3c77179905a507d985945c16982905beda2ab137ae29c74e6e5355281
 MD5 3a7598d2ba0acbdc103842faddf8195d tikiwiki-1.9.4.ebuild 2343
 RMD160 48767a2801b069028e0572997f656e4c27a76d60 tikiwiki-1.9.4.ebuild 2343
@@ -12,10 +16,14 @@ EBUILD tikiwiki-1.9.5.ebuild 2349 RMD160 0bcd1dc9dd1a17ae7f5e520d967356fb8168f94
 MD5 a4d0dcfbbac66bd7552a7ce0e5d97f2c tikiwiki-1.9.5.ebuild 2349
 RMD160 0bcd1dc9dd1a17ae7f5e520d967356fb8168f942 tikiwiki-1.9.5.ebuild 2349
 SHA256 6f8ab47eb97090c6cbd5a85c9feee83e522343fc514440ce85736122eaf18a3d tikiwiki-1.9.5.ebuild 2349
-MISC ChangeLog 7177 RMD160 64540b3ab1b5869fdd9da1b6451f6cb09219a6b2 SHA1 6dfdca62bb01cd297c0c45622a22dc6b8479c569 SHA256 deafa95d0f5ba24e0b0fe5e76a7d9b2ac04d89be8909ce6cf58c1b4656a4872d
-MD5 988c8caf190946c75e17dd43d9076407 ChangeLog 7177
-RMD160 64540b3ab1b5869fdd9da1b6451f6cb09219a6b2 ChangeLog 7177
-SHA256 deafa95d0f5ba24e0b0fe5e76a7d9b2ac04d89be8909ce6cf58c1b4656a4872d ChangeLog 7177
+EBUILD tikiwiki-1.9.6.ebuild 2344 RMD160 6acee0d088c6696537f27465fd3c125192f412c8 SHA1 114f8e6449e673f078c8ea3144591bacfc134422 SHA256 109c38aef197e0e7074fc5750b2132cf53c1d3abb74bb29ef12583d4cae90ced
+MD5 af60bdfac0d1e0822a427037ffb5fc84 tikiwiki-1.9.6.ebuild 2344
+RMD160 6acee0d088c6696537f27465fd3c125192f412c8 tikiwiki-1.9.6.ebuild 2344
+SHA256 109c38aef197e0e7074fc5750b2132cf53c1d3abb74bb29ef12583d4cae90ced tikiwiki-1.9.6.ebuild 2344
+MISC ChangeLog 7311 RMD160 46287fcc261208a8306f698228ab2e2e6d16e0e7 SHA1 23f65558bdea7fbd359db42a31d7bc056e2df36e SHA256 e5970518b57365345d4974bd3f9ed81eff6c1e9b5e0033c25f4ebb2c6ac2db92
+MD5 5c0740ec159705b079f0b3a63e4275b5 ChangeLog 7311
+RMD160 46287fcc261208a8306f698228ab2e2e6d16e0e7 ChangeLog 7311
+SHA256 e5970518b57365345d4974bd3f9ed81eff6c1e9b5e0033c25f4ebb2c6ac2db92 ChangeLog 7311
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
@@ -26,3 +34,13 @@ SHA256 823f1113029eecfb0156e18f03b04168e61bed71790db02c65d58c35f1311299 files/di
 MD5 c20d58bd126c6a02f8bbf3649f90f647 files/digest-tikiwiki-1.9.5 250
 RMD160 d288ac0bff606d8109f3304e3c60e215dc4cc076 files/digest-tikiwiki-1.9.5 250
 SHA256 7c6d83e6dd458f1f8152640f076a232a6fb2ea910852e657f33a6887924c4628 files/digest-tikiwiki-1.9.5 250
+MD5 701b5538d6902f6b9e5d27cef668ad3d files/digest-tikiwiki-1.9.6 250
+RMD160 bfd5e0584f1fe3b1a235c3ad1ffdd14ccfca30d0 files/digest-tikiwiki-1.9.6 250
+SHA256 cdfae013d283cf493e82c268db8f3c8a61da2aa74728c787bec90feb432f41b9 files/digest-tikiwiki-1.9.6 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFUVhZEzitwsaoONoRAm+cAKDU4lROzCI5qjwsqEr1hZyKRBsH+QCfYJph
+dWlLNdDshHtbPLOWZ2S+BmY=
+=yII6
+-----END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.6 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.6
new file mode 100644
index 000000000000..101966d1c137
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.6
@@ -0,0 +1,3 @@
+MD5 4840b3b0504b46f2454d3fbedc6691bb tikiwiki-1.9.6.tar.bz2 6016006
+RMD160 744f086889e3b379cb2b5fdb27bd75fa5936bd51 tikiwiki-1.9.6.tar.bz2 6016006
+SHA256 1231c2ea15e9dc47b94f19a269fbf6f6068d2e84c532cd6d0f78ec98e6119771 tikiwiki-1.9.6.tar.bz2 6016006
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.6.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.6.ebuild
new file mode 100644
index 000000000000..f646598bb67f
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.9.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.6.ebuild,v 1.1 2006/11/08 04:08:48 rl03 Exp $
+
+inherit webapp depend.php
+
+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="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/php
+	mysql? ( >=dev-db/mysql-4 )
+	postgres? ( dev-db/postgresql )
+	graphviz? ( media-gfx/graphviz )
+"
+pkg_setup () {
+	webapp_pkg_setup
+	use mysql && require_php_with_use mysql
+	use postgres && require_php_with_use postgres
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump files img/trackers img/wiki
+		img/wiki_up modules/cache temp
+		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 -pPR [[: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
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_src_install
+}
+
+pkg_config() {
+	elog "Type in your MySQL root password to create an empty tiki database:"
+	mysqladmin -u root -p create tikiwiki
+}
+
+pkg_postinst() {
+	elog "To setup a MySQL database, run:"
+	elog "\"emerge --config =${PF}\""
+	elog "If you are using PostgreSQL, consult your documentation"
+	webapp_pkg_postinst
+}