summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authoris <is@pkgsrc.org>2005-06-26 19:51:47 +0000
committeris <is@pkgsrc.org>2005-06-26 19:51:47 +0000
commit84a5640031318b7b80a6fe4112edb4cc83df1181 (patch)
tree9188376c1b0c252c99aa81706efc91de1ff93bb2 /mail
parentf0785be5e30955ba10426778470488ac95532757 (diff)
downloadpkgsrc-84a5640031318b7b80a6fe4112edb4cc83df1181.tar.gz
Upgrade to mini_sendmail 1.3.5nb1. Changes to stock 1.3.5 are:
- continuation header line support (as in 1.3.2nb5) - fixed <> parsing. Still missing is label: adress, address; handling.
Diffstat (limited to 'mail')
-rw-r--r--mail/mini_sendmail/Makefile6
-rw-r--r--mail/mini_sendmail/Makefile.common4
-rw-r--r--mail/mini_sendmail/distinfo14
-rw-r--r--mail/mini_sendmail/patches/patch-aa72
-rw-r--r--mail/mini_sendmail/patches/patch-ac21
-rw-r--r--mail/mini_sendmail/patches/patch-ad6
6 files changed, 68 insertions, 55 deletions
diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
index 43b21ef191d..1ee3e0e8d12 100644
--- a/mail/mini_sendmail/Makefile
+++ b/mail/mini_sendmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 15:38:18 is Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/26 19:51:47 is Exp $
#
-PKGNAME= mini_sendmail-1.3.2
-PKGREVISION= 5
+PKGNAME= mini_sendmail-1.3.5
+PKGREVISION= 1
BUILD_DEFS+= USE_INET6
diff --git a/mail/mini_sendmail/Makefile.common b/mail/mini_sendmail/Makefile.common
index c71fa683558..afc0343765b 100644
--- a/mail/mini_sendmail/Makefile.common
+++ b/mail/mini_sendmail/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.10 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/06/26 19:51:47 is Exp $
#
-DISTNAME= mini_sendmail-1.3.2
+DISTNAME= mini_sendmail-1.3.5
CATEGORIES= mail
MASTER_SITES= http://www.acme.com/software/mini_sendmail/
diff --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo
index fee3cf63fbe..a526f825afb 100644
--- a/mail/mini_sendmail/distinfo
+++ b/mail/mini_sendmail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/06/16 15:38:18 is Exp $
+$NetBSD: distinfo,v 1.7 2005/06/26 19:51:47 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) = b76b9e3f50cc9f83555b20f284c8d1b158cfac70
+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 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
-SHA1 (patch-ac) = 3c10e603993c61f2a518ceb9f130460087c69081
-SHA1 (patch-ad) = b66945faf31c0e96d8bb2accb12de8578a1483b3
+SHA1 (patch-ac) = b14f2687f3186e198af03b2662b81726c7321558
+SHA1 (patch-ad) = a65d3b9918934fe41bcae7a9a617f075801fe121
diff --git a/mail/mini_sendmail/patches/patch-aa b/mail/mini_sendmail/patches/patch-aa
index 22a2287b04f..1d0c1212a9d 100644
--- a/mail/mini_sendmail/patches/patch-aa
+++ b/mail/mini_sendmail/patches/patch-aa
@@ -1,19 +1,20 @@
-$NetBSD: patch-aa,v 1.5 2005/06/16 15:38:18 is Exp $
+$NetBSD: patch-aa,v 1.6 2005/06/26 19:51:47 is Exp $
---- mini_sendmail.c.orig 2002-11-21 20:27:55.000000000 +0000
+--- mini_sendmail.c.orig 2003-11-17 03:03:35.000000000 +0100
+++ mini_sendmail.c
-@@ -129,6 +129,10 @@ main( int argc, char** argv )
+@@ -133,7 +133,10 @@ 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 )
-+ /* do nothing */ ;
- else
- usage();
- ++argn;
-@@ -490,14 +494,24 @@ parse_for_recipients( char* message )
++ else if ( strcmp( argv[argn], "-i" ) == 0 ||
++ strcmp ( argv[argn], "-oi" ) == 0 )
+ ; /* ignore */
+ else if ( strcmp( argv[argn], "--" ) == 0 )
+ ; /* ignore */
+@@ -504,14 +507,24 @@ parse_for_recipients( char* message )
switch ( *cp )
{
case '\n':
@@ -45,21 +46,51 @@ $NetBSD: patch-aa,v 1.5 2005/06/16 15:38:18 is Exp $
}
break;
case ',':
-@@ -516,15 +530,22 @@ add_recipient( char* recipient, int len
+@@ -529,25 +542,46 @@ static void
+ add_recipient( char* recipient, int len )
{
char buf[1000];
++ char *first;
int status;
+ int i;
++
/* Skip leading whitespace. */
- while ( len > 0 && ( *recipient == ' ' || *recipient == '\t' ) )
+ while ( len > 0 && ( *recipient == ' ' || *recipient == '\t' ||
-+ *recipient == '\n') )
++ *recipient == '\n') )
{
++recipient;
--len;
}
+- /* Strip off any angle brackets. */
+- while ( len > 0 && *recipient == '<' )
++ first = recipient;
++ /* search for angle bracket */
++
++ while (first < recipient+len && *first != '<')
+ {
+- ++recipient;
+- --len;
++ ++first;
+ }
+- while ( len > 0 && recipient[len-1] == '>' )
+- --len;
++
++ if (*first == '<')
++ {
++ len -= first + 1 - recipient;
++ recipient = first + 1;
++
++ while (len > 2 && recipient[--len] != '>')
++ ; /* nothing */
++
++ if (recipient[len] == '>')
++ --len;
++
++ }
+
(void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient );
+ for (i=0; i<sizeof(buf); i++)
+ {
@@ -69,22 +100,3 @@ $NetBSD: patch-aa,v 1.5 2005/06/16 15:38:18 is Exp $
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
-- if ( inet_pton( PF_INET, server, (void*) &sa4.sin_addr ) == 0 )
-+
-+ (void) memset( (void*) &sa4, 0, sizeof(sa4) );
-+ if ( inet_pton( AF_INET, server, (void*) &sa4.sin_addr ) == 1 )
- {
- sock_family = PF_INET;
- sa4.sin_port = htons( SMTP_PORT );
- sa_len = sizeof(sa4);
- (void) memmove( &sa, &sa4, sa_len );
- }
-- else if ( inet_pton( PF_INET6, server, (void*) &sa.sin6_addr ) == -1 )
-+ else if ( inet_pton( AF_INET6, server, (void*) &sa.sin6_addr ) != 1 )
- {
- #ifdef DO_DNS
- (void) memset( &hints, 0, sizeof(hints) );
diff --git a/mail/mini_sendmail/patches/patch-ac b/mail/mini_sendmail/patches/patch-ac
index a7cd03f4fa7..6c001183893 100644
--- a/mail/mini_sendmail/patches/patch-ac
+++ b/mail/mini_sendmail/patches/patch-ac
@@ -1,25 +1,25 @@
-$NetBSD: patch-ac,v 1.3 2003/10/07 08:45:14 is Exp $
+$NetBSD: patch-ac,v 1.4 2005/06/26 19:51:47 is Exp $
---- mini_sendmail.8.orig Fri Jul 13 23:08:43 2001
+--- mini_sendmail.8.orig 2003-11-17 02:47:33.000000000 +0100
+++ mini_sendmail.8
-@@ -1,9 +1,11 @@
+@@ -1,10 +1,12 @@
-.TH mini_sendmail 8 "12 July 2001"
-+.TH mini_sendmail 8 "7 May 2003"
++.TH mini_sendmail 8 "25 June 2005"
.SH NAME
mini_sendmail - accept email on behalf of real sendmail
.SH SYNOPSIS
.B mini_sendmail
.RB [ -f<name> ]
+ .RB [ -t ]
+.RB [ -i ]
+.RB [ -oi ]
- .RB [ -t ]
.RB [ -s<server> ]
+ .RB [ -p<port> ]
.RB [ -T<timeout> ]
-@@ -24,6 +26,17 @@ can be used to send email from inside a
- .TP
+@@ -26,6 +28,17 @@ can be used to send email from inside a
.B -f
- Set the name of the "from" person (i.e. the sender of the mail).
-+.TP
+ Sets the name of the "from" person (i.e. the sender of the mail).
+ .TP
+.B -i
+Don't parse for a dot-line, but read input up to an end-of-file.
+Currently, this is always the case, but this option is needed for
@@ -30,6 +30,7 @@ $NetBSD: patch-ac,v 1.3 2003/10/07 08:45:14 is Exp $
+.TP
+.B -oi
+Same as -i, needed for compatibility with sendmail.
- .TP
++.TP
.B -t
Read message for recipients.
+ To:, Cc:, and Bcc: lines will be scanned for recipient addresses.
diff --git a/mail/mini_sendmail/patches/patch-ad b/mail/mini_sendmail/patches/patch-ad
index a9347fc9b0a..e045dbc92ce 100644
--- a/mail/mini_sendmail/patches/patch-ad
+++ b/mail/mini_sendmail/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2005/06/16 15:38:18 is Exp $
+$NetBSD: patch-ad,v 1.5 2005/06/26 19:51:47 is Exp $
--- version.h.orig Thu Nov 21 21:19:50 2002
+++ version.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.4 2005/06/16 15:38:18 is Exp $
#ifndef _VERSION_H_
#define _VERSION_H_
--#define VERSION "mini_sendmail/1.3.2 21nov2002"
-+#define VERSION "mini_sendmail/1.3.2 21nov2002 nb5 16jun2005"
+-#define VERSION "mini_sendmail/1.3.5 16nov2003"
++#define VERSION "mini_sendmail/1.3.5 16nov2003 nb1 25jun2005"
#endif /* _VERSION_H_ */