Version bump wrt bug #121725.

(Portage version: 2.1_pre4-r1)

12 files changed, 139 insertions, 201 deletions

diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index a2d764f12d19..dcd44d67193b 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2006/02/13 15:20:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.22 2006/02/14 19:33:42 rl03 Exp $
+
+*twiki-4.0.1 (14 Feb 2006)
+
+  14 Feb 2006; Renat Lumpau <rl03@gentoo.org> -files/exec_command.patch,
+  -files/execwithsearch.patch, files/postinstall-en.txt,
+  +files/postupgrade-en.txt, files/reconfig, -files/twiki.conf,
+  +twiki-4.0.1.ebuild, -twiki-20041030-r1.ebuild:
+  Version bump wrt bug #121725.
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   twiki-20041030-r1.ebuild:
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index e2ed5647c07f..58f36ca80f74 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,19 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 89ef04a98ec8c9d583ab42fb3a711640 ChangeLog 4116
-MD5 4369d80c9ef3589ccebce4a23095082b files/digest-twiki-20041030-r1 138
-MD5 e2754c98027bd6468cfe636616377892 files/exec_command.patch 2445
-MD5 fab10473182738fadb4188bf90af8162 files/execwithsearch.patch 653
-MD5 ade44a9892b0925e73e2aae832a08e0f files/postinstall-en.txt 790
-MD5 ccb6e12008c8bb68dce61d0ab690a70d files/reconfig 639
-MD5 d6ef3da92ece6d68c83fa4be8f6f97be files/twiki.conf 508
+RMD160 648471885357db94b2fcced00c9c6e1dd070c608 ChangeLog 4116
+SHA256 0fd59f11fa0e2941e9ea7138c7f770b024f0b78eb90d0e018b668f99b9eae275 ChangeLog 4116
+MD5 31710ea4552684e8487d19f277b1da6a files/digest-twiki-4.0.1 229
+RMD160 e6489159d65198115eac8917cb1207a475b057c1 files/digest-twiki-4.0.1 229
+SHA256 89f5fd5db54e613cd62b9b6f86b4a231965ec98021cf4c0a559e8f6ed0e1d332 files/digest-twiki-4.0.1 229
+MD5 0fb6bff6113baf316a822f611593a0a5 files/postinstall-en.txt 945
+RMD160 cb9968cf0d8f7b217790f2176898202b56ce1905 files/postinstall-en.txt 945
+SHA256 bf8d1eceda6d9383abd4bd3ab3c19cf101606fac89d1bd8e60155b29fb46030a files/postinstall-en.txt 945
+MD5 e9c9f48c4d156962a55730ea5ba5daed files/postupgrade-en.txt 106
+RMD160 39efa9b5cdb5ff0337c199a5f8a3a2bee59e3bc8 files/postupgrade-en.txt 106
+SHA256 f789b40a01c44b0bb80a47de0885a659d728ffcbb8a3c1e421b24bd560396aca files/postupgrade-en.txt 106
+MD5 b54ed2926e5754a14d265cfa477ebb8a files/reconfig 553
+RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 files/reconfig 553
+SHA256 9bff3cbfb8ecbfe396e6e61ddf189c24f4500c469e9c0e0a5961a4b5b3fce851 files/reconfig 553
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 7a0c193568974e81c309aa3f1004cf74 twiki-20041030-r1.ebuild 1601
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD8KPDtG5z4I8BtQoRAtKLAJ4g6NKFDfeYDRgS5KohFTPhH/CYOwCeN2rw
-3NW9lvawa/W8ViOI5JIGX/A=
-=WVnN
------END PGP SIGNATURE-----
+RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
+SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata.xml 280
+MD5 aaf0db95ce451cb17ac5f822883e0b7b twiki-4.0.1.ebuild 2078
+RMD160 570175a0ba0861ab778b5db242731b877baf7bf4 twiki-4.0.1.ebuild 2078
+SHA256 7f6bbaf51e57e918a10ac127870bb49b51a4709be6c2cd09aecab2c08387d005 twiki-4.0.1.ebuild 2078
diff --git a/www-apps/twiki/files/digest-twiki-20041030-r1 b/www-apps/twiki/files/digest-twiki-20041030-r1
deleted file mode 100644
index 215f002bbb13..000000000000
--- a/www-apps/twiki/files/digest-twiki-20041030-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b4acc3ba9e09524d344db4bc76d2faaa TWiki20041030beta.zip 2606614
-MD5 c8e3010b59013dbb7814b26cc609825e twiki-robustness-r3342.diff 36473
diff --git a/www-apps/twiki/files/digest-twiki-4.0.1 b/www-apps/twiki/files/digest-twiki-4.0.1
new file mode 100644
index 000000000000..18b0503f8fd4
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-4.0.1
@@ -0,0 +1,3 @@
+MD5 bbfaa7fe279b374407a5bd7d946bbe7a TWiki-4.0.1.tgz 3849689
+RMD160 5f812ccb0c136b2e6ed8e0a69f205c6073f65ea8 TWiki-4.0.1.tgz 3849689
+SHA256 209b749ed737868b7d3b960132a27104107d15866c10ba1b8bf362b13a992be6 TWiki-4.0.1.tgz 3849689
diff --git a/www-apps/twiki/files/exec_command.patch b/www-apps/twiki/files/exec_command.patch
deleted file mode 100644
index 0425bd5e2991..000000000000
--- a/www-apps/twiki/files/exec_command.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur work/lib/TWiki/Store.pm work-patched/lib/TWiki/Store.pm
---- work/lib/TWiki/Store.pm	2004-10-19 14:48:40.000000000 -0400
-+++ work-patched/lib/TWiki/Store.pm	2005-09-16 07:19:40.000000000 -0400
-@@ -572,7 +572,9 @@
-     }
- 
-     $theRev = "" unless( $theRev );
--    $theRev =~ s/^1\.//o;
-+    $theRev =~ s/r?1\.//o;  # cut 'r' and major
-+    # Fix for Codev.SecurityAlertExecuteCommandsWithRev
-+    $theRev = "" unless( $theRev =~ s/.*?([0-9]+).*/$1/o );
- 
-     $topicHandler = _getTopicHandler( $theWebName, $theTopic, $attachment ) if( ! $topicHandler );
-     my( $rcsOut, $rev, $date, $user, $comment ) = $topicHandler->getRevisionInfo( $theRev );
-diff -ur work/lib/TWiki/UI/RDiff.pm work-patched/lib/TWiki/UI/RDiff.pm
---- work/lib/TWiki/UI/RDiff.pm	2004-08-08 04:28:45.000000000 -0400
-+++ work-patched/lib/TWiki/UI/RDiff.pm	2005-09-16 07:19:40.000000000 -0400
-@@ -409,6 +409,9 @@
-     if( ! $rev2 ) { $rev2 = 0; }
-     $rev1 =~ s/r?1\.//go;  # cut 'r' and major
-     $rev2 =~ s/r?1\.//go;  # cut 'r' and major
-+    # Fix for Codev.SecurityAlertExecuteCommandsWithRev
-+    $rev1 = $maxrev unless( $rev1 =~ s/.*?([0-9]+).*/$1/o );
-+    $rev2 = $maxrev unless( $rev2 =~ s/.*?([0-9]+).*/$1/o );
-     if( $rev1 < 1 )       { $rev1 = $maxrev; }
-     if( $rev1 > $maxrev ) { $rev1 = $maxrev; }
-     if( $rev2 < 1 )       { $rev2 = 1; }
-diff -ur work/lib/TWiki/UI/View.pm work-patched/lib/TWiki/UI/View.pm
---- work/lib/TWiki/UI/View.pm	2004-08-25 02:36:15.000000000 -0400
-+++ work-patched/lib/TWiki/UI/View.pm	2005-09-16 07:19:40.000000000 -0400
-@@ -106,6 +106,8 @@
-     $revdate = TWiki::formatTime( $revdate );
- 
-     if( $rev ) {
-+      # Fix for Codev.SecurityAlertExecuteCommandsWithRev
-+      $rev = $maxrev unless( $rev =~ s/.*?([0-9]+).*/$1/o );
-       $rev =~ s/r?1\.//go;  # cut 'r' and major
-       if( $rev < 1 )       { $rev = 1; }
-       if( $rev > $maxrev ) { $rev = $maxrev; }
-diff -ur work/lib/TWiki/UI/Viewfile.pm work-patched/lib/TWiki/UI/Viewfile.pm
---- work/lib/TWiki/UI/Viewfile.pm	2004-05-29 02:51:35.000000000 -0400
-+++ work-patched/lib/TWiki/UI/Viewfile.pm	2005-09-16 07:19:40.000000000 -0400
-@@ -43,6 +43,9 @@
- 
-   my $fileName = $query->param( 'filename' );
-   my $rev = $query->param( 'rev' ) || "";
-+  $rev =~ s/r?1\.//o;  # cut 'r' and major
-+  # Fix for Codev.SecurityAlertExecuteCommandsWithRev
-+  $rev = "" unless( $rev =~ s/.*?([0-9]+).*/$1/o );
- 
-   return unless TWiki::UI::webExists( $webName, $topic );
- 
diff --git a/www-apps/twiki/files/execwithsearch.patch b/www-apps/twiki/files/execwithsearch.patch
deleted file mode 100644
index 7652f53a9ce5..000000000000
--- a/www-apps/twiki/files/execwithsearch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Search.pm	2004-10-21 14:41:14.000000000 -0400
-+++ Search.pm.fixed	2005-06-28 17:53:53.000000000 -0400
-@@ -442,6 +442,12 @@
-     my $tempVal = "";
-     my $tmpl = "";
-     my $topicCount = 0; # JohnTalintyre
-+    # fix for Codev.SecurityAlertExecuteCommandsWithSearch
-+    # vulnerability, search: "test_vulnerability '; ls -la'"
-+    $theSearchVal =~ s/(^|[^\\])([\'\`])/\\$2/g;    # Escape ' and `
-+    $theSearchVal =~ s/[\@\$]\(/$1\\\(/g;           # Defuse @( ... ) and $( ... )
-+    $theSearchVal = substr($theSearchVal, 0, 1500); # Limit string length
-+ 
-     my $originalSearch = $theSearchVal;
-     my $renameTopic;
-     my $renameWeb = "";
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
index 9f2f04a354b1..7fb542188ae8 100644
--- a/www-apps/twiki/files/postinstall-en.txt
+++ b/www-apps/twiki/files/postinstall-en.txt
@@ -1,22 +1,27 @@
-
 You are almost done!
 
-1. Apache configs have been installed for you. You will need to edit them
-   to set the correct paths!
+0. You will need to manually adjust permissions for the installation script to
+   run:
+
+   $ chown -R apache:apache ${MY_INSTALLDIR}
+
+   When you're done with the installation, don't forget to make sure that only
+   the data/ and pub/ directories are writeable by the webserver!!!
 
-2. You may want to edit TWiki's config to suit your needs:
-   ${MY_INSTALLDIR}/lib/TWiki.cfg
+1. Review ${MY_INSTALLDIR}/bin/LocalLib.cfg and make sure all paths are set correctly
 
-3. Run the testenv script from your browser:
-   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/bin/testenv
-   It will show you the user name of the CGI scripts, a table listing all CGI
-   environment variables, and a test of your configuration file.
+2. Take a look at twiki_httpd_conf.txt and modify your Apache configs as
+   needed. Make sure your webserver can execute ${MY_INSTALLDIR}/bin/configure
+
+3. Visit http://${VHOST_HOSTNAME}/twiki/bin/configure
+   Most values should have been automatically set for you.
 
 4. Read the install guide
-   http://twiki.org/cgi-bin/view/TWiki/TWikiInstallationGuide
-   particularly if you wish to set up email preferences or I18N.
+   http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation
+
+=======================================================================
 
-5. Read ${MY_INSTALLDIR}/README.robustness for important security info.
+If you are upgrading:
 
-6. Visit http://${VHOST_HOSTNAME}/twiki, or
-   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/bin/view
+Follow the manual upgrade procedure as described on
+http://twiki.org/cgi-bin/view/TWiki/TWikiUpgradeGuide
diff --git a/www-apps/twiki/files/postupgrade-en.txt b/www-apps/twiki/files/postupgrade-en.txt
new file mode 100644
index 000000000000..f088c8613e20
--- /dev/null
+++ b/www-apps/twiki/files/postupgrade-en.txt
@@ -0,0 +1,2 @@
+Follow the manual upgrade procedure as described on
+http://twiki.org/cgi-bin/view/TWiki/TWikiUpgradeGuide
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
index 59e8525acee1..06f08c2ab8a2 100644
--- a/www-apps/twiki/files/reconfig
+++ b/www-apps/twiki/files/reconfig
@@ -8,19 +8,16 @@ die() {
 }
 
 if [ $1 = "install" ]; then
-	# don't change Apache files - breaks sandbox
-	#if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
-	#	sed -e "s|HOST|${VHOST_HOSTNAME}|
-	#	s|DOCROOT|${VHOST_HTDOCSDIR}|
-	#	s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
-	#fi
+	# fix lib location
+	sed -e "s|/absolute/path/to/your/lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/LocalLib.cfg || die
 
-	# fix lib locations
-	sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg || die
+	sed -e "s|/home/httpd/twiki/|${MY_INSTALLDIR}/|g" -i ${MY_INSTALLDIR}/twiki_httpd_conf.txt
 
-	# fix TWiki.cfg
-	sed -e "s|http://your.domain.com|http://${VHOST_HOSTNAME}|
-		s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/TWiki.cfg || die
+	sed -e "s|http://your.domain.com|http://${VHOST_HOSTNAME}|g
+			s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/LocalSite.cfg
+
+	# fix file permissions to avoid warnings
+	chmod 0755 ${MY_INSTALLDIR}/bin/*
 else
 	echo $1
 fi
diff --git a/www-apps/twiki/files/twiki.conf b/www-apps/twiki/files/twiki.conf
deleted file mode 100644
index 2e7bbae677bb..000000000000
--- a/www-apps/twiki/files/twiki.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-<VirtualHost HOST:80>
-	DocumentRoot "DOCROOT"
-	
-	<Directory "ROOTDIR">
-		Options None
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-	</Directory>
-	<Directory "ROOTDIR/bin">
-		Options +ExecCGI
-		SetHandler cgi-script
-		Allow from all
-	</Directory>
-	<Directory "ROOTDIR/pub">
-		Options FollowSymLinks +Includes
-		AllowOverride None
-		Allow from all
-	</Directory>
-	<Directory "ROOTDIR/data">
-		deny from all
-	</Directory>
-	<Directory "ROOTDIR/templates">
-		deny from all
-	</Directory>
-</VirtualHost>
diff --git a/www-apps/twiki/twiki-20041030-r1.ebuild b/www-apps/twiki/twiki-20041030-r1.ebuild
deleted file mode 100644
index 2a4260cde0bb..000000000000
--- a/www-apps/twiki/twiki-20041030-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-20041030-r1.ebuild,v 1.4 2006/02/13 15:20:45 mcummings Exp $
-
-inherit webapp eutils depend.apache
-
-DESCRIPTION="A Web Based Collaboration Platform"
-HOMEPAGE="http://twiki.org/"
-SRC_URI="http://ftp.ale.org/pub/mirrors/openpkg/sources/DST/${PN}//TWiki${PV}beta.zip
-	http://static.enyo.de/fw/patches/twiki/twiki-robustness-r3342.diff"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/perl-5.8
-		virtual/perl-CGI
-		virtual/perl-libnet
-		>=app-text/rcs-5.7
-		sys-apps/diffutils
-		virtual/cron
-		=net-www/apache-1*"
-# apache2 is not supported, see twiki documentation
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib/TWiki
-	epatch ${FILESDIR}/execwithsearch.patch
-
-	# bug #106149
-	cd ${S}
-	epatch ${FILESDIR}/exec_command.patch
-	epatch ${DISTDIR}/twiki-robustness-r3342.diff
-
-	# change web user to apache
-	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
-}
-
-src_install() {
-	webapp_src_preinst
-
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	dodoc readme.txt README.robustness
-
-	insinto ${APACHE1_VHOSTDIR}
-	doins ${FILESDIR}/twiki.conf
-
-	chmod 0755 ${D}/${MY_HTDOCSDIR}/bin/*
-	for file in `find data pub`; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_configfile ${MY_HTDOCSDIR}/bin/setlib.cfg
-	webapp_configfile ${MY_HTDOCSDIR}/lib/TWiki.cfg
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/twiki/twiki-4.0.1.ebuild b/www-apps/twiki/twiki-4.0.1.ebuild
new file mode 100644
index 000000000000..5a541ab38256
--- /dev/null
+++ b/www-apps/twiki/twiki-4.0.1.ebuild
@@ -0,0 +1,79 @@
+# 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.1.ebuild,v 1.1 2006/02/14 19:33:42 rl03 Exp $
+
+inherit webapp eutils versionator
+
+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
+		perl-core/CGI
+		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
+		perl-core/libnet
+		dev-perl/URI
+		virtual/cron
+		apache2? ( >=net-www/apache-2.0.54 )
+		!apache2? ( =net-www/apache-1* )"
+
+src_unpack() {
+	unpack ${A}
+	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
+}