From 0ac9c6b641102d92275ada9dcbafee3e607f4682 Mon Sep 17 00:00:00 2001 From: "James E. Housley" Date: Fri, 5 Jan 2001 03:15:42 +0000 Subject: Update to 8.11.2 New Variable in Makefile for shorter Lines. Patches for Manpages updated. PATH was already in CCOPTS when needed, config reduced. PR: 23977 Submitted by: Dirk Meyer MAINTAINER --- mail/sendmail-old/Makefile | 15 ++++--- mail/sendmail-old/distinfo | 2 +- mail/sendmail-old/files/patch-aa | 62 ++++++++++++++--------------- mail/sendmail-old/files/site.config.m4 | 1 - mail/sendmail-old/files/site.config.m4.pre4 | 1 - 5 files changed, 37 insertions(+), 44 deletions(-) (limited to 'mail/sendmail-old') diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile index 47a03dc4b107..3770d87f19d7 100644 --- a/mail/sendmail-old/Makefile +++ b/mail/sendmail-old/Makefile @@ -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 @@ MAINTAINER= dirk.meyer@dinoex.sub.org 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 @@ USE_OPENSSL= yes .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 --git a/mail/sendmail-old/distinfo b/mail/sendmail-old/distinfo index 0cf3cf85dbdb..24a6ea15cce1 100644 --- a/mail/sendmail-old/distinfo +++ b/mail/sendmail-old/distinfo @@ -1 +1 @@ -MD5 (sendmail.8.11.1.tar.gz) = 9118a555141493fb574a588d50f57215 +MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c diff --git a/mail/sendmail-old/files/patch-aa b/mail/sendmail-old/files/patch-aa index 164dd8f4456b..21a754454aab 100644 --- a/mail/sendmail-old/files/patch-aa +++ b/mail/sendmail-old/files/patch-aa @@ -5,7 +5,7 @@ diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4 # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ ++# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ # ###################################################################### @@ -27,7 +27,7 @@ diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4 # the sendmail distribution. # -# -+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ ++# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ # divert(0) @@ -43,7 +43,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh # # $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $ # -+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ ++# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ +# usewhoami=0 @@ -58,26 +58,26 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh 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: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ ++.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh 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 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8 .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 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8 .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), @@ -118,7 +118,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.37 2000/09/22 00:49:10 doug Exp $"; #endif /* ! lint */ -+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ */ ++/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */ + /* ** This is not intended to work on System V derived systems @@ -251,7 +251,7 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $"; #endif /* ! lint */ -+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ */ ++/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */ + /* * RMAIL -- UUCP mail server. @@ -269,27 +269,27 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c /* 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: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.1 2000-12-21 07:32:18 will Exp $ ++.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh 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 @@ diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.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 --git a/mail/sendmail-old/files/site.config.m4 b/mail/sendmail-old/files/site.config.m4 index 7a4840a405df..596e4e1a0a50 100644 --- a/mail/sendmail-old/files/site.config.m4 +++ b/mail/sendmail-old/files/site.config.m4 @@ -11,4 +11,3 @@ APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6') 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 --git a/mail/sendmail-old/files/site.config.m4.pre4 b/mail/sendmail-old/files/site.config.m4.pre4 index bb2ff05a9f45..384a8ec2334e 100644 --- a/mail/sendmail-old/files/site.config.m4.pre4 +++ b/mail/sendmail-old/files/site.config.m4.pre4 @@ -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\""') -- cgit v1.2.3