Version bump

(Portage version: 2.1)
 (Signed Manifest commit)

4 files changed, 15 insertions, 179 deletions

diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 20f5b8dbe2e2..ca7da639d4fe 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310 RMD160 4624c5dacea4df0f1010107ce2498d46585d88c9 SHA1 8ea6603695d30d11025f7035d4b5be9e0c088c80 SHA256 549f0670531c23ffbff8f92bd4b49113822b682079a530a12d0f036d85bb13c7
-MD5 1a276861ca99a62106f85612aa4ce59b files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310
-RMD160 4624c5dacea4df0f1010107ce2498d46585d88c9 files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310
-SHA256 549f0670531c23ffbff8f92bd4b49113822b682079a530a12d0f036d85bb13c7 files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310
 AUX postinstall-en.txt 1022 RMD160 cb453ad7ea6d75221f026d557c4ac4336bcc45e1 SHA1 a36fca72aa00b60a9249fc684ed7eba3af03454f SHA256 724d08ac4f12335a3bf5a5c9c3411b9780d3df1df1302d45adaeb075cc16fe27
 MD5 76e9639da36e9fdfd92e24e565f8c090 files/postinstall-en.txt 1022
 RMD160 cb453ad7ea6d75221f026d557c4ac4336bcc45e1 files/postinstall-en.txt 1022
@@ -17,26 +13,26 @@ AUX reconfig 553 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 SHA1 8d7f6dc57b
 MD5 b54ed2926e5754a14d265cfa477ebb8a files/reconfig 553
 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 files/reconfig 553
 SHA256 9bff3cbfb8ecbfe396e6e61ddf189c24f4500c469e9c0e0a5961a4b5b3fce851 files/reconfig 553
-DIST TWiki-4.0.2.tgz 4014446 RMD160 41a3e678fa27ad2d9bdf0e94871df2ca2daa58e0 SHA1 16c48d1d856eeb861412f4269bb321e5b0fc4bdb SHA256 22c5c2e3fe703ae29ca3a6ec08950c95460ef28aea73ef3708bf59d0185872ed
-EBUILD twiki-4.0.2-r1.ebuild 2140 RMD160 28ab8c0e57834838e606d4503bac0f6ba02e322b SHA1 d25acc7815a75db468bff5a520b6c0b6acdf07d0 SHA256 988007817a6cf20c4a2768438e5121e74e8c1ff5d1474a577b4423ca8f5d64b3
-MD5 a59e354afa4b085f5c2bdd42968c7cd6 twiki-4.0.2-r1.ebuild 2140
-RMD160 28ab8c0e57834838e606d4503bac0f6ba02e322b twiki-4.0.2-r1.ebuild 2140
-SHA256 988007817a6cf20c4a2768438e5121e74e8c1ff5d1474a577b4423ca8f5d64b3 twiki-4.0.2-r1.ebuild 2140
-MISC ChangeLog 5550 RMD160 9f13544386d385bc2d6e68389dd095a41bfaccaa SHA1 1f65bea1cb458a61499350f4c0aae28caf4c1183 SHA256 3a2731fb6cad5cc5b9816d207f020b90e53ad0b663f2a40b0a71a42bdd0a36e4
-MD5 4118229363f74e96227e5d203c6a39cf ChangeLog 5550
-RMD160 9f13544386d385bc2d6e68389dd095a41bfaccaa ChangeLog 5550
-SHA256 3a2731fb6cad5cc5b9816d207f020b90e53ad0b663f2a40b0a71a42bdd0a36e4 ChangeLog 5550
+DIST TWiki-4.0.3.tgz 4150679 RMD160 0ddb1eba747d5d88be8c2f78c121763782106c98 SHA1 e5dc4d809d658cafd6d86901b156f30faaf342d3 SHA256 3b5ae29bf4f864a19e7a9cdce5033b92ab9faf70e14acc16f02e9296817dea24
+EBUILD twiki-4.0.3.ebuild 2078 RMD160 adeceec95ce54f256cf76ba95d89dc454fa0c1e0 SHA1 2bbaaf39fa9b502579b02e126cfc8e6fb62f352b SHA256 1e8a1826f8a2efd861abfc282d3e19cc3a608c3000e0528401c3854ee4bc4f75
+MD5 b4f3f64b2d36fdca09b2cfd36a7f25ad twiki-4.0.3.ebuild 2078
+RMD160 adeceec95ce54f256cf76ba95d89dc454fa0c1e0 twiki-4.0.3.ebuild 2078
+SHA256 1e8a1826f8a2efd861abfc282d3e19cc3a608c3000e0528401c3854ee4bc4f75 twiki-4.0.3.ebuild 2078
+MISC ChangeLog 5735 RMD160 c350b718357bdde50a3f25bbe89b7da83b73c3ae SHA1 fc5831814cef9b75bf6605612d987b5e938b19a6 SHA256 5b4c9b12e5bdcbe776e00cbc1851543b17dae725a99effe4b6ed97104593e89f
+MD5 06c734ddb35f3f3177174a3961130fb4 ChangeLog 5735
+RMD160 c350b718357bdde50a3f25bbe89b7da83b73c3ae ChangeLog 5735
+SHA256 5b4c9b12e5bdcbe776e00cbc1851543b17dae725a99effe4b6ed97104593e89f ChangeLog 5735
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata.xml 280
-MD5 b08a28e4184d3b4f3a6dd5c196f6a732 files/digest-twiki-4.0.2-r1 229
-RMD160 a68285875f9efc6dc688109a2cc335e8ef808794 files/digest-twiki-4.0.2-r1 229
-SHA256 d579a4a87c38900c2f55720d88d33cd9ed63b26f7bcf882abc64805308aeb7ec files/digest-twiki-4.0.2-r1 229
+MD5 055aed57b541eed3b09d5c691039edf1 files/digest-twiki-4.0.3 229
+RMD160 54bd4a6770f27cf719f2fc04058d62a36046fa70 files/digest-twiki-4.0.3 229
+SHA256 be34ff00413b7ece4f48e94773596383537d279d68e804e2ab6069fb2b5cf1e8 files/digest-twiki-4.0.3 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFElKE8EzitwsaoONoRAtYEAJoCc7p8WOPf7fUs/VlT+lAGfG3AcwCffrTS
-DIh9tjCP4J2XwbkkRXq+h6s=
-=rkXI
+iD8DBQFEnvPxEzitwsaoONoRAi1HAJ9EghR4QHJTq0Xa0/qDNzkIqY4wlwCg2s1+
+JKxRhyiCCSvSclhKNSa+K8w=
+=JMaf
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff b/www-apps/twiki/files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff
deleted file mode 100644
index fd06de7446df..000000000000
--- a/www-apps/twiki/files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: Register.pm
-===================================================================
---- lib/TWiki/UI/Register.pm	(revision 10544)
-+++ lib/TWiki/UI/Register.pm	(working copy)
-@@ -418,7 +418,7 @@
-       $data->{WikiName}.'.'.TWiki::User::randomPassword();
-     _putRegDetailsByCode( $data, $tmpDir );
- 
--    $session->writeLog( 'regstart', $data->{webName}.'.'.$data->{WikiName},
-+    $session->writeLog( 'regstart', $TWiki::cfg{UsersWebName}.'.'.$data->{WikiName},
-                         $data->{Email}, $data->{WikiName} );
- 
-     my $err = _sendEmail( $session, 'registerconfirm', $data );
-@@ -788,13 +788,13 @@
- 
-     # write log entry
-     if ($TWiki::cfg{Log}{register}) {
--        $session->writeLog( 'register', $data->{webName}.'.'.$data->{WikiName},
-+        $session->writeLog( 'register', $TWiki::cfg{UsersWebName}.'.'.$data->{WikiName},
-                             $data->{Email}, $data->{WikiName} );
-     }
- 
-     # and finally display thank you page
-     throw TWiki::OopsException( 'attention',
--                                web => $data->{webName},
-+                                web => $TWiki::cfg{UsersWebName},
-                                 topic => $data->{WikiName},
-                                 def => 'thanks',
-                                 params => $data->{Email} );
-@@ -809,7 +809,7 @@
- sub _newUserFromTemplate {
-     my ($session, $template, $row) = @_;
-     my ( $meta, $text ) = TWiki::UI::readTemplateTopic($session, $template);
--    my $log = $b.' Writing topic '.$row->{webName}.'.'.$row->{WikiName}."\n".
-+    my $log = $b.' Writing topic '.$TWiki::cfg{UsersWebName}.'.'.$row->{WikiName}."\n".
-       $b2.' RegistrationHandler: ';
-     my $regLog = $text;
-     _purgeKeys( $row );
-@@ -859,7 +859,7 @@
-     my $agent = $session->{users}->findUser( $twikiRegistrationAgent,
-                                              $twikiRegistrationAgent);
- 
--    $session->{store}->saveTopic($agent, $data->{webName},
-+    $session->{store}->saveTopic($agent, $TWiki::cfg{UsersWebName},
-                                  $data->{WikiName}, $text, $meta );
-     return $log;
- }
-@@ -993,7 +993,7 @@
-     }
-     $templateText = $before.$after;
-     $templateText = $session->handleCommonTags
--      ( $templateText, $data->{webName}, $data->{WikiName} );
-+      ( $templateText, $TWiki::cfg{UsersWebName}, $data->{WikiName} );
-     $templateText =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois;
-     # remove <nop> and <noautolink> tags
- 
-@@ -1014,7 +1014,7 @@
-                                     params => '' );
-     }
- 
--    if($session->{store}->topicExists( $data->{webName}, $data->{WikiName} )) {
-+    if($session->{store}->topicExists( $TWiki::cfg{UsersWebName}, $data->{WikiName} )) {
-         throw TWiki::OopsException( 'attention',
-                                     web => $data->{webName},
-                                     topic => $topic,
-@@ -1127,7 +1127,7 @@
-     $text =~ s/%INTRODUCTION%/$p->{Introduction}/go;
-     $text =~ s/%VERIFICATIONCODE%/$p->{VerificationCode}/go;
-     $text =~ s/%PASSWORD%/$p->{PasswordA}/go;
--    $text = $session->handleCommonTags( $text, $p->{webName}, $p->{WikiName} );
-+    $text = $session->handleCommonTags( $text, $TWiki::cfg{UsersWebName}, $p->{WikiName} );
-     return $session->{net}->sendEmail($text);
- }
- 
diff --git a/www-apps/twiki/files/digest-twiki-4.0.2-r1 b/www-apps/twiki/files/digest-twiki-4.0.2-r1
deleted file mode 100644
index 4485135441bb..000000000000
--- a/www-apps/twiki/files/digest-twiki-4.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 434fd3dd09138c283bc3f1884e84faa5 TWiki-4.0.2.tgz 4014446
-RMD160 41a3e678fa27ad2d9bdf0e94871df2ca2daa58e0 TWiki-4.0.2.tgz 4014446
-SHA256 22c5c2e3fe703ae29ca3a6ec08950c95460ef28aea73ef3708bf59d0185872ed TWiki-4.0.2.tgz 4014446
diff --git a/www-apps/twiki/twiki-4.0.2-r1.ebuild b/www-apps/twiki/twiki-4.0.2-r1.ebuild
deleted file mode 100644
index dc1575f69589..000000000000
--- a/www-apps/twiki/twiki-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,83 +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-4.0.2-r1.ebuild,v 1.1 2006/06/18 00:44:42 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}
-
-	epatch ${FILESDIR}/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff
-
-	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
-}