squirrelmail/squirrelmail.patch

Tue, 29 Mar 2011 19:46:35 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 29 Mar 2011 19:46:35 +0200
changeset 333
4ecfc2416fd8
parent 157
3214ed6c04f6
child 352
aa138c6f5dd6
permissions
-rw-r--r--

Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.

     1 Index: functions/display_messages.php
     2 --- functions/display_messages.php.orig	2005-03-21 23:18:32 +0100
     3 +++ functions/display_messages.php	2005-07-30 21:15:29 +0200
     4 @@ -97,8 +97,8 @@
     5               "\"$width_and_height /><br />\n";
     6      }
     7      echo ( $hide_sm_attributions ? '' :
     8 -            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />'.
     9 -            _("By the SquirrelMail Project Team") . "<br /></small>\n" ).
    10 +            '<br />'.
    11 +            "<br />\n" ).
    12           '<table cellspacing="1" cellpadding="0" bgcolor="'.$color[1].'" width="70%">'.
    13           '<tr><td>'.
    14           '<table width="100%" border="0" bgcolor="'.$color[4].'" align="center">'.
    15 Index: functions/imap_general.php
    16 --- functions/imap_general.php.orig	2005-05-20 12:37:34 +0200
    17 +++ functions/imap_general.php	2005-07-30 21:14:27 +0200
    18 @@ -578,6 +578,7 @@
    20                  set_up_language($squirrelmail_language, true);
    21                  include_once(SM_PATH . 'functions/display_messages.php' );
    22 +                do_hook('invalid_login'); /* used with squirrelmail_logger */
    23                  sqsession_destroy();
    24                  /* terminate the session nicely */
    25                  sqimap_logout($imap_stream);
    26 Index: src/login.php
    27 --- src/login.php.orig	2005-06-22 15:45:35 +0200
    28 +++ src/login.php	2005-07-30 21:15:39 +0200
    29 @@ -196,8 +196,8 @@
    30                  ' /><br />' . "\n"
    31                : '' ).
    32              ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
    33 -            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
    34 -            '  ' . _("By the SquirrelMail Project Team") . '<br /></small>' . "\n" ) .
    35 +            '<br />' ."\n".
    36 +            '<br />' . "\n" ) .
    37              html_tag( 'table',
    38                  html_tag( 'tr',
    39                      html_tag( 'td',
    40 Index: src/right_main.php
    41 --- src/right_main.php.orig	2005-06-15 23:12:05 +0200
    42 +++ src/right_main.php	2005-07-30 21:14:27 +0200
    43 @@ -182,6 +182,7 @@
    44                               )
    45                          ) ,
    46                      'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
    47 +            echo "<br />\n";
    48          }
    49      }
    50  }

mercurial