rpms/squirrelmail/devel squirrelmail-1.4.7-check-mail.ja.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 squirrelmail-1.4.6-japanese-multibyte-view-body.patch, 1.1, 1.2 squirrelmail-1.4.6-japanese-multibyte-view-text.patch, 1.1, 1.2 squirrelmail.spec, 1.37, 1.38 squirrelmail-1.4.6-CVE-2006-2842.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Jul 9 20:50:26 UTC 2006
- Previous message (by thread): rpms/cpufreq-utils/devel cpufreq-utils.spec,1.38,1.39
- Next message (by thread): rpms/kernel/devel patch-2.6.18-rc1-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.478, 1.479 kernel-2.6.spec, 1.2361, 1.2362 sources, 1.422, 1.423 upstream, 1.389, 1.390
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wtogami
Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7915
Modified Files:
.cvsignore sources
squirrelmail-1.4.6-japanese-multibyte-view-body.patch
squirrelmail-1.4.6-japanese-multibyte-view-text.patch
squirrelmail.spec
Added Files:
squirrelmail-1.4.7-check-mail.ja.patch
Removed Files:
squirrelmail-1.4.6-CVE-2006-2842.patch
Log Message:
- 1.4.7 with CVE-2006-3174
- Reduce patch for body text (#194457)
- Better JP translation for "Check mail" (#196117)
squirrelmail-1.4.7-check-mail.ja.patch:
squirrelmail.po | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE squirrelmail-1.4.7-check-mail.ja.patch ---
--- squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po.orig 2006-03-03 17:02:20.000000000 -0500
+++ squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po 2006-07-07 15:09:08.000000000 -0400
@@ -398,7 +398,7 @@
msgstr "Á°¥ê¥Õ¥ì¥Ã¥·¥å"
msgid "Check mail"
-msgstr "¥á¡¼¥ë¤ò¥Á¥§¥Ã¥¯¤¹¤ë"
+msgstr "¥ê¥Õ¥ì¥Ã¥·¥å"
msgid "Login"
msgstr "¥í¥°¥¤¥ó"
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 1 Mar 2006 10:16:46 -0000 1.14
+++ .cvsignore 9 Jul 2006 20:50:24 -0000 1.15
@@ -1,2 +1,2 @@
-all_locales-1.4.6-20060221.tar.bz2
-squirrelmail-1.4.6.tar.bz2
+squirrelmail-1.4.7.tar.bz2
+all_locales-1.4.7-20060702.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 1 Mar 2006 10:16:46 -0000 1.14
+++ sources 9 Jul 2006 20:50:24 -0000 1.15
@@ -1,2 +1,2 @@
-29dfec2e0f71fba368a89c36c51881c2 all_locales-1.4.6-20060221.tar.bz2
-300ddcf66b7907a61b6e9404840e35de squirrelmail-1.4.6.tar.bz2
+08301f14d71e4452e93f21b5e6747a4a squirrelmail-1.4.7.tar.bz2
+4b78f4612ef0a68e5a81a818a113497c all_locales-1.4.7-20060702.tar.bz2
squirrelmail-1.4.6-japanese-multibyte-view-body.patch:
mime.php | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
Index: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-body.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squirrelmail-1.4.6-japanese-multibyte-view-body.patch 23 Jun 2006 20:39:43 -0000 1.1
+++ squirrelmail-1.4.6-japanese-multibyte-view-body.patch 9 Jul 2006 20:50:24 -0000 1.2
@@ -1,53 +1,26 @@
-diff -urN squirrelmail-1.4.6.orig/functions/mime.php squirrelmail-1.4.6/functions/mime.php
---- squirrelmail-1.4.6.orig/functions/mime.php 2006-06-23 16:29:07.000000000 -0400
-+++ squirrelmail-1.4.6/functions/mime.php 2006-06-23 16:31:17.000000000 -0400
-@@ -243,12 +243,18 @@
- * Extracted from strings.php 23/03/2002
- */
-
--function translateText(&$body, $wrap_at, $charset) {
-+function translateText(&$body, $wrap_at, $charset, $transfer_encoding) {
- global $where, $what; /* from searching */
- global $color; /* color theme */
-+ global $default_charset;
-
- require_once(SM_PATH . 'functions/url_parser.php');
-
-+ if ($default_charset == 'iso-2022-jp' && $transfer_encoding == 'base64' ||
-+ $transfer_encoding == 'quoted-printable' || $transfer_encoding == 'quoted_printable'){
-+ $charset = $default_charset;
-+ }
-+
- $body_ary = explode("\n", $body);
- for ($i=0; $i < count($body_ary); $i++) {
- $line = $body_ary[$i];
-@@ -347,14 +353,26 @@
- $body = strip_tags($body);
- $body = trim($body);
- translateText($body, $wrap_at,
-- $body_message->header->getParameter('charset'));
-+ $body_message->header->getParameter('charset'),$body_message->header->encoding);
- } else {
- $body = magicHTML($body, $id, $message, $mailbox);
+diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
+--- squirrelmail-1.4.6.org/functions/mime.php 2006-06-29 08:23:58.000000000 +0900
++++ squirrelmail-1.4.6/functions/mime.php 2006-06-29 08:34:26.000000000 +0900
+@@ -353,8 +353,20 @@ function formatBody($imap_stream, $messa
$body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
}
} else {
- translateText($body, $wrap_at,
- $body_message->header->getParameter('charset'));
-+ if($squirrelmail_language != 'ja_JP'){
-+ translateText($body, $wrap_at,
-+ $body_message->header->getParameter('charset'),$body_message->header->encoding);
-+ } else {
-+ if($body_message->header->encoding == 'base64' ||
-+ $body_message->header->encoding == 'quoted-printable' ||
-+ $body_message->header->encoding == 'quoted_printable'){
-+ translateText($body, $wrap_at, $default_charset);
-+ } else {
-+ // it may never call here.
-+ translateText($body, $wrap_at,
-+ $body_message->header->getParameter('charset'));
-+ }
-+ }
++ if($squirrelmail_language != 'ja_JP'){
++ translateText($body, $wrap_at,
++ $body_message->header->getParameter('charset'));
++ } else {
++ if($body_message->header->encoding == 'base64' ||
++ $body_message->header->encoding == 'quoted-printable' ||
++ $body_message->header->encoding == 'quoted_printable'){
++ translateText($body, $wrap_at, $default_charset);
++ } else {
++ // it may never call here.
++ translateText($body, $wrap_at,
++ $body_message->header->getParameter('charset'));
++ }
++ }
}
// if this is the clean display (i.e. printer friendly), stop here.
squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
view_text.php | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletion(-)
Index: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-text.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squirrelmail-1.4.6-japanese-multibyte-view-text.patch 23 Jun 2006 20:39:43 -0000 1.1
+++ squirrelmail-1.4.6-japanese-multibyte-view-text.patch 9 Jul 2006 20:50:24 -0000 1.2
@@ -1,21 +1,22 @@
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195452
-squirrelmail view_text.php cannot handle handle multibyte characters in attachment
-viewing text of the attachment within squirrelmail itself.
-
---- src/view_text.php.org 2006-06-14 13:44:28.000000000 +0900
-+++ src/view_text.php 2006-06-14 13:44:47.000000000 +0900
-@@ -58,8 +58,13 @@ if ($passed_ent_id) {
- $header = $message_ent->header;
- $type0 = $header->type0;
- $type1 = $header->type1;
--$charset = $header->getParameter('charset');
- $encoding = strtolower($header->encoding);
-+if($squirrelmail_language == 'ja_JP' && $encoding == 'base64' ||
-+ $encoding == 'quoted-printable' || $encoding == 'quoted_printable'){
-+ $charset = $default_charset;
-+} else {
-+ $charset = $header->getParameter('charset');
-+}
+diff -ruNp squirrelmail-1.4.6.org/src/view_text.php squirrelmail-1.4.6/src/view_text.php
+--- squirrelmail-1.4.6.org/src/view_text.php 2006-02-04 07:27:55.000000000 +0900
++++ squirrelmail-1.4.6/src/view_text.php 2006-06-29 08:30:04.000000000 +0900
+@@ -81,7 +81,17 @@ if ($type1 == 'html' || (isset($override
+ if (! empty($charset))
+ $body = charset_decode($charset,$body,false,true);
+ } else {
+- translateText($body, $wrap_at, $charset);
++ if($squirrelmail_language != 'ja_JP'){
++ translateText($body, $wrap_at, $charset);
++ } else {
++ if($encoding == 'base64' || $encoding == 'quoted-printable' ||
++ $encoding == 'quoted_printable'){
++ translateText($body, $wrap_at, $default_charset);
++ } else {
++ // it may never call here.
++ translateText($body, $wrap_at, $charset);
++ }
++ }
+ }
- $msg_url = 'read_body.php?' . $QUERY_STRING;
- $msg_url = set_url_var($msg_url, 'ent_id', 0);
+ displayPageHeader($color, 'None');
Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- squirrelmail.spec 23 Jun 2006 20:39:43 -0000 1.37
+++ squirrelmail.spec 9 Jul 2006 20:50:24 -0000 1.38
@@ -5,8 +5,8 @@
Summary: SquirrelMail webmail client
Name: squirrelmail
-Version: 1.4.6
-Release: 8.fc6
+Version: 1.4.7
+Release: 1.fc6
License: GPL
URL: http://www.squirrelmail.org/
Group: Applications/Internet
@@ -15,12 +15,12 @@
Source1: squirrelmail.conf
Source2: squirrelmail-splash-fedora.png
Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
-Patch0: squirrelmail-1.4.6-CVE-2006-2842.patch
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
Patch1: squirrelmail-1.4.6-zenkaku-subject-convert.patch
Patch2: squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
Patch3: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
Patch4: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+Patch5: squirrelmail-1.4.7-check-mail.ja.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
@@ -39,17 +39,16 @@
address books, and folder manipulation.
%prep
-#%setup -q
%setup -q -n squirrelmail-%{version}
-%patch0 -p1
%patch1 -p1
%patch2 -p0
-%patch3 -p0
+%patch3 -p1
%patch4 -p1
mkdir locale_tempdir
cd locale_tempdir
tar xfj %SOURCE4
+%patch5 -p2
%build
rm -f plugins/make_archive.pl
@@ -243,6 +242,11 @@
%{_sysconfdir}/cron.daily/squirrelmail.cron
%changelog
+* Fri Jul 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-9
+- 1.4.7 with CVE-2006-3174
+- Reduce patch for body text (#194457)
+- Better JP translation for "Check mail" (#196117)
+
* Fri Jun 23 2006 Warren Togami <wtogami at redhat.com> 1.4.6-8
- Japanese zenkaku subject conversion (#196017)
- Japanese MSIE garbled download ugly hack (#195639)
--- squirrelmail-1.4.6-CVE-2006-2842.patch DELETED ---
- Previous message (by thread): rpms/cpufreq-utils/devel cpufreq-utils.spec,1.38,1.39
- Next message (by thread): rpms/kernel/devel patch-2.6.18-rc1-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.478, 1.479 kernel-2.6.spec, 1.2361, 1.2362 sources, 1.422, 1.423 upstream, 1.389, 1.390
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list