[Midnightbsd-cvs] mports: mail/sendmail: Update to 8.14.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue May 20 17:20:28 EDT 2008


Log Message:
-----------
Update to 8.14.3

Modified Files:
--------------
    mports/mail/sendmail:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.3 -> r1.4)

Added Files:
-----------
    mports/mail/sendmail/files:
        patch-bsd4.4.m4 (r1.1)
        patch-cfhead.m4 (r1.1)
        patch-mail.local.8 (r1.1)
        patch-mail.local.c (r1.1)
        patch-makeinfo.sh (r1.1)
        patch-rmail.c (r1.1)
        patch-smrsh.8 (r1.1)

Removed Files:
-------------
    mports/mail/sendmail/files:
        patch-aa

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/sendmail/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L mail/sendmail/Makefile -L mail/sendmail/Makefile -u -r1.7 -r1.8
--- mail/sendmail/Makefile
+++ mail/sendmail/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	sendmail
-PORTVERSION=	8.14.2
+PORTVERSION=	8.14.3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/sendmail/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L mail/sendmail/distinfo -L mail/sendmail/distinfo -u -r1.3 -r1.4
--- mail/sendmail/distinfo
+++ mail/sendmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (sendmail.8.14.2.tar.gz) = 1c1472365344ca8061d6453c43c9a831
-SHA256 (sendmail.8.14.2.tar.gz) = 7be1c533ab0b3c841a8b28954c79bd2e4474b9a212163b0f20cd30e255d06e3a
-SIZE (sendmail.8.14.2.tar.gz) = 2064346
+MD5 (sendmail.8.14.3.tar.gz) = a5ee5d26e1f546a2da5fb9a513bd6bce
+SHA256 (sendmail.8.14.3.tar.gz) = 5cc69cdc055b587cbedad4efbf17c1dfc52a6ae18ec83a3d2e83e5f5fcdc119b
+SIZE (sendmail.8.14.3.tar.gz) = 2069209
--- /dev/null
+++ mail/sendmail/files/patch-makeinfo.sh
@@ -0,0 +1,11 @@
+--- cf/sh/makeinfo.sh.orig	1999-02-07 08:26:25.000000000 +0100
++++ cf/sh/makeinfo.sh	2008-05-04 11:55:42.000000000 +0200
+@@ -52,7 +52,7 @@
+ else
+ 	host=`uname -n`
+ fi
+-echo '#####' built by $user@$host on `date`
++echo '#####' built by $user@$host on `LC_TIME=C date`
+ echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
+ echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
+ echo "define(\`__HOST__', $host)dnl"
--- /dev/null
+++ mail/sendmail/files/patch-cfhead.m4
@@ -0,0 +1,12 @@
+--- cf/m4/cfhead.m4.orig	2004-01-28 23:02:22.000000000 +0100
++++ cf/m4/cfhead.m4	2008-05-04 11:55:42.000000000 +0200
+@@ -268,7 +268,8 @@
+ define(`_REC_FULL_AUTH_', `$.$?{auth_type}(user=${auth_authen} $?{auth_author}author=${auth_author} $.mech=${auth_type}')
+ define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
+ define(`_REC_END_', `for $u; $|;
+-	$.$b')
++	$.$b$?g
++	(envelope-from $g)$.')
+ define(`_REC_TLS_', `(version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})$.$?u')
+ define(`_REC_BY_', `$.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version}')
+ define(`confRECEIVED_HEADER', `_REC_HDR_
--- /dev/null
+++ mail/sendmail/files/patch-smrsh.8
@@ -0,0 +1,27 @@
+--- smrsh/smrsh.8.orig	2004-08-06 05:55:35.000000000 +0200
++++ smrsh/smrsh.8	2008-05-04 11:55:42.000000000 +0200
+@@ -39,7 +39,7 @@
+ .I smrsh
+ limits programs to be in a single directory,
+ by default
+-/usr/adm/sm.bin,
++/usr/libexec/sm.bin,
+ allowing the system administrator to choose the set of acceptable commands,
+ and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
+ It also rejects any commands with the characters
+@@ -50,13 +50,12 @@
+ ``"|exec /usr/local/bin/filter || exit 75"''
+ .PP
+ Initial pathnames on programs are stripped,
+-so forwarding to ``/usr/ucb/vacation'',
+-``/usr/bin/vacation'',
++so forwarding to ``/usr/bin/vacation'',
+ ``/home/server/mydir/bin/vacation'',
+ and
+ ``vacation''
+ all actually forward to
+-``/usr/adm/sm.bin/vacation''.
++``/usr/libexec/sm.bin/vacation''.
+ .PP
+ System administrators should be conservative about populating
+ the sm.bin directory.
--- /dev/null
+++ mail/sendmail/files/patch-mail.local.8
@@ -0,0 +1,57 @@
+--- mail.local/mail.local.8.orig	2003-10-20 22:26:51.000000000 +0200
++++ mail.local/mail.local.8	2008-05-04 11:55:42.000000000 +0200
+@@ -16,9 +16,9 @@
+ \- store mail in a mailbox
+ .SH SYNOPSIS
+ .B mail.local
+-.RB [ \-7 "] [" \-b "] [" \-d "] [" \-D
++.RB [ \-7 "] [" \-b "] [" \-B "] [" \-d "] [" \-D
+ .IR mbdb ]
+-.RB [ \-l "] [" \-f 
++.RB [ \-l "] [" \-s "] [" \-f 
+ \fIfrom\fR|\fB\-r\fR
+ .IR from ]
+ .RB [ \-h
+@@ -38,6 +38,11 @@
+ .B \-7
+ Do not advertise 8BITMIME support in LMTP mode.
+ .TP 
++.B \-B
++Turn off the attempts to notify the
++.Dq biff
++service.
++.TP 
+ .B \-b
+ Return a permanent error instead of a temporary error
+ if a mailbox exceeds quota.
+@@ -56,6 +61,13 @@
+ .TP
+ .B \-l
+ Turn on LMTP mode.
++.TP
++.B \-s
++Turn off the
++.Xr fsync 2
++call that forces the mailbox to be committed to disk before returning a
++.Dq success
++status.
+ .TP 
+ .BI \-r " from"
+ Specify the sender's name (for backward compatibility).
+@@ -120,7 +132,7 @@
+ .SH FILES
+ .PD 0.2v
+ .TP 2.2i
+-/tmp/local.XXXXXX
++/var/tmp/local.XXXXXX
+ temporary files
+ .TP
+ /var/mail/user
+@@ -131,7 +143,6 @@
+ .PD
+ .SH SEE ALSO
+ mail(1), 
+-xsend(1), 
+ flock(2), 
+ getservbyname(3), 
+ comsat(8), 
--- mail/sendmail/files/patch-aa
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -ur cf/m4/cfhead.m4.orig cf/m4/cfhead.m4
---- cf/m4/cfhead.m4.orig	Sun Jun 10 03:45:13 2001
-+++ cf/m4/cfhead.m4	Fri Jun 15 06:47:34 2001
-@@ -260,7 +261,8 @@
- define(`_REC_FULL_AUTH_', `$.$?{auth_type}(authenticated as ${auth_authen} $?{auth_author}for ${auth_author} $.with ${auth_type}')
- define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
- define(`_REC_END_', `for $u; $|;
--	$.$b')
-+	$.$b$?g
-+	(envelope-from $g)$.')
- define(`_REC_TLS_', `(version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})$.$?u')
- define(`_REC_BY_', `$.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version}')
- define(`confRECEIVED_HEADER', `_REC_HDR_
-diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
---- cf/ostype/bsd4.4.m4	Sun Apr 25 22:00:56 1999
-+++ src/contrib/sendmail/cf/ostype/bsd4.4.m4	Wed Oct  4 23:19:29 2000
-@@ -16,5 +16,6 @@
- divert(0)
- VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $')
- ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
- ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
-+ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
- ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
-diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
---- cf/sh/makeinfo.sh	Sun Feb  7 08:26:25 1999
-+++ src/contrib/sendmail/cf/sh/makeinfo.sh	Wed Oct  4 23:19:29 2000
-@@ -52,7 +54,7 @@
- else
- 	host=`uname -n`
- fi
--echo '#####' built by $user@$host on `date`
-+echo '#####' built by $user@$host on `LC_TIME=C date`
- echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
- echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
- echo "define(\`__HOST__', $host)dnl"
-diff -ur mail.local/mail.local.8.orig mail.local/mail.local.8
---- mail.local/mail.local.8.orig	Fri Apr  6 01:27:35 2001
-+++ mail.local/mail.local.8	Thu May 31 07:36:03 2001
-@@ -16,9 +16,9 @@
- \- store mail in a mailbox
- .SH SYNOPSIS
- .B mail.local
--.RB [ \-7 "] [" \-b "] [" \-d "] [" \-D
-+.RB [ \-7 "] [" \-b "] [" \-B "] [" \-d "] [" \-D
- .IR mbdb ]
--.RB [ \-l "] [" \-f 
-+.RB [ \-l "] [" \-s "] [" \-f 
- \fIfrom\fR|\fB\-r\fR
- .IR from ]
- .RB [ \-h
-@@ -38,6 +41,11 @@
- .B \-7
- Do not advertise 8BITMIME support in LMTP mode.
- .TP 
-+.B \-B
-+Turn off the attempts to notify the
-+.Dq biff
-+service.
-+.TP 
- .B \-b
- Return a permanent error instead of a temporary error
- if a mailbox exceeds quota.
-@@ -56,6 +64,13 @@
- .TP
- .B \-l
- Turn on LMTP mode.
-+.TP
-+.B \-s
-+Turn off the
-+.Xr fsync 2
-+call that forces the mailbox to be committed to disk before returning a
-+.Dq success
-+status.
- .TP 
- .BI \-r " from"
- Specify the sender's name (for backward compatibility).
-@@ -97,7 +112,7 @@
- .SH FILES
- .PD 0.2v
- .TP 2.2i
--/tmp/local.XXXXXX
-+/var/tmp/local.XXXXXX
- temporary files
- .TP
- /var/mail/user
-@@ -108,7 +123,6 @@
- .PD
- .SH SEE ALSO
- mail(1), 
--xsend(1), 
- flock(2), 
- getservbyname(3), 
- comsat(8), 
-diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
---- mail.local/mail.local.c.orig	Mon Nov  1 21:42:42 2004
-+++ mail.local/mail.local.c	Thu Dec 16 05:25:26 2004
-@@ -144,6 +144,8 @@
- bool	HoldErrs = false;		/* Hold errors in ErrBuf */
- bool	LMTPMode = false;
- bool	BounceQuota = false;		/* permanent error when over quota */
-+bool	NoBiff = false;
-+bool	NoFsync = false;
- bool	CloseMBDB = false;
- char	*HomeMailFile = NULL;		/* store mail in homedir */
- 
-@@ -223,9 +225,9 @@
- 		sm_exit(EX_CONFIG);
- 	}
- #if HASHSPOOL
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:n")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsH:p:n")) != -1)
- #else /* HASHSPOOL */
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1)
- #endif /* HASHSPOOL */
- 	{
- 		switch(ch)
-@@ -234,6 +236,10 @@
- 			EightBitMime = false;
- 			break;
- 
-+		  case 'B':
-+			NoBiff = true;
-+			break;
-+
- 		  case 'b':		/* bounce mail when over quota. */
- 			BounceQuota = true;
- 			break;
-@@ -325,6 +331,10 @@
- 			break;
- #endif /* HASHSPOOL */
- 
-+		  case 's':
-+			NoFsync = true;
-+			break;
-+
- 		  case '?':
- 		  default:
- 			usage();
-@@ -334,7 +344,8 @@
- 	argv += optind;
- 
- 	/* initialize biff structures */
--	notifybiff(NULL);
-+	if (!NoBiff)
-+		notifybiff(NULL);
- 
- 	err = sm_mbdb_initialize(mbdbname);
- 	if (err != EX_OK)
-@@ -1256,6 +1267,7 @@
- 
- 	/* Get the starting offset of the new message */
- 	curoff = lseek(mbfd, (off_t) 0, SEEK_END);
-+	if (!NoBiff)
- 	(void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n",
- 			   name, (LONGLONG_T) curoff);
- 
-@@ -1318,7 +1330,7 @@
- 	}
- 
- 	/* Flush to disk, don't wait for update. */
--	if (fsync(mbfd) < 0)
-+	if (!NoFsync && fsync(mbfd) < 0)
- 	{
- 		mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno));
- err3:
-@@ -1385,7 +1397,7 @@
- 		/* Attempt to truncate back to pre-write size */
- 		goto err3;
- 	}
--	else
-+	else if (!NoBiff)
- 		notifybiff(biffmsg);
- 
- 	if (setreuid(0, 0) < 0)
-@@ -1564,7 +1576,7 @@
- usage()
- {
- 	ExitVal = EX_USAGE;
--	mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ...");
-+	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ...");
- 	sm_exit(ExitVal);
- }
- 
-diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
---- rmail/rmail.c	Sun Sep 17 00:20:25 2000
-+++ src/contrib/sendmail/rmail/rmail.c	Mon Nov  6 11:23:42 2000
-@@ -318,7 +320,11 @@
- 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
- 	args[i++] = "-G";		/* relay submission */
- 	args[i++] = "-oee";		/* No errors, just status. */
-+#ifdef QUEUE_ONLY
- 	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
-+#else
-+	args[i++] = "-odi";		/* Deliver in foreground. */
-+#endif
- 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
- 
- 	/* set from system and protocol used */
-diff -ur smrsh/smrsh.8.orig smrsh/smrsh.8
---- smrsh/smrsh.8.orig	Wed Jan 24 01:40:47 2001
-+++ smrsh/smrsh.8	Mon May  7 08:32:45 2001
-@@ -39,7 +41,7 @@
- .I smrsh
- limits programs to be in a single directory,
- by default
--/usr/adm/sm.bin,
-+/usr/libexec/sm.bin,
- allowing the system administrator to choose the set of acceptable commands,
- and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
- It also rejects any commands with the characters
-@@ -50,13 +52,12 @@
- ``"|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user || exit 75"''
- .PP
- Initial pathnames on programs are stripped,
--so forwarding to ``/usr/ucb/vacation'',
--``/usr/bin/vacation'',
-+so forwarding to ``/usr/bin/vacation'',
- ``/home/server/mydir/bin/vacation'',
- and
- ``vacation''
- all actually forward to
--``/usr/adm/sm.bin/vacation''.
-+``/usr/libexec/sm.bin/vacation''.
- .PP
- System administrators should be conservative about populating
- the sm.bin directory.
--- /dev/null
+++ mail/sendmail/files/patch-rmail.c
@@ -0,0 +1,14 @@
+--- rmail/rmail.c.orig	2001-09-18 23:45:29.000000000 +0200
++++ rmail/rmail.c	2008-05-04 11:55:42.000000000 +0200
+@@ -276,7 +276,11 @@
+ 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
+ 	args[i++] = "-G";		/* relay submission */
+ 	args[i++] = "-oee";		/* No errors, just status. */
++#ifdef QUEUE_ONLY
+ 	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
++#else
++	args[i++] = "-odi";		/* Deliver in foreground. */
++#endif
+ 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
+ 
+ 	/* set from system and protocol used */
--- /dev/null
+++ mail/sendmail/files/patch-mail.local.c
@@ -0,0 +1,97 @@
+--- mail.local/mail.local.c.orig	2008-02-19 08:13:30.000000000 +0100
++++ mail.local/mail.local.c	2008-05-04 11:59:31.000000000 +0200
+@@ -153,6 +153,8 @@
+ bool	HoldErrs = false;		/* Hold errors in ErrBuf */
+ bool	LMTPMode = false;
+ bool	BounceQuota = false;		/* permanent error when over quota */
++bool	NoBiff = false;
++bool	NoFsync = false;
+ bool	CloseMBDB = false;
+ char	*HomeMailFile = NULL;		/* store mail in homedir */
+ 
+@@ -234,12 +236,12 @@
+ 		sm_exit(EX_CONFIG);
+ 	}
+ #if HASHSPOOL
+-	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:n")) != -1)
++	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsH:p:n")) != -1)
+ #else /* HASHSPOOL */
+ #  if _FFR_SPOOL_PATH
+-	while ((ch = getopt(argc, argv, "7bdD:f:h:r:lp:")) != -1)
++	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsp:")) != -1)
+ #  else /* _FFR_SPOOL_PATH */
+-	while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1)
++	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1)
+ #  endif /* _FFR_SPOOL_PATH */
+ #endif /* HASHSPOOL */
+ 	{
+@@ -249,6 +251,10 @@
+ 			EightBitMime = false;
+ 			break;
+ 
++		  case 'B':
++			NoBiff = true;
++			break;
++
+ 		  case 'b':		/* bounce mail when over quota. */
+ 			BounceQuota = true;
+ 			break;
+@@ -342,6 +348,10 @@
+ 			break;
+ #endif /* HASHSPOOL || _FFR_SPOOL_PATH */
+ 
++		  case 's':
++			NoFsync = true;
++			break;
++
+ 		  case '?':
+ 		  default:
+ 			usage();
+@@ -351,7 +361,8 @@
+ 	argv += optind;
+ 
+ 	/* initialize biff structures */
+-	notifybiff(NULL);
++	if (!NoBiff)
++		notifybiff(NULL);
+ 
+ 	err = sm_mbdb_initialize(mbdbname);
+ 	if (err != EX_OK)
+@@ -1273,6 +1284,7 @@
+ 
+ 	/* Get the starting offset of the new message */
+ 	curoff = lseek(mbfd, (off_t) 0, SEEK_END);
++	if (!NoBiff)
+ 	(void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n",
+ 			   name, (LONGLONG_T) curoff);
+ 
+@@ -1335,7 +1347,7 @@
+ 	}
+ 
+ 	/* Flush to disk, don't wait for update. */
+-	if (fsync(mbfd) < 0)
++	if (!NoFsync && fsync(mbfd) < 0)
+ 	{
+ 		mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno));
+ err3:
+@@ -1402,7 +1414,7 @@
+ 		/* Attempt to truncate back to pre-write size */
+ 		goto err3;
+ 	}
+-	else
++	else if (!NoBiff)
+ 		notifybiff(biffmsg);
+ 
+ 	if (setreuid(0, 0) < 0)
+@@ -1582,9 +1594,9 @@
+ {
+ 	ExitVal = EX_USAGE;
+ # if _FFR_SPOOL_PATH
+-	mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] [-p path] user ...");
++	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] [-p path] user ...");
+ # else /* _FFR_SPOOL_PATH */
+-	mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ...");
++	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ...");
+ # endif /* _FFR_SPOOL_PATH */
+ 	sm_exit(ExitVal);
+ }
--- /dev/null
+++ mail/sendmail/files/patch-bsd4.4.m4
@@ -0,0 +1,8 @@
+--- cf/ostype/bsd4.4.m4.orig	1999-04-24 07:37:40.000000000 +0200
++++ cf/ostype/bsd4.4.m4	2008-05-04 11:55:42.000000000 +0200
+@@ -17,4 +17,5 @@
+ VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $')
+ ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
+ ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
++ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
+ ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl


More information about the Midnightbsd-cvs mailing list