[pkgsrc/trunk]: pkgsrc/mail/mini_sendmail Handle continuation lines. Fixes pk...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/284494d55919
branches:  trunk
changeset: 495651:284494d55919
user:      is <is%pkgsrc.org@localhost>
date:      Thu Jun 16 15:38:18 2005 +0000

description:
Handle continuation lines. Fixes pkg/30534.

diffstat:

 mail/mini_sendmail/Makefile         |   4 +-
 mail/mini_sendmail/distinfo         |   6 +-
 mail/mini_sendmail/patches/patch-aa |  62 +++++++++++++++++++++++++++++++++++-
 mail/mini_sendmail/patches/patch-ad |   4 +-
 4 files changed, 66 insertions(+), 10 deletions(-)

diffs (124 lines):

diff -r 6d464b6f1eb4 -r 284494d55919 mail/mini_sendmail/Makefile
--- a/mail/mini_sendmail/Makefile       Thu Jun 16 15:19:53 2005 +0000
+++ b/mail/mini_sendmail/Makefile       Thu Jun 16 15:38:18 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/10/07 08:45:14 is Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 15:38:18 is Exp $
 #
 
 PKGNAME=       mini_sendmail-1.3.2
-PKGREVISION=   4
+PKGREVISION=   5
 
 BUILD_DEFS+=   USE_INET6
 
diff -r 6d464b6f1eb4 -r 284494d55919 mail/mini_sendmail/distinfo
--- a/mail/mini_sendmail/distinfo       Thu Jun 16 15:19:53 2005 +0000
+++ b/mail/mini_sendmail/distinfo       Thu Jun 16 15:38:18 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/06/16 15:38:18 is Exp $
 
 SHA1 (mini_sendmail-1.3.2.tar.gz) = 1e297ae27135f0f83f09c7be8a911ebfd9e2f966
 RMD160 (mini_sendmail-1.3.2.tar.gz) = 9b172cde3d190c3db82b467faf1ecae5ede0ee2d
 Size (mini_sendmail-1.3.2.tar.gz) = 7329 bytes
-SHA1 (patch-aa) = 0a58aa3ca8b3afef3ae6a68386b99020829777c9
+SHA1 (patch-aa) = b76b9e3f50cc9f83555b20f284c8d1b158cfac70
 SHA1 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
 SHA1 (patch-ac) = 3c10e603993c61f2a518ceb9f130460087c69081
-SHA1 (patch-ad) = d7c79697612745f7fa6abc163b610ccad232ff9c
+SHA1 (patch-ad) = b66945faf31c0e96d8bb2accb12de8578a1483b3
diff -r 6d464b6f1eb4 -r 284494d55919 mail/mini_sendmail/patches/patch-aa
--- a/mail/mini_sendmail/patches/patch-aa       Thu Jun 16 15:19:53 2005 +0000
+++ b/mail/mini_sendmail/patches/patch-aa       Thu Jun 16 15:38:18 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2003/10/07 08:45:14 is Exp $
+$NetBSD: patch-aa,v 1.5 2005/06/16 15:38:18 is Exp $
 
---- mini_sendmail.c.orig       Thu Nov 21 21:27:55 2002
+--- mini_sendmail.c.orig       2002-11-21 20:27:55.000000000 +0000
 +++ mini_sendmail.c
 @@ -129,6 +129,10 @@ main( int argc, char** argv )
            timeout = atoi( &(argv[argn][2]) );
@@ -13,7 +13,63 @@
        else
            usage();
        ++argn;
-@@ -575,14 +579,16 @@ open_client_socket( void )
+@@ -490,14 +494,24 @@ parse_for_recipients( char* message )
+           switch ( *cp )
+               {
+               case '\n':
+-              add_recipient( recip, ( cp - recip ) );
+-              state = ST_BOL;
+-              if ( bcc != (char*) 0 )
++              /* peek ahead for continuation line */
++              switch (cp[1])
+                   {
+-                  /* Elide the Bcc: line, and reset cp. */
+-                  (void) strcpy( bcc, cp + 1 );
+-                  cp = bcc - 1;
+-                  bcc = (char*) 0;
++                  case ' ':
++                  case '\t':
++                  break;
++
++                  default:
++                  add_recipient( recip, ( cp - recip ) );
++                  state = ST_BOL;
++                  if ( bcc != (char*) 0 )
++                      {
++                      /* Elide the Bcc: line, and reset cp. */
++                      (void) strcpy( bcc, cp + 1 );
++                      cp = bcc - 1;
++                      bcc = (char*) 0;
++                      }
++                  break;
+                   }
+               break;
+               case ',':
+@@ -516,15 +530,22 @@ add_recipient( char* recipient, int len 
+     {
+     char buf[1000];
+     int status;
++    int i;
+ 
+     /* Skip leading whitespace. */
+-    while ( len > 0 && ( *recipient == ' ' || *recipient == '\t' ) )
++    while ( len > 0 && ( *recipient == ' ' || *recipient == '\t' ||
++          *recipient == '\n') )
+       {
+       ++recipient;
+       --len;
+       }
+ 
+     (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient );
++    for (i=0; i<sizeof(buf); i++)
++    {
++      if (buf[i] == '\n')
++          buf[i] = ' ';
++    }
+     send_command( buf );
+     status = read_response();
+     if ( status != 250  && status != 251 )
+@@ -575,14 +596,16 @@ open_client_socket( void )
      sock_family = PF_INET6;
  
  #ifdef DO_MINUS_S
diff -r 6d464b6f1eb4 -r 284494d55919 mail/mini_sendmail/patches/patch-ad
--- a/mail/mini_sendmail/patches/patch-ad       Thu Jun 16 15:19:53 2005 +0000
+++ b/mail/mini_sendmail/patches/patch-ad       Thu Jun 16 15:38:18 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2003/10/07 08:45:14 is Exp $
+$NetBSD: patch-ad,v 1.4 2005/06/16 15:38:18 is Exp $
 
 --- version.h.orig     Thu Nov 21 21:19:50 2002
 +++ version.h
@@ -7,6 +7,6 @@
  #define _VERSION_H_
  
 -#define VERSION "mini_sendmail/1.3.2 21nov2002"
-+#define VERSION "mini_sendmail/1.3.2 21nov2002 nb4 7oct2003"
++#define VERSION "mini_sendmail/1.3.2 21nov2002 nb5 16jun2005"
  
  #endif /* _VERSION_H_ */