Version bumped. Security fix. See 75568

11 files changed, 31 insertions, 182 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index 1b585def56f8..fc3295d03374 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/tikiwiki
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.4 2004/09/05 09:04:16 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.5 2005/01/04 12:59:54 mholzer Exp $
+
+*tikiwiki-1.8.4.1 (04 Jan 2005)
+
+  04 Jan 2005; Martin Holzer <mholzer@gentoo.org> +tikiwiki-1.8.4.1.ebuild:
+  Version bumped. Security fix. See 75568
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 960cf4eda6ee..270935279261 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8ce9b74d683b6d33d9d5b5646e725316 ChangeLog 2680
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 596cce9b977ab91664730ac4c083a6c8 tikiwiki-1.8.2-r1.ebuild 1979
-MD5 424cc8a9ae58816a392c5bc13f020a39 tikiwiki-1.8.2.ebuild 1636
-MD5 1fe637ca2bab59490d047c02bea5c28a tikiwiki-1.8.3.ebuild 1951
 MD5 c534d2c89ce526ac38599b52e054b5c8 tikiwiki-1.8.4.ebuild 1947
-MD5 8ce9b74d683b6d33d9d5b5646e725316 ChangeLog 2680
-MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2 68
-MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2-r1 68
-MD5 a0ee80f78f566fc992524890c3222b78 files/digest-tikiwiki-1.8.3 68
-MD5 1dc0330a9bc435b3eae532688c95c278 files/postinstall-en.txt 1288
+MD5 3178c65a3a7d5870aeba4887f08b3ec9 tikiwiki-1.8.4.1.ebuild 2276
+MD5 6f2a8966e380c4abbebb0883290d7a21 files/digest-tikiwiki-1.8.4.1 70
+MD5 3a48dbc160debfb2d5b4d4ace3c8af78 files/postinstall-en.txt 1382
 MD5 d43326550a6aaa9078722f5fb371859a files/digest-tikiwiki-1.8.4 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBOtaWI1lqEGTUzyQRAt3XAJsEcLY5Q65aqpOyKFnwVUNId6wCqQCdHgdi
-w0FW41VjPV2d23KpnFU2xAo=
-=qORS
------END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.2 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.2
deleted file mode 100644
index acfd5c768999..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8be27c5de293d005ae8fba00b4a25b70 tikiwiki-1.8.2.tar.bz2 5382427
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.2-r1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.2-r1
deleted file mode 100644
index acfd5c768999..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8be27c5de293d005ae8fba00b4a25b70 tikiwiki-1.8.2.tar.bz2 5382427
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.3 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.3
deleted file mode 100644
index 069daf18fdb7..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6bece62491af58453648ed53c7edbd3 tikiwiki-1.8.3.tar.bz2 5388215
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4.1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4.1
new file mode 100644
index 000000000000..0d11080870c0
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4.1
@@ -0,0 +1 @@
+MD5 00d6bdbcd0f4afb5ce64bdcb9f8fab97 tikiwiki-1.8.4.1.tar.bz2 5513495
diff --git a/www-apps/tikiwiki/files/postinstall-en.txt b/www-apps/tikiwiki/files/postinstall-en.txt
index f64e6e6fae45..330b207c4284 100644
--- a/www-apps/tikiwiki/files/postinstall-en.txt
+++ b/www-apps/tikiwiki/files/postinstall-en.txt
@@ -26,6 +26,8 @@ Tiki likes PHP to have :
     ==> 'default_charset = utf-8'
     ==> 'file_uploads = On'
 
+Make certain you have compiled php and mod_php with your database of choice in
+the USE flags.
 
 Please read the files in ${MY_INSTALLDIR}/doc
 especially if you want clean URLs under Apache.
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.2-r1.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.2-r1.ebuild
deleted file mode 100644
index 42070c80b277..000000000000
--- a/www-apps/tikiwiki/tikiwiki-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.2-r1.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel 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=""
-KEYWORDS="~x86 ppc ~sparc"
-
-RDEPEND="virtual/php
-	media-gfx/graphviz"
-
-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 var var/log var/log/irc 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
-	dodoc doc/htaccess
-	dodoc doc/htaccess.readme
-	dodoc INSTALL
-	dodoc README
-	rm INSTALL README
-
-	# The bulk goes into htdocs
-	#
-	cp -a . ${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
-}
-
-
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.2.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.2.ebuild
deleted file mode 100644
index 173f2c846c8f..000000000000
--- a/www-apps/tikiwiki/tikiwiki-1.8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.2.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
-
-inherit webapp-apache
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ppc ~sparc"
-
-RDEPEND="virtual/php
-	media-gfx/graphviz"
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing for ${WEBAPP_SERVER}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-
-src_install() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-
-	cd ${D}/${HTTPD_ROOT}
-	dodoc ${S}/doc/readme.txt
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}
-}
-
-pkg_postinst() {
-	einfo "Tiki requires PHP to have :"
-	einfo "    ==> 'memory_limit = 16M'"
-	einfo "    ==> 'max_execution_time = 60'"
-	einfo "Tiki likes PHP to have :"
-	einfo "    ==> 'default_charset = utf-8'"
-	einfo "    ==> 'file_uploads enabled = On'"
-	einfo "Please edit /etc/php4/php.ini."
-	einfo ""
-	einfo ""
-	einfo "Please read ${HTTPD_ROOT}/${PN}/doc/readme.txt !"
-	einfo ""
-	einfo "You may find further information on the Tiki website"
-	einfo "    ==> http://tikiwiki.org/InstallGettingStarted"
-	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.8.3.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.4.1.ebuild
index 21743091bb68..5b80d160fd89 100644
--- a/www-apps/tikiwiki/tikiwiki-1.8.3.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.8.4.1.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/tikiwiki/tikiwiki-1.8.3.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.4.1.ebuild,v 1.1 2005/01/04 12:59:54 mholzer Exp $
 
 inherit webapp
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 IUSE=""
-KEYWORDS="~x86 ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="virtual/php
 	media-gfx/graphviz"
@@ -41,16 +41,11 @@ src_install() {
 
 	# Install the minimal doc (points to web page)
 	#
-	dodoc doc/readme.txt
-	dodoc doc/htaccess
-	dodoc doc/htaccess.readme
-	dodoc INSTALL
-	dodoc README
-	rm INSTALL README
+	dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README
 
 	# The bulk goes into htdocs
-	#
-	cp -a . ${D}/${MY_HTDOCSDIR}
+	# 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
@@ -78,4 +73,12 @@ src_install() {
 	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.8.4.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild
index bf8ff50ded39..fbd146bc9b0b 100644
--- a/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.8.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/tikiwiki/tikiwiki-1.8.4.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild,v 1.3 2005/01/04 12:59:54 mholzer Exp $
 
 inherit webapp