4 files changed, 80 insertions, 2 deletions
diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index 9828a4221af7..8ff3c3db423c 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.5 2004/11/21 23:07:49 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.6 2004/11/22 09:42:57 tigger Exp $
+
+*twiki-20040902 (22 Nov 2004)
+
+  22 Nov 2004; Rob Holland <tigger@gentoo.org> +twiki-20040902.ebuild:
+  Version bump again as last version was still vulnerable.
 
 *twiki-20040901 (22 Nov 2004)
 
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 108db170083b..9de5f90e2ad2 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,7 +1,9 @@
+MD5 ebca29f0d51d6d6ce7483abd1062ab0d twiki-20040902.ebuild 1755
 MD5 53e0491856995463dba2b18ce54381ed twiki-20040901.ebuild 1755
-MD5 a7fc8e4c1272040eedad8e01d89401fa ChangeLog 1560
+MD5 2c4dced35ca80f7cad2796ebcdab4ed2 ChangeLog 1722
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 4812f8fc82e4722aed4eccaa5bf6b3ad twiki-20030201.ebuild 1740
 MD5 6c6c056f184e8d333ae577837290e282 files/twiki.conf 538
 MD5 03289224ed6b4fd47078e353bc05c650 files/digest-twiki-20030201 65
 MD5 171d54d5e23801d47b006999d95f0c75 files/digest-twiki-20040901 66
+MD5 482053b76eef263c5377921e1dedcf08 files/digest-twiki-20040902 66
diff --git a/www-apps/twiki/files/digest-twiki-20040902 b/www-apps/twiki/files/digest-twiki-20040902
new file mode 100644
index 000000000000..3745c525d900
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-20040902
@@ -0,0 +1 @@
+MD5 d04b2041d83dc6c97905faa1c6b9116d TWiki20040902.tar.gz 1833008
diff --git a/www-apps/twiki/twiki-20040902.ebuild b/www-apps/twiki/twiki-20040902.ebuild
new file mode 100644
index 000000000000..cff454ea837e
--- /dev/null
+++ b/www-apps/twiki/twiki-20040902.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20040902.ebuild,v 1.1 2004/11/22 09:42:57 tigger Exp $
+
+inherit webapp-apache
+
+DESCRIPTION="A Web Based Collaboration Platform"
+HOMEPAGE="http://twiki.org/"
+SRC_URI="http://twiki.org/swd/TWiki${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+S=${WORKDIR}/${PN}
+
+RDEPEND="virtual/php
+	media-gfx/graphviz
+	dev-db/mysql"
+
+IUSE="apache2"
+
+pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing for ${WEBAPP_SERVER}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	sed -i -e 's:\/home\/httpd:\/var\/www:g' lib/TWiki.cfg
+#	sed -i -e 's:urlpath\/to:var\/www\/localhost\/htdocs:g' \
+#		bin/.htaccess.txt
+#	echo "Options ExecCGI" >> bin/.htaccess.txt
+}
+
+
+src_install() {
+	local destdir=/var/www/twiki
+
+	dodir ${destdir}
+	cp -r . ${D}${destdir}
+
+	if use apache2; then
+		dodir /etc/apache2/conf/modules.d
+		insinto /etc/apache2/conf/modules.d
+		newins ${FILESDIR}/twiki.conf 97_twiki.conf
+	else
+		dodir /etc/apache/conf/addon-modules
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/twiki.conf
+	fi
+
+	dodoc readme.txt license.txt
+	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${D}${destdir}
+	chmod 0775 -R ${D}${destdir}/pub  ${D}${destdir}/data
+	chown nobody -R ${D}${destdir}/pub ${D}${destdir}/data
+	#find ${D}/${HTTPD_ROOT}/${PN}/templates -type d -exec chmod 0440 {} \;
+#	chmod 0444 -R ${PN}/templates
+}
+
+pkg_postinst() {
+	einfo "now go to your ${HTTPD_ROOT}/{PN},"
+	einfo "copy bin/.htaccess.txt to bin/.htaccess"
+	einfo "and be sure to read"
+	einfo "http://localhost/twiki/bin/view/TWiki/TWikiDocumentation#TWiki_Installation_Guide"
+}