Upgrade to 1.3.6nb1.

5 files changed, 21 insertions, 24 deletions

diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
index 1ee3e0e8d12..a00fcf318bc 100644
--- a/mail/mini_sendmail/Makefile
+++ b/mail/mini_sendmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/06/26 19:51:47 is Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/29 22:01:19 is Exp $
 #
 
-PKGNAME=	mini_sendmail-1.3.5
+PKGNAME=	mini_sendmail-1.3.6
 PKGREVISION=	1
 
 BUILD_DEFS+=	USE_INET6
diff --git a/mail/mini_sendmail/Makefile.common b/mail/mini_sendmail/Makefile.common
index afc0343765b..444aefd8fa4 100644
--- a/mail/mini_sendmail/Makefile.common
+++ b/mail/mini_sendmail/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.11 2005/06/26 19:51:47 is Exp $
+# $NetBSD: Makefile.common,v 1.12 2005/06/29 22:01:19 is Exp $
 #
 
-DISTNAME=	mini_sendmail-1.3.5
+DISTNAME=	mini_sendmail-1.3.6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.acme.com/software/mini_sendmail/
 
diff --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo
index a526f825afb..35e7437739a 100644
--- a/mail/mini_sendmail/distinfo
+++ b/mail/mini_sendmail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/06/26 19:51:47 is Exp $
+$NetBSD: distinfo,v 1.8 2005/06/29 22:01:19 is Exp $
 
-SHA1 (mini_sendmail-1.3.5.tar.gz) = 3d0c078c0b1a01ad1e39ed9da213821e60b5ce8e
-RMD160 (mini_sendmail-1.3.5.tar.gz) = d5a238c44d366f4b29ed785d00de623958a42172
-Size (mini_sendmail-1.3.5.tar.gz) = 7508 bytes
-SHA1 (patch-aa) = 7e0bc4405d2baef4b3755666f3281e93ca5ad606
+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) = 56901f315b6894a7bb1900d68a6da81b936fcd48
 SHA1 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
 SHA1 (patch-ac) = b14f2687f3186e198af03b2662b81726c7321558
-SHA1 (patch-ad) = a65d3b9918934fe41bcae7a9a617f075801fe121
+SHA1 (patch-ad) = 35319baaf3eac9dd931170ed4e6d638a19fff8b5
diff --git a/mail/mini_sendmail/patches/patch-aa b/mail/mini_sendmail/patches/patch-aa
index 1d0c1212a9d..31887615ccf 100644
--- a/mail/mini_sendmail/patches/patch-aa
+++ b/mail/mini_sendmail/patches/patch-aa
@@ -1,20 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2005/06/26 19:51:47 is Exp $
+$NetBSD: patch-aa,v 1.7 2005/06/29 22:01:19 is Exp $
 
---- mini_sendmail.c.orig	2003-11-17 03:03:35.000000000 +0100
+--- mini_sendmail.c.orig	2005-06-29 19:37:15.000000000 +0200
 +++ mini_sendmail.c
-@@ -133,7 +133,10 @@ main( int argc, char** argv )
+@@ -134,6 +134,8 @@ main( int argc, char** argv )
  	    timeout = atoi( &(argv[argn][2]) );
  	else if ( strcmp( argv[argn], "-v" ) == 0 )
  	    verbose = 1;
--	else if ( strcmp( argv[argn], "-i" ) == 0 )
 +	else if ( strcmp( argv[argn], "-oeq" ) == 0 )
 +	    verbose = 0;
-+	else if ( strcmp( argv[argn], "-i" ) == 0 ||
-+		  strcmp ( argv[argn], "-oi" ) == 0 )
+ 	else if ( strcmp( argv[argn], "-i" ) == 0 )
  	    ;	/* ignore */
- 	else if ( strcmp( argv[argn], "--" ) == 0 )
- 	    ;	/* ignore */
-@@ -504,14 +507,24 @@ parse_for_recipients( char* message )
+ 	else if ( strcmp( argv[argn], "-oi" ) == 0 )
+@@ -507,14 +509,24 @@ parse_for_recipients( char* message )
  	    switch ( *cp )
  		{
  		case '\n':
@@ -46,7 +43,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/26 19:51:47 is Exp $
  		    }
  		break;
  		case ',':
-@@ -529,25 +542,46 @@ static void
+@@ -532,25 +544,46 @@ static void
  add_recipient( char* recipient, int len )
      {
      char buf[1000];
diff --git a/mail/mini_sendmail/patches/patch-ad b/mail/mini_sendmail/patches/patch-ad
index e045dbc92ce..30ad976069e 100644
--- a/mail/mini_sendmail/patches/patch-ad
+++ b/mail/mini_sendmail/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.5 2005/06/26 19:51:47 is Exp $
+$NetBSD: patch-ad,v 1.6 2005/06/29 22:01:19 is Exp $
 
---- version.h.orig	Thu Nov 21 21:19:50 2002
+--- version.h.orig	2005-06-29 19:39:00.000000000 +0200
 +++ version.h
 @@ -3,6 +3,6 @@
  #ifndef _VERSION_H_
  #define _VERSION_H_
  
--#define VERSION "mini_sendmail/1.3.5 16nov2003"
-+#define VERSION "mini_sendmail/1.3.5 16nov2003 nb1 25jun2005"
+-#define VERSION "mini_sendmail/1.3.6 29jun2005"
++#define VERSION "mini_sendmail/1.3.6 29jun2005 nb1 29jun2005"
  
  #endif /* _VERSION_H_ */