Update to 1.3.4.

This commit is contained in:
jolan 2003-11-05 04:51:08 +00:00
parent d037112145
commit 169a2b7c9c
4 changed files with 29 additions and 21 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/07/22 23:01:16 jolan Exp $
# $OpenBSD: Makefile,v 1.2 2003/11/05 04:51:08 jolan Exp $
COMMENT= "accept email on behalf of real sendmail"
COMMENT-chroot= "static mini_sendmail for chrooted apache"
DISTNAME= mini_sendmail-1.3.2
PKGNAME-chroot= mini_sendmail-chroot-1.3.2
DISTNAME= mini_sendmail-1.3.4
PKGNAME-chroot= mini_sendmail-chroot-1.3.4
CATEGORIES= mail www
MASTER_SITES= ${HOMEPAGE}

View File

@ -1,3 +1,3 @@
MD5 (mini_sendmail-1.3.2.tar.gz) = f705a89b0b9aeaf28dbffbedee4cb1d3
RMD160 (mini_sendmail-1.3.2.tar.gz) = 9b172cde3d190c3db82b467faf1ecae5ede0ee2d
SHA1 (mini_sendmail-1.3.2.tar.gz) = 1e297ae27135f0f83f09c7be8a911ebfd9e2f966
MD5 (mini_sendmail-1.3.4.tar.gz) = 81fecb1fc302567c29c2f4340608d28b
RMD160 (mini_sendmail-1.3.4.tar.gz) = a2d3ce0fcb192fad876644db422593d171a86f45
SHA1 (mini_sendmail-1.3.4.tar.gz) = 8b2d2d30743613c2f7f5affe5ff10a93f62e89dc

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mini_sendmail_8,v 1.1.1.1 2003/07/22 23:01:16 jolan Exp $
--- mini_sendmail.8.orig Fri Jul 13 16:08:43 2001
+++ mini_sendmail.8 Sat Jul 19 22:48:11 2003
$OpenBSD: patch-mini_sendmail_8,v 1.2 2003/11/05 04:51:08 jolan Exp $
--- mini_sendmail.8.orig 2001-07-13 16:08:43.000000000 -0500
+++ mini_sendmail.8 2003-11-04 22:25:11.000000000 -0600
@@ -1,9 +1,11 @@
-.TH mini_sendmail 8 "12 July 2001"
+.TH mini_sendmail 8 "7 May 2003"
@ -14,11 +14,10 @@ $OpenBSD: patch-mini_sendmail_8,v 1.1.1.1 2003/07/22 23:01:16 jolan Exp $
.RB [ -t ]
.RB [ -s<server> ]
.RB [ -T<timeout> ]
@@ -24,6 +26,14 @@ can be used to send email from inside a
.TP
@@ -25,6 +27,14 @@ 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
.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
@ -26,6 +25,7 @@ $OpenBSD: patch-mini_sendmail_8,v 1.1.1.1 2003/07/22 23:01:16 jolan 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.

View File

@ -1,16 +1,24 @@
$OpenBSD: patch-mini_sendmail_c,v 1.1.1.1 2003/07/22 23:01:16 jolan Exp $
--- mini_sendmail.c.orig Thu Nov 21 14:27:55 2002
+++ mini_sendmail.c Sat Jul 19 22:47:43 2003
@@ -129,6 +129,8 @@ main( int argc, char** argv )
timeout = atoi( &(argv[argn][2]) );
else if ( strcmp( argv[argn], "-v" ) == 0 )
$OpenBSD: patch-mini_sendmail_c,v 1.2 2003/11/05 04:51:08 jolan Exp $
--- mini_sendmail.c.orig 2003-09-29 11:17:25.000000000 -0500
+++ mini_sendmail.c 2003-11-04 22:32:55.000000000 -0600
@@ -43,6 +43,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#ifdef DO_RECEIVED
@@ -131,6 +132,8 @@ main( int argc, char** argv )
verbose = 1;
else if ( strcmp( argv[argn], "--" ) == 0 )
; /* ignore */
+ else if ( strcmp( argv[argn], "-i" ) == 0 || strcmp ( argv[argn], "-oi" ) == 0 )
+ /* do nothing */ ;
+ ; /* ignore */
else
usage();
++argn;
@@ -575,14 +577,16 @@ open_client_socket( void )
@@ -577,14 +580,16 @@ open_client_socket( void )
sock_family = PF_INET6;
#ifdef DO_MINUS_S