Add a few more sendmail compatibility command line flags (all ignored) -

enough to allow NetBSD's cron to send mail.

2 files changed, 29 insertions, 13 deletions

diff --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo
index 0ba4088eae6..ae9ef382e95 100644
--- a/mail/mini_sendmail/distinfo
+++ b/mail/mini_sendmail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2006/12/01 10:40:48 martin Exp $
+$NetBSD: distinfo,v 1.11 2007/10/27 11:30:36 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) = 82eccc80d1cde777ed49d965e1c9b3df05e8cc22
+SHA1 (patch-aa) = 54601fa54cedeb9b3bfbafdbd9b2f7e129a53fcd
 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 dfd3bd6461c..c86f34375be 100644
--- a/mail/mini_sendmail/patches/patch-aa
+++ b/mail/mini_sendmail/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
+$NetBSD: patch-aa,v 1.10 2007/10/27 11:30:37 martin Exp $
+
 
 --- mini_sendmail.c.orig	2005-06-29 19:37:15.000000000 +0200
-+++ mini_sendmail.c	2006-12-01 11:35:27.000000000 +0100
-@@ -66,8 +66,13 @@ static char* argv0;
++++ mini_sendmail.c	2007-10-27 13:25:55.000000000 +0200
+@@ -66,8 +66,13 @@
  static char* fake_from;
  static int parse_message, verbose;
  #ifdef DO_MINUS_SP
@@ -17,7 +18,7 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
  #endif /* DO_MINUS_SP */
  static int timeout;
  static int sockfd1, sockfd2;
-@@ -84,7 +89,7 @@ static char* make_received( char* from, 
+@@ -84,7 +89,7 @@
  #endif /* DO_RECEIVED */
  static void parse_for_recipients( char* message );
  static void add_recipient( char* recipient, int len );
@@ -26,7 +27,7 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
  static int read_response( void );
  static void send_command( char* command );
  static void send_data( char* data );
-@@ -106,13 +111,15 @@ main( int argc, char** argv )
+@@ -106,13 +111,15 @@
      char from[1000];
      int status;
      char buf[2000];
@@ -43,7 +44,14 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
      port = SMTP_PORT;
  #endif /* DO_MINUS_SP */
      verbose = 0;
-@@ -125,15 +132,21 @@ main( int argc, char** argv )
+@@ -122,22 +129,36 @@
+ 	{
+ 	if ( strncmp( argv[argn], "-f", 2 ) == 0 && argv[argn][2] != '\0' )
+ 	    fake_from = &(argv[argn][2]);
++	else if ( strncmp( argv[argn], "-F", 2 ) == 0 && argv[argn][2] != '\0' )
++	    ;	/* ignore for sendmail compatibility, should set From: header */
++	else if ( strncmp( argv[argn], "-or", 3 ) == 0 && argv[argn][3] != '\0' )
++	    ;	/* ignore for sendmail compatibility (sets some timeout) */
  	else if ( strcmp( argv[argn], "-t" ) == 0 )
  	    parse_message = 1;
  #ifdef DO_MINUS_SP
@@ -68,7 +76,15 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
  	else if ( strcmp( argv[argn], "-i" ) == 0 )
  	    ;	/* ignore */
  	else if ( strcmp( argv[argn], "-oi" ) == 0 )
-@@ -186,8 +199,21 @@ main( int argc, char** argv )
+ 	    ;	/* ignore */
++	else if ( strcmp( argv[argn], "-odi" ) == 0 )
++	    ;	/* ignore */
++	else if ( strcmp( argv[argn], "-oem" ) == 0 )
++	    ;	/* ignore */
+ 	else if ( strcmp( argv[argn], "--" ) == 0 )
+ 	    ;	/* ignore */
+ 	else
+@@ -186,8 +207,21 @@
  
      (void) signal( SIGALRM, sigcatch );
  
@@ -91,7 +107,7 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
  
      sockfd2 = dup( sockfd1 );
      sockrfp = fdopen( sockfd1, "r" );
-@@ -507,14 +533,24 @@ parse_for_recipients( char* message )
+@@ -507,14 +541,24 @@
  	    switch ( *cp )
  		{
  		case '\n':
@@ -123,7 +139,7 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
  		    }
  		break;
  		case ',':
-@@ -532,25 +568,43 @@ static void
+@@ -532,25 +576,43 @@
  add_recipient( char* recipient, int len )
      {
      char buf[1000];
@@ -174,7 +190,7 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
      send_command( buf );
      status = read_response();
      if ( status != 250  && status != 251 )
-@@ -569,7 +623,7 @@ add_recipient( char* recipient, int len 
+@@ -569,7 +631,7 @@
  #endif
  
  static int
@@ -183,7 +199,7 @@ $NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
      {
  #ifdef USE_IPV6
      struct sockaddr_in6 sa;
-@@ -744,10 +798,10 @@ open_client_socket( void )
+@@ -744,10 +806,10 @@
  
      sockfd = socket( sock_family, sock_type, sock_protocol );
      if ( sockfd < 0 )