diff options
| author | Thomas Abthorpe <tabthorpe@FreeBSD.org> | 2010-08-04 20:37:13 +0000 |
|---|---|---|
| committer | Thomas Abthorpe <tabthorpe@FreeBSD.org> | 2010-08-04 20:37:13 +0000 |
| commit | 235006770ee3cb59c022de038dbca00f8166f369 (patch) | |
| tree | 05a98510d311f20cce807a5dd1ee3d9906c1dac9 /mail/squirrelmail | |
| parent | e2a6768576f5da489737ea0b8b19b497057e71c5 (diff) | |
| download | ports-235006770ee3cb59c022de038dbca00f8166f369.tar.gz ports-235006770ee3cb59c022de038dbca00f8166f369.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=258791
Diffstat (limited to 'mail/squirrelmail')
| -rw-r--r-- | mail/squirrelmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/squirrelmail/distinfo | 6 | ||||
| -rw-r--r-- | mail/squirrelmail/files/patch-class__deliver__Deliver.class.php | 12 | ||||
| -rw-r--r-- | mail/squirrelmail/pkg-plist | 1 |
4 files changed, 11 insertions, 11 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 2d9dd10616aa..df39478751f9 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -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 diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo index 75f54f0184ba..01b1a3d184ba 100644 --- a/mail/squirrelmail/distinfo +++ b/mail/squirrelmail/distinfo @@ -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 diff --git a/mail/squirrelmail/files/patch-class__deliver__Deliver.class.php b/mail/squirrelmail/files/patch-class__deliver__Deliver.class.php index 89197b169272..ce770b02064c 100644 --- a/mail/squirrelmail/files/patch-class__deliver__Deliver.class.php +++ b/mail/squirrelmail/files/patch-class__deliver__Deliver.class.php @@ -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. ++ 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; diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist index 2d5481d1d934..dfce38abe396 100644 --- a/mail/squirrelmail/pkg-plist +++ b/mail/squirrelmail/pkg-plist @@ -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 |