[pkgsrc/trunk]: pkgsrc/mail/mini_sendmail Fix an off by one error in the addr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb6a073104bd
branches:  trunk
changeset: 522040:fb6a073104bd
user:      martin <martin%pkgsrc.org@localhost>
date:      Fri Dec 01 10:40:48 2006 +0000

description:
Fix an off by one error in the address parser, introduced by our patch.
Found by Ond?ej T?ma (sorry for the missing chars) and analyzed by
Lasse Hillerøe Petersen.

diffstat:

 mail/mini_sendmail/Makefile         |   4 ++--
 mail/mini_sendmail/distinfo         |   4 ++--
 mail/mini_sendmail/patches/patch-aa |  13 +++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diffs (79 lines):

diff -r fe1c4e8eb154 -r fb6a073104bd mail/mini_sendmail/Makefile
--- a/mail/mini_sendmail/Makefile       Fri Dec 01 09:30:58 2006 +0000
+++ b/mail/mini_sendmail/Makefile       Fri Dec 01 10:40:48 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/06/29 22:01:19 is Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/01 10:40:48 martin Exp $
 #
 
 PKGNAME=       mini_sendmail-1.3.6
-PKGREVISION=   1
+PKGREVISION=   2
 
 BUILD_DEFS+=   USE_INET6
 
diff -r fe1c4e8eb154 -r fb6a073104bd mail/mini_sendmail/distinfo
--- a/mail/mini_sendmail/distinfo       Fri Dec 01 09:30:58 2006 +0000
+++ b/mail/mini_sendmail/distinfo       Fri Dec 01 10:40:48 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/06/15 20:52:05 martin Exp $
+$NetBSD: distinfo,v 1.10 2006/12/01 10:40:48 martin Exp $
 
 SHA1 (mini_sendmail-1.3.6.tar.gz) = e8d18419ffa5075ce0b3f49a52bd5e1a38beeb02
 RMD160 (mini_sendmail-1.3.6.tar.gz) = 87fc1133c5976ae6e85730d3600149f69c7cab55
 Size (mini_sendmail-1.3.6.tar.gz) = 7579 bytes
-SHA1 (patch-aa) = ac860c3eebb04549b1998b98d7ea6c761f83ad3d
+SHA1 (patch-aa) = 82eccc80d1cde777ed49d965e1c9b3df05e8cc22
 SHA1 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
 SHA1 (patch-ac) = b14f2687f3186e198af03b2662b81726c7321558
 SHA1 (patch-ad) = 35319baaf3eac9dd931170ed4e6d638a19fff8b5
diff -r fe1c4e8eb154 -r fb6a073104bd mail/mini_sendmail/patches/patch-aa
--- a/mail/mini_sendmail/patches/patch-aa       Fri Dec 01 09:30:58 2006 +0000
+++ b/mail/mini_sendmail/patches/patch-aa       Fri Dec 01 10:40:48 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2006/06/15 20:52:05 martin Exp $
+$NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
 
 --- mini_sendmail.c.orig       2005-06-29 19:37:15.000000000 +0200
-+++ mini_sendmail.c    2006-06-15 22:42:04.000000000 +0200
++++ mini_sendmail.c    2006-12-01 11:35:27.000000000 +0100
 @@ -66,8 +66,13 @@ static char* argv0;
  static char* fake_from;
  static int parse_message, verbose;
@@ -123,7 +123,7 @@
                    }
                break;
                case ',':
-@@ -532,25 +568,46 @@ static void
+@@ -532,25 +568,43 @@ static void
  add_recipient( char* recipient, int len )
      {
      char buf[1000];
@@ -163,9 +163,6 @@
 +      while (len > 2 && recipient[--len] != '>')
 +          ; /* nothing */
 +
-+      if (recipient[len] == '>')
-+          --len;
-+
 +      }
  
      (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient );
@@ -177,7 +174,7 @@
      send_command( buf );
      status = read_response();
      if ( status != 250  && status != 251 )
-@@ -569,7 +626,7 @@ add_recipient( char* recipient, int len 
+@@ -569,7 +623,7 @@ add_recipient( char* recipient, int len 
  #endif
  
  static int
@@ -186,7 +183,7 @@
      {
  #ifdef USE_IPV6
      struct sockaddr_in6 sa;
-@@ -744,10 +801,10 @@ open_client_socket( void )
+@@ -744,10 +798,10 @@ open_client_socket( void )
  
      sockfd = socket( sock_family, sock_type, sock_protocol );
      if ( sockfd < 0 )