rpms/squirrelmail/F-12 .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 squirrelmail-1.4.17-biguid.patch, 1.2, 1.3 squirrelmail.spec, 1.79, 1.80 squirrelmail-1.4.15-tr-fix.patch, 1.1, NONE
Michal Hlavinka
mhlavink at fedoraproject.org
Mon Mar 8 15:47:40 UTC 2010
- Previous message: rpms/squirrelmail/F-13 .cvsignore, 1.30, 1.31 sources, 1.31, 1.32 squirrelmail-1.4.17-biguid.patch, 1.2, 1.3 squirrelmail.spec, 1.79, 1.80 squirrelmail-1.4.15-tr-fix.patch, 1.1, NONE
- Next message: rpms/squirrelmail/F-11 .cvsignore, 1.26, 1.27 sources, 1.27, 1.28 squirrelmail-1.4.17-biguid.patch, 1.2, 1.3 squirrelmail.spec, 1.71, 1.72 squirrelmail-1.4.15-tr-fix.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mhlavink
Update of /cvs/pkgs/rpms/squirrelmail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8439
Modified Files:
.cvsignore sources squirrelmail-1.4.17-biguid.patch
squirrelmail.spec
Removed Files:
squirrelmail-1.4.15-tr-fix.patch
Log Message:
* Mon Mar 08 2010 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20-1
- updated to 1.4.20
- translations updated
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore 4 Jan 2010 16:03:17 -0000 1.30
+++ .cvsignore 8 Mar 2010 15:47:36 -0000 1.31
@@ -1,2 +1,2 @@
-all_locales-1.4.13-20071220.tar.bz2
-squirrelmail-1.4.20-RC2_20100104.tar.bz2
+squirrelmail-1.4.20.tar.bz2
+all_locales-1.4.18-20090526.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources 4 Jan 2010 16:03:18 -0000 1.30
+++ sources 8 Mar 2010 15:47:37 -0000 1.31
@@ -1,2 +1,2 @@
-c6463312afcd602ae60fd8f388dfb8c2 all_locales-1.4.13-20071220.tar.bz2
-be6d12f4e5b8db3f650a750cbf7a9c15 squirrelmail-1.4.20-RC2_20100104.tar.bz2
+76aa7963e67edc7cea2be919f51ded72 squirrelmail-1.4.20.tar.bz2
+ddb51e99e87b2aa8180cebe07de89fa2 all_locales-1.4.18-20090526.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/pkgs/rpms/squirrelmail/F-12/squirrelmail-1.4.17-biguid.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squirrelmail-1.4.17-biguid.patch 19 Aug 2009 11:15:35 -0000 1.2
+++ squirrelmail-1.4.17-biguid.patch 8 Mar 2010 15:47:40 -0000 1.3
@@ -1,7 +1,7 @@
-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,
+diff -up squirrelmail-1.4.20/functions/global.php.biguid squirrelmail-1.4.20/functions/global.php
+--- squirrelmail-1.4.20/functions/global.php.biguid 2010-01-28 00:35:26.000000000 +0100
++++ squirrelmail-1.4.20/functions/global.php 2010-03-08 09:45:27.325832342 +0100
+@@ -609,3 +609,16 @@ function file_has_long_lines($filename,
return FALSE;
}
@@ -18,10 +18,10 @@ diff -up squirrelmail-1.4.20-RC2/functio
+{
+ return preg_match('/^[0-9]+$/', $value) ? $value : '0';
+}
-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
+diff -up squirrelmail-1.4.20/functions/imap_messages.php.biguid squirrelmail-1.4.20/functions/imap_messages.php
+--- squirrelmail-1.4.20/functions/imap_messages.php.biguid 2010-01-25 03:47:41.000000000 +0100
++++ squirrelmail-1.4.20/functions/imap_messages.php 2010-03-08 09:45:27.326828209 +0100
+@@ -1025,7 +1025,7 @@ function sqimap_get_message($imap_stream
global $uid_support;
// typecast to int to prohibit 1:* msgs sets
@@ -30,10 +30,10 @@ diff -up squirrelmail-1.4.20-RC2/functio
$flags = array();
$read = sqimap_run_command($imap_stream, "FETCH $id (FLAGS BODYSTRUCTURE)", true, $response, $message, $uid_support);
if ($read) {
-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)
+diff -up squirrelmail-1.4.20/plugins/delete_move_next/setup.php.biguid squirrelmail-1.4.20/plugins/delete_move_next/setup.php
+--- squirrelmail-1.4.20/plugins/delete_move_next/setup.php.biguid 2010-02-20 20:31:44.000000000 +0100
++++ squirrelmail-1.4.20/plugins/delete_move_next/setup.php 2010-03-08 15:51:22.927624535 +0100
+@@ -170,11 +170,11 @@ function delete_move_next_read($currloc)
$prev_if_del = $prev;
$next_if_del = $next;
if (!$uid_support && ($auto_expunge || $move_to_trash)) {
@@ -49,22 +49,25 @@ diff -up squirrelmail-1.4.20-RC2/plugins
}
}
-@@ -181,31 +181,31 @@ function delete_move_next_read($currloc)
+@@ -185,7 +185,7 @@ function delete_move_next_read($currloc)
'<tr>'.
"<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\"><small>";
- 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&smtoken=" . sm_generate_security_token() . "\">" . _("Delete & Prev") . "</a>" . " | \n";
- }
- else {
- echo _("Delete & Prev") . " | ";
+ 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>" . " | ";
+ if ($delete_move_next_show_unread == 'on') {
+ echo "<a href=\"read_body.php?passed_id=$prev_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&unread_id=$passed_id&smtoken=" . sm_generate_security_token() . "\">" . _("Unread & Prev") . "</a>" . " | ";
+@@ -197,7 +197,7 @@ function delete_move_next_read($currloc)
+ echo _("Unread & 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&smtoken=" . sm_generate_security_token() . "\">" . _("Delete & Next") . "</a>\n";
- } else {
- echo _("Delete & Next");
+ if ($delete_move_next_show_unread == 'on') {
+ echo "<a href=\"read_body.php?passed_id=$next_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&unread_id=$passed_id&smtoken=" . sm_generate_security_token() . "\">" . _("Unread & Next") . "</a> | ";
+ }
+@@ -210,18 +210,18 @@ function delete_move_next_read($currloc)
}
echo '</small></td></tr>';
@@ -86,9 +89,9 @@ diff -up squirrelmail-1.4.20-RC2/plugins
delete_move_next_moveNextForm($next_if_del);
} else {
delete_move_next_moveRightMainForm();
-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
+diff -up squirrelmail-1.4.20/src/compose.php.biguid squirrelmail-1.4.20/src/compose.php
+--- squirrelmail-1.4.20/src/compose.php.biguid 2010-02-16 21:17:13.000000000 +0100
++++ squirrelmail-1.4.20/src/compose.php 2010-03-08 09:45:27.368576639 +0100
@@ -95,7 +95,7 @@ sqgetGlobalVar('ent_num',$ent_num, $SQ_G
sqgetGlobalVar('saved_draft',$saved_draft, SQ_FORM);
@@ -98,9 +101,9 @@ diff -up squirrelmail-1.4.20-RC2/src/com
}
if ( sqgetGlobalVar('startMessage',$startMessage) ) {
-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
+diff -up squirrelmail-1.4.20/src/download.php.biguid squirrelmail-1.4.20/src/download.php
+--- squirrelmail-1.4.20/src/download.php.biguid 2010-01-25 03:47:41.000000000 +0100
++++ squirrelmail-1.4.20/src/download.php 2010-03-08 09:45:27.368576639 +0100
@@ -38,7 +38,7 @@ sqgetGlobalVar('mailbox', $mailbox,
sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
sqgetGlobalVar('absolute_dl',$absolute_dl, SQ_GET);
@@ -110,9 +113,9 @@ diff -up squirrelmail-1.4.20-RC2/src/dow
}
global $default_charset;
-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
+diff -up squirrelmail-1.4.20/src/image.php.biguid squirrelmail-1.4.20/src/image.php
+--- squirrelmail-1.4.20/src/image.php.biguid 2010-01-25 03:47:41.000000000 +0100
++++ squirrelmail-1.4.20/src/image.php 2010-03-08 09:45:27.369702769 +0100
@@ -32,7 +32,7 @@ displayPageHeader($color, 'None');
/* globals */
@@ -122,9 +125,9 @@ diff -up squirrelmail-1.4.20-RC2/src/ima
}
sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
-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
+diff -up squirrelmail-1.4.20/src/printer_friendly_main.php.biguid squirrelmail-1.4.20/src/printer_friendly_main.php
+--- squirrelmail-1.4.20/src/printer_friendly_main.php.biguid 2010-01-25 03:47:41.000000000 +0100
++++ squirrelmail-1.4.20/src/printer_friendly_main.php 2010-03-08 09:45:27.370701998 +0100
@@ -29,7 +29,7 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox
! sqgetGlobalVar('passed_id',$passed_id,SQ_GET)) {
error_box(_("Invalid URL"),$color);
@@ -134,10 +137,10 @@ diff -up squirrelmail-1.4.20-RC2/src/pri
$view_unsafe_images = (bool) $_GET['view_unsafe_images'];
/* end globals */
displayHtmlHeader( _("Printer Friendly"), '', false, true );
-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_
+diff -up squirrelmail-1.4.20/src/read_body.php.biguid squirrelmail-1.4.20/src/read_body.php
+--- squirrelmail-1.4.20/src/read_body.php.biguid 2010-02-14 00:06:30.000000000 +0100
++++ squirrelmail-1.4.20/src/read_body.php 2010-03-08 09:45:27.370701998 +0100
+@@ -759,7 +759,7 @@ sqgetGlobalVar('passed_ent_id', $passed_
sqgetGlobalVar('mailbox', $mailbox);
if ( sqgetGlobalVar('passed_id', $temp) ) {
@@ -146,9 +149,9 @@ diff -up squirrelmail-1.4.20-RC2/src/rea
}
if ( sqgetGlobalVar('sort', $temp) ) {
$sort = (int) $temp;
-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
+diff -up squirrelmail-1.4.20/src/view_header.php.biguid squirrelmail-1.4.20/src/view_header.php
+--- squirrelmail-1.4.20/src/view_header.php.biguid 2010-01-25 03:47:41.000000000 +0100
++++ squirrelmail-1.4.20/src/view_header.php 2010-03-08 09:45:27.417576628 +0100
@@ -120,7 +120,7 @@ function view_header($header, $mailbox,
/* get global vars */
Index: squirrelmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/F-12/squirrelmail.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- squirrelmail.spec 4 Jan 2010 17:35:41 -0000 1.79
+++ squirrelmail.spec 8 Mar 2010 15:47:40 -0000 1.80
@@ -3,18 +3,18 @@
%define contentdir /var/www
-Summary: SquirrelMail webmail client
+Summary: webmail client written in php
Name: squirrelmail
Version: 1.4.20
-Release: 0.rc2.20100104%{?dist}
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.squirrelmail.org/
Group: Applications/Internet
-Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}-RC2_20100104.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: squirrelmail.conf
Source2: squirrelmail-splash-fedora.png
Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.13-20071220.tar.bz2
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.18-20090526.tar.bz2
Source5: config_local.php
# bug #196017
@@ -26,15 +26,12 @@ Patch2: squirrelmail-1.4.6-japanese-mult
# bug #194457
Patch3: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
-# Taken from upstream - translation with this fix is not released yet
-Patch4: squirrelmail-1.4.15-tr-fix.patch
-
# bug #450780 - sent upstream, available here:
# http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
-Patch5: squirrelmail-1.4.17-biguid.patch
+Patch4: squirrelmail-1.4.17-biguid.patch
# bug #508631 - use hunspell instead of aspell
-Patch6: squirrelmail-1.4.19-hunspell.patch
+Patch5: squirrelmail-1.4.19-hunspell.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -45,24 +42,23 @@ Requires: /usr/sbin/sendmail
%description
SquirrelMail is a basic webmail package written in PHP4. It
includes built-in pure PHP support for the IMAP and SMTP protocols, and
-all pages render in pure HTML 4.0 (with no Javascript) for maximum
+all pages render in pure HTML 4.0 (with no JavaScript) for maximum
compatibility across browsers. It has very few requirements and is very
easy to configure and install.
%prep
-%setup -q -n squirrelmail-%{version}-RC2
+%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
mkdir locale_tempdir
pushd locale_tempdir
tar xfj %SOURCE4
-%patch4 -p2
popd
-%patch5 -p1
-%patch6 -p1
%build
rm -f plugins/make_archive.pl
@@ -236,7 +232,6 @@ sed -i 's/\r//' doc/release_notes_archiv
#remove unwanted files
rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/filters/bulkquery/bulkquery.c
-rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/es_ES/LC_MESSAGES/serversidefilter.po.new
rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/modules/.htaccess
%clean
@@ -269,6 +264,10 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/cron.daily/squirrelmail.cron
%changelog
+* Mon Mar 08 2010 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20-1
+- updated to 1.4.20
+- translations updated
+
* Thu Sep 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20-0.rc2.20100104
- updated to 1.4.20RC2 20100104 snapshot
- fix multi-word searching (#551626)
--- squirrelmail-1.4.15-tr-fix.patch DELETED ---
- Previous message: rpms/squirrelmail/F-13 .cvsignore, 1.30, 1.31 sources, 1.31, 1.32 squirrelmail-1.4.17-biguid.patch, 1.2, 1.3 squirrelmail.spec, 1.79, 1.80 squirrelmail-1.4.15-tr-fix.patch, 1.1, NONE
- Next message: rpms/squirrelmail/F-11 .cvsignore, 1.26, 1.27 sources, 1.27, 1.28 squirrelmail-1.4.17-biguid.patch, 1.2, 1.3 squirrelmail.spec, 1.71, 1.72 squirrelmail-1.4.15-tr-fix.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list