Apply hotfix for CVE-2006-2942.

(Portage version: 2.1)

2 files changed, 77 insertions, 0 deletions

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
new file mode 100644
index 000000000000..fd06de7446df
--- /dev/null
+++ b/www-apps/twiki/files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff
@@ -0,0 +1,74 @@
+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
new file mode 100644
index 000000000000..4485135441bb
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-4.0.2-r1
@@ -0,0 +1,3 @@
+MD5 434fd3dd09138c283bc3f1884e84faa5 TWiki-4.0.2.tgz 4014446
+RMD160 41a3e678fa27ad2d9bdf0e94871df2ca2daa58e0 TWiki-4.0.2.tgz 4014446
+SHA256 22c5c2e3fe703ae29ca3a6ec08950c95460ef28aea73ef3708bf59d0185872ed TWiki-4.0.2.tgz 4014446