Date: Sun, 31 Dec 2000 10:47:09 +0100 (CET) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/23977: update mail/sendmail (by maintainer) Message-ID: <200012310947.eBV9l9H13340@home.dinoex.sub.org> Resent-Message-ID: <200012310950.eBV9o1V48019@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 23977
>Category: ports
>Synopsis: update mail/sendmail (by maintainer)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 31 01:50:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Dirk Meyer
>Release: FreeBSD 4.2-STABLE i386
>Organization:
privat
>Environment:
FreeBSD 2.2.8-RELEASE i386
FreeBSD 4.2-STABLE i386
>Description:
New Release.
New Variable in Makefile for shorter Lines.
Patches for Manpages updated.
PATH was already in CCOPTS when needed, config reduced.
>How-To-Repeat:
>Fix:
apply the small patches.
diff sendmail/Makefile sendmail-8.11.2/Makefile
--- sendmail/Makefile Thu Dec 21 09:09:51 2000
+++ sendmail-8.11.2/Makefile Sun Dec 31 10:15:48 2000
@@ -6,8 +6,7 @@
#
PORTNAME= sendmail
-PORTVERSION= 8.11.1
-PORTREVISION= 1
+PORTVERSION= 8.11.2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
DISTNAME= ${PORTNAME}.${PORTVERSION}
@@ -17,6 +16,7 @@
NO_PACKAGE= "sendmail included in base system"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WCONF= ${WRKSRC}/devtools/Site
PLIST= ${WRKDIR}/.PLIST.more
.if defined(SENDMAIL_WITH_TSL)
@@ -26,18 +26,17 @@
.if exists(${DESTDIR}/etc/mail/mailer.conf)
pre-configure:
${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
- ${FILESDIR}/site.config.m4 >${WRKSRC}/devtools/Site/site.config.m4
+ ${FILESDIR}/site.config.m4 > ${WCONF}/site.config.m4
.if defined(SENDMAIL_WITH_TSL)
- ${CAT} ${FILESDIR}/site.config.m4.tls \
- >> ${WRKSRC}/devtools/Site/site.config.m4
+ ${CAT} ${FILESDIR}/site.config.m4.tls >> ${WCONF}/site.config.m4
.endif
.else
pre-configure:
${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
- ${FILESDIR}/site.config.m4.pre4 >${WRKSRC}/devtools/Site/site.config.m4
+ ${FILESDIR}/site.config.m4.pre4 > ${WCONF}/site.config.m4
.if defined(SENDMAIL_WITH_TSL)
- ${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" ${FILESDIR}/site.config.m4.ssl \
- >> ${WRKSRC}/devtools/Site/site.config.m4
+ ${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
+ ${FILESDIR}/site.config.m4.ssl >> ${WCONF}/site.config.m4
.endif
PREFIX?= ${DESTDIR}/usr
diff sendmail/distinfo sendmail-8.11.2/distinfo
--- sendmail/distinfo Sat Oct 14 06:51:40 2000
+++ sendmail-8.11.2/distinfo Sun Dec 31 10:14:35 2000
@@ -1 +1 @@
-MD5 (sendmail.8.11.1.tar.gz) = 9118a555141493fb574a588d50f57215
+MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c
diff sendmail/files/patch-aa sendmail-8.11.2/files/patch-aa
--- sendmail/files/patch-aa Thu Dec 21 08:32:18 2000
+++ sendmail-8.11.2/files/patch-aa Sun Dec 31 10:38:20 2000
@@ -58,26 +58,26 @@
echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
echo "define(\`__HOST__', $host)dnl"
diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
---- mail.local/mail.local.8 Sun Sep 17 19:04:25 2000
-+++ src/contrib/sendmail/mail.local/mail.local.8 Mon Nov 6 11:23:41 2000
+--- mail.local/mail.local.8.orig Fri Dec 29 19:12:16 2000
++++ mail.local/mail.local.8 Sun Dec 31 10:27:40 2000
@@ -10,13 +10,15 @@
.\"
- .\" $Id: mail.local.8,v 8.14.14.3 2000/09/17 17:04:25 gshapiro Exp $
+ .\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
.\"
+.\" $FreeBSD: ports/mail/sendmail/files/patch-aa,v 1.1 2000/12/21 07:32:18 will Exp $
+.\"
- .TH MAIL.LOCAL 8 "$Date: 2000/09/17 17:04:25 $"
+ .TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
.SH NAME
- .B mail.local
+ mail.local
\- store mail in a mailbox
.SH SYNOPSIS
.B mail.local
--.RB [ \-7 "] [" \-b "] [" \-d "] [" \-l "] [" \-f
-+.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f
+-.RB [ \-7 "] [" \-b "] [" \-d "] [" \-l "] [" \-f
++.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f
+ .IR from "] "
+ .RB [ \-r
.IR from "] " "user ..."
- .SH DESCRIPTION
- .B Mail.local
-@@ -32,6 +34,11 @@
+@@ -34,6 +36,11 @@
.B \-7
Do not advertise 8BITMIME support in LMTP mode.
.TP
@@ -89,7 +89,7 @@
.B \-b
Return a permanent error instead of a temporary error
if a mailbox exceeds quota.
-@@ -44,6 +51,13 @@
+@@ -46,6 +53,13 @@
.TP
.B \-l
Turn on LMTP mode.
@@ -103,7 +103,7 @@
.TP
.BI \-r " from"
Specify the sender's name (for backward compatibility).
-@@ -91,7 +105,6 @@
+@@ -93,7 +107,6 @@
.PD
.SH SEE ALSO
mail(1),
@@ -269,27 +269,27 @@
/* set from system and protocol used */
diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
---- smrsh/smrsh.8 Tue Jun 15 06:50:19 1999
-+++ src/contrib/sendmail/smrsh/smrsh.8 Wed Oct 4 23:19:47 2000
+--- smrsh/smrsh.8.orig Sat Dec 16 00:18:40 2000
++++ smrsh/smrsh.8 Sun Dec 31 10:37:02 2000
@@ -11,6 +11,8 @@
.\"
- .\" $Id: smrsh.8,v 8.11 1999/06/09 16:51:07 ca Exp $
+ .\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
.\"
+.\" $FreeBSD: ports/mail/sendmail/files/patch-aa,v 1.1 2000/12/21 07:32:18 will Exp $
+.\"
- .TH SMRSH 8 11/02/93
+ .TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
.SH NAME
smrsh \- restricted shell for sendmail
-@@ -38,7 +40,7 @@
- Briefly,
+@@ -39,7 +41,7 @@
.I smrsh
- limits programs to be in the directory
+ 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
-@@ -49,16 +51,15 @@
+@@ -50,13 +52,12 @@
``"|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user || exit 75"''
.PP
Initial pathnames on programs are stripped,
@@ -304,12 +304,8 @@
+``/usr/libexec/sm.bin/vacation''.
.PP
System administrators should be conservative about populating
--/usr/adm/sm.bin.
-+/usr/libexec/sm.bin.
- Reasonable additions are
- .IR vacation (1),
- .IR procmail (1),
-@@ -77,11 +78,11 @@
+ the sm.bin directory.
+@@ -78,11 +79,11 @@
Compilation should be trivial on most systems.
You may need to use \-DPATH=\e"\fIpath\fP\e"
to adjust the default search path
diff sendmail/files/site.config.m4 sendmail-8.11.2/files/site.config.m4
--- sendmail/files/site.config.m4 Thu Dec 21 09:09:52 2000
+++ sendmail-8.11.2/files/site.config.m4 Mon Nov 6 15:56:23 2000
@@ -11,4 +11,3 @@
APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
-APPENDDEF(`confCCOPTS', `-DPATH="\"/bin:/usr/bin\""')
diff sendmail/files/site.config.m4.pre4 sendmail-8.11.2/files/site.config.m4.pre4
--- sendmail/files/site.config.m4.pre4 Thu Dec 21 09:09:52 2000
+++ sendmail-8.11.2/files/site.config.m4.pre4 Mon Nov 6 19:16:09 2000
@@ -1,4 +1,3 @@
APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
-APPENDDEF(`confCCOPTS', `-DPATH="\"/bin:/usr/bin\""')
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200012310947.eBV9l9H13340>