3 files changed, 92 insertions, 1 deletions
diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index 946b1c4dd52d..46b110d083c6 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.30 2006/06/18 00:44:42 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.31 2006/06/25 20:37:06 rl03 Exp $
+
+*twiki-4.0.3 (25 Jun 2006)
+
+  25 Jun 2006; Renat Lumpau <rl03@gentoo.org>
+  -files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff, -twiki-4.0.2-r1.ebuild,
+  +twiki-4.0.3.ebuild:
+  Version bump
 
 *twiki-4.0.2-r1 (18 Jun 2006)
 
diff --git a/www-apps/twiki/files/digest-twiki-4.0.3 b/www-apps/twiki/files/digest-twiki-4.0.3
new file mode 100644
index 000000000000..42a449454a81
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-4.0.3
@@ -0,0 +1,3 @@
+MD5 82941e39bf226cd8059c213846cc785f TWiki-4.0.3.tgz 4150679
+RMD160 0ddb1eba747d5d88be8c2f78c121763782106c98 TWiki-4.0.3.tgz 4150679
+SHA256 3b5ae29bf4f864a19e7a9cdce5033b92ab9faf70e14acc16f02e9296817dea24 TWiki-4.0.3.tgz 4150679
diff --git a/www-apps/twiki/twiki-4.0.3.ebuild b/www-apps/twiki/twiki-4.0.3.ebuild
new file mode 100644
index 000000000000..2775250ffb83
--- /dev/null
+++ b/www-apps/twiki/twiki-4.0.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.0.3.ebuild,v 1.1 2006/06/25 20:37:06 rl03 Exp $
+
+inherit webapp eutils
+
+MY_PN="TWiki"
+
+DESCRIPTION="A Web Based Collaboration Platform"
+HOMEPAGE="http://twiki.org/"
+SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="apache2"
+
+S=${WORKDIR}
+
+RDEPEND=">=dev-lang/perl-5.8
+		>=app-text/rcs-5.7
+		sys-apps/diffutils
+		dev-perl/Algorithm-Diff
+		>=virtual/perl-CGI-3.20
+		perl-core/File-Spec
+		dev-perl/Text-Diff
+		perl-core/Time-Local
+		dev-perl/CGI-Session
+		perl-core/digest-base
+		dev-perl/Digest-SHA1
+		dev-perl/locale-maketext-lexicon
+		virtual/perl-libnet
+		dev-perl/URI
+		virtual/cron
+		apache2? ( >=net-www/apache-2.0.54 )
+		!apache2? ( =net-www/apache-1* )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	mv ${S}/bin/LocalLib.cfg.txt ${S}/bin/LocalLib.cfg
+	mv ${S}/lib/LocalSite.cfg.txt ${S}/lib/LocalSite.cfg
+	# change web user to apache
+	cd ${S}/lib/TWiki
+	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	dodoc readme.txt
+	dohtml T*.html
+
+	for file in $(find data pub) lib/LocalSite.cfg; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+
+	for a in bin/setlib.cfg bin/LocalLib.cfg lib/TWiki.cfg lib/LocalSite.cfg; do
+		webapp_configfile ${MY_HTDOCSDIR}/${a}
+	done
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from an older version of TWiki, back up your"
+	ewarn "data/ and pub/ directories and any local changes before upgrading!"
+	ewarn
+	ewarn "You are _strongly_ encouraged to to read the upgrade guide:"
+	ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation"
+	ewarn
+	einfo "webapp-config will not be run automatically"
+	einfo
+	# webapp_pkg_postinst
+}