Version bump wrt security bug #109858.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 102 insertions, 7 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index 2d585dfbff33..b21e55c39523 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.19 2005/08/24 22:40:37 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.20 2005/10/23 15:39:10 rl03 Exp $
+
+*tikiwiki-1.9.1.1 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +tikiwiki-1.9.1.1.ebuild:
+  Version bump wrt security bug #109858.
 
 *tikiwiki-1.9.1 (24 Aug 2005)
 *tikiwiki-1.8.6 (24 Aug 2005)
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index ae0b8fa42a10..d0dd67cef226 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 59670cea797315cab90429858c997db4 tikiwiki-1.9.1.1.ebuild 2448
 MD5 a1719a8cde06741a7a437cafe9e090a8 tikiwiki-1.8.6.ebuild 2069
 MD5 53bd7ad0d739792085a43773b049d08a tikiwiki-1.8.5-r2.ebuild 2158
-MD5 0af2a295c408983988b9065d45a13ed0 ChangeLog 5135
+MD5 4fd3264942a4177dee8e7e377128ba26 ChangeLog 5310
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 3c8a69146eabe071e1b9db23fa047a63 tikiwiki-1.9.1.ebuild 2504
-MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407
+MD5 250716051f339a0b1315218e13485039 files/postinstall-en.txt 1396
 MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r2 68
 MD5 179db1005cef09973bc3ffda69a7bb11 files/digest-tikiwiki-1.8.6 68
 MD5 2aca7d1af17e4d10481d0f62be41ffa8 files/digest-tikiwiki-1.9.1 68
 MD5 b0640c9b04a5e76a0a888afbe7860c41 files/xmlrpc2-1.8.5.patch 2587
+MD5 7d874ec5f99ae67c3ae819a0d6aec572 files/digest-tikiwiki-1.9.1.1 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDDPdwEzitwsaoONoRAkPjAJ9tRxDSatkY+h6Lj57QK/YYPEaQTACgxF5D
-iWXggwzhKB0pZCmMgF7OWqM=
-=RvRJ
+iD8DBQFDW666EzitwsaoONoRAoHIAJ9kGJ9a+Fe5mJ0eCXALXJrDhB0VSgCgxF4e
+JA1LXg2cj2fU67sX9Rs8sWI=
+=dNV1
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.1.1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.1.1
new file mode 100644
index 000000000000..c616c41494d2
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.1.1
@@ -0,0 +1 @@
+MD5 b26b9237ca929e0d736dc5f98bbc845c tikiwiki-1.9.1.1.tar.bz2 6109980
diff --git a/www-apps/tikiwiki/files/postinstall-en.txt b/www-apps/tikiwiki/files/postinstall-en.txt
index 52b7617d4839..da88b675474b 100644
--- a/www-apps/tikiwiki/files/postinstall-en.txt
+++ b/www-apps/tikiwiki/files/postinstall-en.txt
@@ -3,7 +3,7 @@ Setup Completion
 
 If there is no existing TikiWiki install and database you will need to
 create an empty database for TikiWiki before starting setup.
-You can run the pkg_config script in the ebuild, or (MySQL):
+You can run "emerge --config =${PF}", or (MySQL):
 
 mysql -p -u root mysql <<__EOSQL
   CREATE DATABASE tiki;
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
new file mode 100644
index 000000000000..673d17bcec32
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
@@ -0,0 +1,86 @@
+# 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.1.1.ebuild,v 1.1 2005/10/23 15:39:10 rl03 Exp $
+
+inherit 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="mysql postgres graphviz"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+RDEPEND="virtual/php
+	mysql? ( >=dev-db/mysql-4 )
+	postgres? ( dev-db/postgresql )
+	graphviz? ( media-gfx/graphviz )
+"
+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/trackers 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 -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() {
+	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
+}