Bug 133652
| Summary: | [Patch] squirrelmail-1.4.17: non-ascii text handling for "Subject:" field and attached filenames. | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | dohzono | ||||||
| Component: | Individual Port(s) | Assignee: | Thomas Abthorpe <tabthorpe> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | ||||||||
| Priority: | Normal | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
dohzono
2009-04-12 10:40:04 UTC
Responsible Changed From-To: freebsd-ports-bugs->tabthorpe I'll take it. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi The patch provided does not apply cleanly, can you please recreate and resbumit it? Thanks. Thomas - -- Thomas Abthorpe | FreeBSD Committer tabthorpe@FreeBSD.org | http://people.freebsd.org/~tabthorpe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEARECAAYFAknz2HoACgkQ5Gm/jNBp8qAWHgCfevhOMEVO8zWeG4vvUgsw9wCB E9gAn30cYGBLHKR1MhacIhVRGSVtFeeH =QVNf -----END PGP SIGNATURE----- State Changed From-To: open->feedback Ask for submitter fix. > The patch provided does not apply cleanly, can you please recreate and
> resbumit it?
Hmmm... It may be not so hard to apply patch manually, but I'll
recreate them, anyway.
# assume that squirrelmail is installed into /usr/local/www/squirrelmail/.
$ export WRKDIRPREFIX=/usr/local/tmp/
$ cd /usr/ports/mail/squirrelmail/
$ make configure
$ cd /usr/local/tmp/usr/ports/mail/squirrelmail/work/squirrelmail-1.4.17/
$ for d in ./class ./functions; do for f in `find $d -type f`; do diff
-cb $f /usr/local/www/squirrelmail/$f; done; done
*** ./class/deliver/Deliver.class.php Mon Apr 28 11:18:58 2008
--- /usr/local/www/squirrelmail/./class/deliver/Deliver.class.php
Tue Apr 14
11:23:12 2009
***************
*** 488,494 ****
--- 488,499 ----
$cnt = count($header);
$hdr_s = '';
for ($i = 0 ; $i < $cnt ; $i++) {
+ // do not fold a line if it contains some name field.
e.g. 'filename',
'name'
+ if (strstr($header[$i], 'name') === false) {
$hdr_s .= $this->foldLine($header[$i], 78,str_pad('',4));
+ } else {
+ $hdr_s .= $header[$i];
+ }
}
$header = $hdr_s;
$header .= $rn; /* One blank line to separate mimeheader and
body-entity */
***************
*** 719,724 ****
--- 724,730 ----
case 'Cc':
case 'Bcc':
case 'From':
+ case 'Subject':
$hdr_s .= $header[$i];
break;
default: $hdr_s .= $this->foldLine($header[$i], 78,
str_pad('',4));
break;
*** ./functions/i18n.php Tue Oct 28 08:11:38 2008
--- /usr/local/www/squirrelmail/./functions/i18n.php Tue Apr 14
11:24:21 2009
***************
*** 638,644 ****
$useragent = func_get_arg(2);
if (strstr($useragent, 'Windows') !== false ||
strstr($useragent, 'Mac_') !== false) {
! $ret = mb_convert_encoding($ret, 'SJIS', 'AUTO');
} else {
$ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
}
--- 638,644 ----
$useragent = func_get_arg(2);
if (strstr($useragent, 'Windows') !== false ||
strstr($useragent, 'Mac_') !== false) {
! $ret = mb_convert_encoding($ret, 'UTF-8', 'AUTO');
} else {
$ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
}
State Changed From-To: feedback->open Feedback received tabthorpe 2009-05-20 16:21:01 UTC
FreeBSD ports repository
Modified files:
mail/squirrelmail Makefile distinfo pkg-plist
Added files:
mail/squirrelmail/files
patch-class__deliver__Deliver.class.php
patch-functions__i18n.php
Log:
- Update to 1.4.18
- Fix Subject/filename/non-ascii filename issue [1]
PR: ports/133652 [1]
Submitted by: Kazuo Dohzono <dohzono gmail.com> [1]
Security: CVE-2009-1581 CVE-2009-1578 CVE-2009-1579 CVE-2009-1580
Revision Changes Path
1.55 +9 -7 ports/mail/squirrelmail/Makefile
1.27 +3 -3 ports/mail/squirrelmail/distinfo
1.1 +31 -0 ports/mail/squirrelmail/files/patch-class__deliver__Deliver.class.php (new)
1.1 +12 -0 ports/mail/squirrelmail/files/patch-functions__i18n.php (new)
1.27 +38 -31 ports/mail/squirrelmail/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks! |
