[pkgsrc/pkgsrc-2003Q4]: pkgsrc/mail/metamail Pullup further security fix to t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/425acdbae963
branches:  pkgsrc-2003Q4
changeset: 463742:425acdbae963
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Mar 05 16:25:45 2004 +0000

description:
Pullup further security fix to the pkgsrc-2003Q4 branch, requested by
Soren Jacobsen.

        Module Name:    pkgsrc
        Committed By:   snj
        Date:           Sat Feb 28 20:04:40 UTC 2004

        Modified Files:
                pkgsrc/mail/metamail: Makefile distinfo
                pkgsrc/mail/metamail/patches: patch-ae

        Log Message:
        Properly fix last.  From Christian Weisgerber.

diffstat:

 mail/metamail/Makefile         |   4 ++--
 mail/metamail/distinfo         |   4 ++--
 mail/metamail/patches/patch-ae |  35 ++++++++++++++++++++++++++++-------
 3 files changed, 32 insertions(+), 11 deletions(-)

diffs (85 lines):

diff -r 02aaa07ea530 -r 425acdbae963 mail/metamail/Makefile
--- a/mail/metamail/Makefile    Thu Feb 26 16:22:03 2004 +0000
+++ b/mail/metamail/Makefile    Fri Mar 05 16:25:45 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22.2.1 2004/02/26 16:22:03 agc Exp $
+# $NetBSD: Makefile,v 1.22.2.2 2004/03/05 16:25:45 agc Exp $
 
 DISTNAME=      mm2.7
 PKGNAME=       metamail-2.7
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    mail
 MASTER_SITES=  ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=  .tar.Z
diff -r 02aaa07ea530 -r 425acdbae963 mail/metamail/distinfo
--- a/mail/metamail/distinfo    Thu Feb 26 16:22:03 2004 +0000
+++ b/mail/metamail/distinfo    Fri Mar 05 16:25:45 2004 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6.2.1 2004/02/26 16:22:03 agc Exp $
+$NetBSD: distinfo,v 1.6.2.2 2004/03/05 16:25:45 agc Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 Size (mm2.7.tar.Z) = 262881 bytes
 SHA1 (patch-aa) = 5b03f920e11554af5f776ff352c85c06e2f8f8de
 SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
 SHA1 (patch-ad) = f5b8a3e04da86fb875ffe34b3f4cba5c7b4e4d94
-SHA1 (patch-ae) = 15bd1530e763c8c6371a0fa8dff45cdd39916295
+SHA1 (patch-ae) = 27f4d45d73ac00a3febf221e19929bcad47225fd
 SHA1 (patch-af) = 9ba42f1eef27d452debb9c1e0abc800f19deccac
 SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8
 SHA1 (patch-ah) = 0be03011df91c66f12836ce64eb37983f129e4c5
diff -r 02aaa07ea530 -r 425acdbae963 mail/metamail/patches/patch-ae
--- a/mail/metamail/patches/patch-ae    Thu Feb 26 16:22:03 2004 +0000
+++ b/mail/metamail/patches/patch-ae    Fri Mar 05 16:25:45 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2.10.1 2004/02/26 16:22:03 agc Exp $
+$NetBSD: patch-ae,v 1.2.10.2 2004/03/05 16:25:45 agc Exp $
 
---- metamail/splitmail.c.orig  1994-01-31 14:23:14.000000000 -0800
-+++ metamail/splitmail.c       2004-02-24 10:49:02.000000000 -0800
-@@ -41,8 +41,8 @@ extern char *malloc(), *index(), *getmyn
+--- metamail/splitmail.c.orig  Mon Jan 31 23:23:14 1994
++++ metamail/splitmail.c       Sat Feb 28 20:08:44 2004
+@@ -41,8 +41,8 @@
  #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
  #else
  extern char *getenv();
@@ -13,13 +13,34 @@
  #endif
  
  usageexit() {
-@@ -361,7 +361,8 @@ char **OrigID;
+@@ -194,7 +194,7 @@
+       s = endofheader(from);  /* would be index(from, '\n'),
+                                but need to check for continuation lines */
+         *s = '\0';
+-      if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
++      if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) {
+           strcat(SharedHeaders, from);
+           strcat(SharedHeaders, "\n");
+       }
+@@ -339,9 +339,10 @@
+     NULL
+ };
+ 
+-ShareThisHeader(s, SubjectBuf, OrigID)
++ShareThisHeader(s, SubjectBuf, size, OrigID)
+ char *s;
+ char *SubjectBuf;
++size_t size;
+ char **OrigID;
+ {
+     int i;
+@@ -361,7 +362,8 @@
      }
      if (!ULstrcmp(s, "subject")) {
          *colon = ':';
 -        strcpy(SubjectBuf, ++colon);
-+        strncpy(SubjectBuf, ++colon, sizeof(SubjectBuf));
-+      SubjectBuf[sizeof(SubjectBuf) - 1] = '\0';
++        strncpy(SubjectBuf, ++colon, size);
++      SubjectBuf[size - 1] = '\0';
          return(0);
      }
      if (!ULstrcmp(s, "content-type")) {