diff options
| author | martin <martin@pkgsrc.org> | 2006-12-01 10:40:48 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2006-12-01 10:40:48 +0000 |
| commit | a98d548a9ba29835dde9605809e03994ccf83ef3 (patch) | |
| tree | 8620fd5d9c26c9f87d4d5837853d66c5dbfe8d90 /mail/mini_sendmail | |
| parent | 05a8cb163bd01e71b4d90dd10a2103c0a35ca25a (diff) | |
| download | pkgsrc-a98d548a9ba29835dde9605809e03994ccf83ef3.tar.gz | |
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 (limited to 'mail/mini_sendmail')
| -rw-r--r-- | mail/mini_sendmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/mini_sendmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/mini_sendmail/patches/patch-aa | 13 |
3 files changed, 9 insertions, 12 deletions
diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile index a00fcf318bc..c67949b44a3 100644 --- a/mail/mini_sendmail/Makefile +++ b/mail/mini_sendmail/Makefile @@ -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 --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo index 735ce3cd515..0ba4088eae6 100644 --- a/mail/mini_sendmail/distinfo +++ b/mail/mini_sendmail/distinfo @@ -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 --git a/mail/mini_sendmail/patches/patch-aa b/mail/mini_sendmail/patches/patch-aa index f8d80f13519..dfd3bd6461c 100644 --- a/mail/mini_sendmail/patches/patch-aa +++ b/mail/mini_sendmail/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.8 2006/06/15 20:52:05 martin Exp $ } 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 @@ $NetBSD: patch-aa,v 1.8 2006/06/15 20:52:05 martin Exp $ + while (len > 2 && recipient[--len] != '>') + ; /* nothing */ + -+ if (recipient[len] == '>') -+ --len; -+ + } (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); @@ -177,7 +174,7 @@ $NetBSD: patch-aa,v 1.8 2006/06/15 20:52:05 martin Exp $ 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 @@ $NetBSD: patch-aa,v 1.8 2006/06/15 20:52:05 martin Exp $ { #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 ) |