- Update to 1.4.21

PR:		ports/149063 (based on)
Submitted by:	Daniel Bond <db nsn.no>
Security:	CVE-2010-1637 and CVE-2010-2813
This commit is contained in:
Thomas Abthorpe 2010-08-04 20:37:13 +00:00
parent e2a6768576
commit 235006770e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=258791
4 changed files with 11 additions and 11 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= squirrelmail
PORTVERSION= 1.4.20
PORTREVISION= 2
PORTVERSION= 1.4.21
CATEGORIES= mail www
MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION:S/.r/-RC/}:squirrelmail \
SF/${PORTNAME}/locales/1.4.18-20090526:locales

View file

@ -1,6 +1,6 @@
MD5 (squirrelmail/squirrelmail-1.4.20.tar.bz2) = 76aa7963e67edc7cea2be919f51ded72
SHA256 (squirrelmail/squirrelmail-1.4.20.tar.bz2) = dacb14b64a3452819fead63907ee06ddf8c205a0b9f3dc9ac52a98f670f57c75
SIZE (squirrelmail/squirrelmail-1.4.20.tar.bz2) = 521070
MD5 (squirrelmail/squirrelmail-1.4.21.tar.bz2) = 44d2fe85d6fc3092bf4f11e6e928f9dc
SHA256 (squirrelmail/squirrelmail-1.4.21.tar.bz2) = 09f3a6c6e80f28a8a97a19d6653e0a52e4ca2a1dc2a692c1e7013f0ad218cc38
SIZE (squirrelmail/squirrelmail-1.4.21.tar.bz2) = 526813
MD5 (squirrelmail/all_locales-1.4.18-20090526.tar.bz2) = ddb51e99e87b2aa8180cebe07de89fa2
SHA256 (squirrelmail/all_locales-1.4.18-20090526.tar.bz2) = b9198127084407950ad6158e030c76fdf9be5fd0d0abd69c606fb7757ae246c6
SIZE (squirrelmail/all_locales-1.4.18-20090526.tar.bz2) = 3898341

View file

@ -1,10 +1,10 @@
--- ./class/deliver/Deliver.class.php.orig 2009-04-15 18:00:49.000000000 -0400
+++ ./class/deliver/Deliver.class.php 2009-05-21 01:18:26.000000000 -0400
--- ./class/deliver/Deliver.class.php.orig 2010-08-03 16:33:49.000000000 -0400
+++ ./class/deliver/Deliver.class.php 2010-08-03 16:35:25.000000000 -0400
@@ -542,7 +542,19 @@
$cnt = count($header);
$hdr_s = '';
for ($i = 0 ; $i < $cnt ; $i++) {
- $hdr_s .= $this->foldLine($header[$i], 78);
- $hdr_s .= $this->foldLine($header[$i]);
+ /*
+ * FIXME: Leave some name fields (filename, username) as they
+ * are, for now. If you want to fold these fields,
@ -21,11 +21,11 @@
}
$header = $hdr_s;
$header .= $rn; /* One blank line to separate mimeheader and body-entity */
@@ -773,6 +785,7 @@
@@ -778,6 +790,7 @@
case 'Cc':
case 'Bcc':
case 'From':
+ case 'Subject': // Prevent from base64-folding corruption.
$hdr_s .= $header[$i];
break;
default: $hdr_s .= $this->foldLine($header[$i], 78); break;
default: $hdr_s .= $this->foldLine($header[$i]); break;

View file

@ -1756,6 +1756,7 @@ etc/periodic/daily/111.clean-squirrelmail
%%SQUIRRELDIR%%/plugins/listcommands/mailout.php
%%SQUIRRELDIR%%/plugins/listcommands/setup.php
%%SQUIRRELDIR%%/plugins/mail_fetch/class.POP3.php
%%SQUIRRELDIR%%/plugins/mail_fetch/config_example.php
%%SQUIRRELDIR%%/plugins/mail_fetch/fetch.php
%%SQUIRRELDIR%%/plugins/mail_fetch/functions.php
%%SQUIRRELDIR%%/plugins/mail_fetch/index.php