[pkgsrc/trunk]: pkgsrc/mail/evolution14 as with 2.0.3:

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3899559e46de
branches:  trunk
changeset: 488218:3899559e46de
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Jan 25 19:08:55 2005 +0000

description:
as with 2.0.3:
> apply a patch from evution CVS:
> 2005-01-20  Not Zed  <NotZed%Ximian.com@localhost>
> * camel-lock-helper.c (main): since malloc(MAXINT+1) returns a
>   valid pointer, validate the length of the path before using it.
>   set maximum path to 65000 characters.  Spotted by Max Vozeler
>     <max%hinterhof.net@localhost>
>
> This fixes the security vulnerability refered to as CAN-2005-0102.
> bump PKGREVISION

diffstat:

 mail/evolution14/Makefile         |   4 ++--
 mail/evolution14/distinfo         |   3 ++-
 mail/evolution14/patches/patch-ak |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 330c83d103fd -r 3899559e46de mail/evolution14/Makefile
--- a/mail/evolution14/Makefile Tue Jan 25 18:58:31 2005 +0000
+++ b/mail/evolution14/Makefile Tue Jan 25 19:08:55 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/10/15 00:32:36 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/25 19:08:55 drochner Exp $
 
 DISTNAME=              evolution-1.4.6
 PKGNAME=               ${DISTNAME:S/evolution/evolution14/}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            mail time gnome
 MASTER_SITES=          ftp://ftp.ximian.com/pub/source/evolution/ \
                        ${MASTER_SITE_GNOME:=sources/evolution/1.4/}
diff -r 330c83d103fd -r 3899559e46de mail/evolution14/distinfo
--- a/mail/evolution14/distinfo Tue Jan 25 18:58:31 2005 +0000
+++ b/mail/evolution14/distinfo Tue Jan 25 19:08:55 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/09/21 17:17:43 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2005/01/25 19:08:55 drochner Exp $
 
 SHA1 (evolution-1.4.6.tar.bz2) = 35d7273762b1f17fb8ad845af593a1ee07f94115
 Size (evolution-1.4.6.tar.bz2) = 13927597 bytes
@@ -11,3 +11,4 @@
 SHA1 (patch-ah) = a4b15e3405e4f6a432392a30bf489abd4e94a181
 SHA1 (patch-ai) = 0f49dc487d5cc697521bb59a45e9c8e2eda10491
 SHA1 (patch-aj) = 9b098568fd94c0597a216b8b9cf89eaef3307a4b
+SHA1 (patch-ak) = faeb4e0b3943ed8aeb2bc91e1d7cac8722918b4d
diff -r 330c83d103fd -r 3899559e46de mail/evolution14/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/evolution14/patches/patch-ak Tue Jan 25 19:08:55 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2005/01/25 19:08:55 drochner Exp $
+
+--- camel/camel-lock-helper.c.orig     2001-10-27 18:59:27.000000000 +0200
++++ camel/camel-lock-helper.c
+@@ -360,8 +360,9 @@ int main(int argc, char **argv)
+                       switch(msg.id) {
+                       case CAMEL_LOCK_HELPER_LOCK:
+                               res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
+-                              path = malloc(msg.data+1);
+-                              if (path != NULL) {
++                              if (msg.data > 0xffff) {
++                                      res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
++                              } else if ((path = malloc(msg.data+1)) != NULL) {
+                                       res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
+                                       len = read_n(STDIN_FILENO, path, msg.data);
+                                       if (len == msg.data) {