OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Steffen Weinreich
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jul-2005 21:23:45
Branch: HEAD Handle: 2005073020234500
Modified files:
openpkg-src/squirrelmail
squirrelmail.patch squirrelmail.spec
Log:
upgrading package: squirrelmail 1.4.4 -> 1.4.5
Summary:
Revision Changes Path
1.3 +21 -25 openpkg-src/squirrelmail/squirrelmail.patch
1.31 +2 -2 openpkg-src/squirrelmail/squirrelmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squirrelmail/squirrelmail.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 squirrelmail.patch
--- openpkg-src/squirrelmail/squirrelmail.patch 20 Mar 2005 16:06:38
-0000 1.2
+++ openpkg-src/squirrelmail/squirrelmail.patch 30 Jul 2005 19:23:45
-0000 1.3
@@ -1,37 +1,45 @@
Index: functions/display_messages.php
-diff -Nau functions/display_messages.php.orig functions/display_messages.php
---- functions/display_messages.php.orig 2005-03-16 14:19:09.834557000
+0100
-+++ functions/display_messages.php 2005-03-16 14:19:14.176437000 +0100
-@@ -107,8 +107,8 @@
+--- functions/display_messages.php.orig 2005-03-21 23:18:32 +0100
++++ functions/display_messages.php 2005-07-30 21:15:29 +0200
+@@ -106,8 +106,8 @@
"\"$width_and_height /><br />\n";
}
echo ( $hide_sm_attributions ? '' :
- '<small>' . sprintf (_("SquirrelMail version %s"), $version) .
'<br />'.
-- _("By the SquirrelMail Development Team") . "<br /></small>\n"
).
+- _("By the SquirrelMail Project Team") . "<br /></small>\n" ).
+ '<br />'.
+ "<br />\n" ).
'<table cellspacing="1" cellpadding="0" bgcolor="'.$color[1].'"
width="70%">'.
'<tr><td>'.
'<table width="100%" border="0" bgcolor="'.$color[4].'"
align="center">'.
+Index: functions/imap_general.php
+--- functions/imap_general.php.orig 2005-05-20 12:37:34 +0200
++++ functions/imap_general.php 2005-07-30 21:14:27 +0200
+@@ -569,6 +569,7 @@
+
+ set_up_language($squirrelmail_language, true);
+ include_once(SM_PATH . 'functions/display_messages.php' );
++ do_hook('invalid_login'); /* used with squirrelmail_logger
*/
+ sqsession_destroy();
+ /* terminate the session nicely */
+ sqimap_logout($imap_stream);
Index: src/login.php
-diff -Nau src/login.php.orig src/login.php
---- src/login.php.orig 2005-03-16 14:19:21.207817000 +0100
-+++ src/login.php 2005-03-16 14:19:26.038991000 +0100
-@@ -110,8 +110,8 @@
+--- src/login.php.orig 2005-06-22 15:45:35 +0200
++++ src/login.php 2005-07-30 21:15:39 +0200
+@@ -117,8 +117,8 @@
' /><br />' . "\n"
: '' ).
( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
- '<small>' . sprintf (_("SquirrelMail version %s"), $version) .
'<br />' ."\n".
-- ' ' . _("By the SquirrelMail Development Team") . '<br
/></small>' . "\n" ) .
+- ' ' . _("By the SquirrelMail Project Team") . '<br /></small>'
. "\n" ) .
+ '<br />' ."\n".
+ '<br />' . "\n" ) .
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
Index: src/right_main.php
-diff -Nau src/right_main.php.orig src/right_main.php
---- src/right_main.php.orig 2005-03-16 16:41:39.703294000 +0100
-+++ src/right_main.php 2005-03-16 16:41:43.220847000 +0100
+--- src/right_main.php.orig 2005-06-15 23:12:05 +0200
++++ src/right_main.php 2005-07-30 21:14:27 +0200
@@ -185,6 +185,7 @@
)
) ,
@@ -40,15 +48,3 @@
}
}
}
-Index: functions/imap_general.php
-diff -Nau functions/imap_general.php.orig functions/imap_general.php
---- functions/imap_general.php.orig 2005-03-20 16:42:59.000000000 +0100
-+++ functions/imap_general.php 2005-03-20 16:49:00.330978000 +0100
-@@ -573,6 +573,7 @@
-
- set_up_language($squirrelmail_language, true);
- include_once(SM_PATH . 'functions/display_messages.php' );
-+ do_hook('invalid_login'); /* used with squirrelmail_logger
*/
- sqsession_destroy();
- /* terminate the session nicely */
- sqimap_logout($imap_stream);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squirrelmail/squirrelmail.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 squirrelmail.spec
--- openpkg-src/squirrelmail/squirrelmail.spec 13 Jul 2005 17:42:56
-0000 1.30
+++ openpkg-src/squirrelmail/squirrelmail.spec 30 Jul 2005 19:23:45
-0000 1.31
@@ -23,7 +23,7 @@
##
# package version
-%define V_sqmail 1.4.4
+%define V_sqmail 1.4.5
%define V_locale 1.4.5-20050713
%define V_plugin_compat 2.0
%define V_plugin_logger 1.4.0-1.0.6
@@ -50,7 +50,7 @@
Group: Mail
License: GPL
Version: %{V_sqmail}
-Release: 20050713
+Release: 20050730
# package options
%option with_plugins no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
