rpms/squirrelmail/devel .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 squirrelmail-1.4.17-biguid.patch, 1.1, 1.2 squirrelmail.spec, 1.75, 1.76

Wed Aug 19 11:15:35 UTC 2009

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17008

Modified Files:
	.cvsignore sources squirrelmail-1.4.17-biguid.patch 
	squirrelmail.spec 
Log Message:
updated to 1.4.20-RC2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28

--- .cvsignore	17 Aug 2009 07:47:26 -0000	1.27
+++ .cvsignore	19 Aug 2009 11:15:35 -0000	1.28
@@ -1,2 +1,2 @@
 all_locales-1.4.13-20071220.tar.bz2
-squirrelmail-1.4.20RC1.tar.bz2
+squirrelmail-1.4.20-RC2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	17 Aug 2009 07:47:26 -0000	1.27
+++ sources	19 Aug 2009 11:15:35 -0000	1.28
@@ -1,2 +1,2 @@
 c6463312afcd602ae60fd8f388dfb8c2  all_locales-1.4.13-20071220.tar.bz2
-7632177bd3618cd9965e548fd196f737  squirrelmail-1.4.20RC1.tar.bz2
+94015fb018cb2165fdfb3c41fd2b8065  squirrelmail-1.4.20-RC2.tar.bz2

squirrelmail-1.4.17-biguid.patch:
 functions/global.php               |   13 +++++++++++++
 functions/imap_messages.php        |    2 +-
 plugins/delete_move_next/setup.php |   18 +++++++++---------
 src/compose.php                    |    2 +-
 src/download.php                   |    2 +-
 src/image.php                      |    2 +-
 src/printer_friendly_main.php      |    2 +-
 src/read_body.php                  |    2 +-
 src/view_header.php                |    2 +-
 9 files changed, 29 insertions(+), 16 deletions(-)

Index: squirrelmail-1.4.17-biguid.patch
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail-1.4.17-biguid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squirrelmail-1.4.17-biguid.patch	23 Feb 2009 11:51:24 -0000	1.1
+++ squirrelmail-1.4.17-biguid.patch	19 Aug 2009 11:15:35 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up squirrelmail/functions/global.php.biguid squirrelmail/functions/global.php
---- squirrelmail/functions/global.php.biguid	2009-01-22 11:35:17.000000000 +0100
-+++ squirrelmail/functions/global.php	2009-01-23 12:12:31.570024148 +0100
-@@ -520,3 +520,16 @@ function is_ssl_secured_connection()
+diff -up squirrelmail-1.4.20-RC2/functions/global.php.biguid squirrelmail-1.4.20-RC2/functions/global.php
+--- squirrelmail-1.4.20-RC2/functions/global.php.biguid	2009-07-16 23:33:48.000000000 +0200
++++ squirrelmail-1.4.20-RC2/functions/global.php	2009-08-19 13:11:36.178560548 +0200
+@@ -603,3 +603,16 @@ function file_has_long_lines($filename, 
      return FALSE;
  }
  
@@ -18,10 +18,10 @@ diff -up squirrelmail/functions/global.p
 +{
 +  return preg_match('/^[0-9]+$/', $value) ? $value : '0';
 +}
-diff -up squirrelmail/functions/imap_messages.php.biguid squirrelmail/functions/imap_messages.php
---- squirrelmail/functions/imap_messages.php.biguid	2009-01-22 11:35:17.000000000 +0100
-+++ squirrelmail/functions/imap_messages.php	2009-01-23 12:11:13.912875541 +0100
-@@ -1006,7 +1006,7 @@ function sqimap_get_message($imap_stream
+diff -up squirrelmail-1.4.20-RC2/functions/imap_messages.php.biguid squirrelmail-1.4.20-RC2/functions/imap_messages.php
+--- squirrelmail-1.4.20-RC2/functions/imap_messages.php.biguid	2009-07-29 04:21:06.000000000 +0200
++++ squirrelmail-1.4.20-RC2/functions/imap_messages.php	2009-08-19 13:11:36.181336281 +0200
+@@ -1017,7 +1017,7 @@ function sqimap_get_message($imap_stream
      global $uid_support;
  
      // typecast to int to prohibit 1:* msgs sets
@@ -30,9 +30,9 @@ diff -up squirrelmail/functions/imap_mes
      $flags = array();
      $read = sqimap_run_command($imap_stream, "FETCH $id (FLAGS BODYSTRUCTURE)", true, $response, $message, $uid_support);
      if ($read) {
-diff -up squirrelmail/plugins/delete_move_next/setup.php.biguid squirrelmail/plugins/delete_move_next/setup.php
---- squirrelmail/plugins/delete_move_next/setup.php.biguid	2009-01-22 11:35:10.000000000 +0100
-+++ squirrelmail/plugins/delete_move_next/setup.php	2009-01-23 12:11:13.913875492 +0100
+diff -up squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php.biguid squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php
+--- squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php.biguid	2009-08-18 01:17:41.000000000 +0200
++++ squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php	2009-08-19 13:13:59.459247532 +0200
 @@ -166,11 +166,11 @@ function delete_move_next_read($currloc)
          $prev_if_del = $prev;
          $next_if_del = $next;
@@ -55,14 +55,14 @@ diff -up squirrelmail/plugins/delete_mov
  
 -        if ($prev > 0){
 +        if (((float)$prev) > 0){
-             echo "<a href=\"read_body.php?passed_id=$prev_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id\">" . _("Delete & Prev") . "</a>" . " | \n";
+             echo "<a href=\"read_body.php?passed_id=$prev_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id&smtoken=" . sm_generate_security_token() . "\">" . _("Delete & Prev") . "</a>" . " | \n";
          }
          else {
              echo _("Delete & Prev") . " | ";
          }
 -        if ($next > 0){
 +        if (((float)$next) > 0){
-             echo "<a href=\"read_body.php?passed_id=$next_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id\">" . _("Delete & Next") . "</a>\n";
+             echo "<a href=\"read_body.php?passed_id=$next_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id&smtoken=" . sm_generate_security_token() . "\">" . _("Delete & Next") . "</a>\n";
          } else {
              echo _("Delete & Next");
          }
@@ -86,10 +86,10 @@ diff -up squirrelmail/plugins/delete_mov
                  delete_move_next_moveNextForm($next_if_del);
              } else {
                  delete_move_next_moveRightMainForm();
-diff -up squirrelmail/src/compose.php.biguid squirrelmail/src/compose.php
---- squirrelmail/src/compose.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/compose.php	2009-01-23 12:11:13.913875492 +0100
-@@ -92,7 +92,7 @@ sqgetGlobalVar('ent_num',$ent_num, $SQ_G
+diff -up squirrelmail-1.4.20-RC2/src/compose.php.biguid squirrelmail-1.4.20-RC2/src/compose.php
+--- squirrelmail-1.4.20-RC2/src/compose.php.biguid	2009-08-18 01:17:41.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/compose.php	2009-08-19 13:11:36.182560530 +0200
+@@ -95,7 +95,7 @@ sqgetGlobalVar('ent_num',$ent_num, $SQ_G
  sqgetGlobalVar('saved_draft',$saved_draft, SQ_FORM);
  
  if ( sqgetGlobalVar('delete_draft',$delete_draft) ) {
@@ -98,9 +98,9 @@ diff -up squirrelmail/src/compose.php.bi
  }
  
  if ( sqgetGlobalVar('startMessage',$startMessage) ) {
-diff -up squirrelmail/src/download.php.biguid squirrelmail/src/download.php
---- squirrelmail/src/download.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/download.php	2009-01-23 12:11:13.914875446 +0100
+diff -up squirrelmail-1.4.20-RC2/src/download.php.biguid squirrelmail-1.4.20-RC2/src/download.php
+--- squirrelmail-1.4.20-RC2/src/download.php.biguid	2009-04-16 00:00:49.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/download.php	2009-08-19 13:11:36.182560530 +0200
 @@ -38,7 +38,7 @@ sqgetGlobalVar('mailbox',    $mailbox,  
  sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
  sqgetGlobalVar('absolute_dl',$absolute_dl,  SQ_GET);
@@ -110,9 +110,9 @@ diff -up squirrelmail/src/download.php.b
  }
  
  global $default_charset;
-diff -up squirrelmail/src/image.php.biguid squirrelmail/src/image.php
---- squirrelmail/src/image.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/image.php	2009-01-23 12:11:13.914875446 +0100
+diff -up squirrelmail-1.4.20-RC2/src/image.php.biguid squirrelmail-1.4.20-RC2/src/image.php
+--- squirrelmail-1.4.20-RC2/src/image.php.biguid	2009-04-16 00:00:49.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/image.php	2009-08-19 13:11:36.189622810 +0200
 @@ -32,7 +32,7 @@ displayPageHeader($color, 'None');
  
  /* globals */
@@ -122,9 +122,9 @@ diff -up squirrelmail/src/image.php.bigu
  }
  sqgetGlobalVar('mailbox',       $mailbox,       SQ_GET);
  sqgetGlobalVar('ent_id',        $ent_id,        SQ_GET);
-diff -up squirrelmail/src/printer_friendly_main.php.biguid squirrelmail/src/printer_friendly_main.php
---- squirrelmail/src/printer_friendly_main.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/printer_friendly_main.php	2009-01-23 12:11:13.914875446 +0100
+diff -up squirrelmail-1.4.20-RC2/src/printer_friendly_main.php.biguid squirrelmail-1.4.20-RC2/src/printer_friendly_main.php
+--- squirrelmail-1.4.20-RC2/src/printer_friendly_main.php.biguid	2009-04-16 00:00:49.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/printer_friendly_main.php	2009-08-19 13:11:36.190247022 +0200
 @@ -29,7 +29,7 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox
       ! sqgetGlobalVar('passed_id',$passed_id,SQ_GET)) {
      error_box(_("Invalid URL"),$color);
@@ -134,9 +134,9 @@ diff -up squirrelmail/src/printer_friend
      $view_unsafe_images = (bool) $_GET['view_unsafe_images'];
  /* end globals */
      displayHtmlHeader( _("Printer Friendly"), '', false, true );
-diff -up squirrelmail/src/read_body.php.biguid squirrelmail/src/read_body.php
---- squirrelmail/src/read_body.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/read_body.php	2009-01-23 12:11:13.915796109 +0100
+diff -up squirrelmail-1.4.20-RC2/src/read_body.php.biguid squirrelmail-1.4.20-RC2/src/read_body.php
+--- squirrelmail-1.4.20-RC2/src/read_body.php.biguid	2009-08-18 01:17:41.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/read_body.php	2009-08-19 13:11:36.190247022 +0200
 @@ -750,7 +750,7 @@ sqgetGlobalVar('passed_ent_id', $passed_
  sqgetGlobalVar('mailbox',       $mailbox);
  
@@ -146,10 +146,10 @@ diff -up squirrelmail/src/read_body.php.
  }
  if ( sqgetGlobalVar('sort', $temp) ) {
      $sort = (int) $temp;
-diff -up squirrelmail/src/view_header.php.biguid squirrelmail/src/view_header.php
---- squirrelmail/src/view_header.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/view_header.php	2009-01-23 12:11:13.915796109 +0100
-@@ -119,7 +119,7 @@ function view_header($header, $mailbox, 
+diff -up squirrelmail-1.4.20-RC2/src/view_header.php.biguid squirrelmail-1.4.20-RC2/src/view_header.php
+--- squirrelmail-1.4.20-RC2/src/view_header.php.biguid	2009-07-29 04:21:06.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/view_header.php	2009-08-19 13:11:36.190247022 +0200
+@@ -120,7 +120,7 @@ function view_header($header, $mailbox, 
  
  /* get global vars */
  if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- squirrelmail.spec	13 Aug 2009 13:42:56 -0000	1.75
+++ squirrelmail.spec	19 Aug 2009 11:15:35 -0000	1.76
@@ -6,11 +6,11 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.20
-Release: 0.rc1%{?dist}
+Release: 0.rc2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}RC1.tar.bz2
+Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}-RC2.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
@@ -50,7 +50,7 @@ compatibility across browsers.  It has v
 easy to configure and install.
 
 %prep
-%setup -q -n squirrelmail-%{version}RC1
+%setup -q -n squirrelmail-%{version}-RC2
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -61,7 +61,7 @@ tar xfj %SOURCE4
 %patch4 -p2
 popd
 
-%patch5 -p1
+%patch5 -p1 -b .biguid
 %patch6 -p1
 
 %build
@@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Aug 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20RC2-1
+- updated to 1.4.20RC2
+
 * Thu Aug 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20RC1-1
 - updated to 1.4.20RC1
 - fixes #517312 - CSRF issues in all forms (SA34627)


