Attachment #12396 for bug #23977

View | Details | Raw Unified | Return to bug 23977
Collapse All | Expand All




#

PORTNAME=	sendmail
PORTVERSION=	8.11.2
PORTREVISION=	1
CATEGORIES=	mail ipv6
MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
DISTNAME=	${PORTNAME}.${PORTVERSION}

NO_PACKAGE=	"sendmail included in base system"

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
WCONF=		${WRKSRC}/devtools/Site
PLIST=		${WRKDIR}/.PLIST.more

.if defined(SENDMAIL_WITH_TSL)

.if exists(${DESTDIR}/etc/mail/mailer.conf)
pre-configure:
	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
		${FILESDIR}/site.config.m4 > ${WCONF}/site.config.m4
.if defined(SENDMAIL_WITH_TSL)
	${CAT} ${FILESDIR}/site.config.m4.tls >> ${WCONF}/site.config.m4
		>> ${WRKSRC}/devtools/Site/site.config.m4
.endif
.else
pre-configure:
	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
		${FILESDIR}/site.config.m4.pre4 > ${WCONF}/site.config.m4
.if defined(SENDMAIL_WITH_TSL)
	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
		${FILESDIR}/site.config.m4.ssl >> ${WCONF}/site.config.m4
.endif

PREFIX?=	${DESTDIR}/usr

Line 1 Link Here

(-)sendmail-8.11.2/distinfo (-1 / +1 lines)
1	MD5 (sendmail.8.11.1.tar.gz) = 9118a555141493fb574a588d50f57215	1	MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c




 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.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.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/12/29 18:12:16 $"
 .SH NAME
 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
 .IR from "] "
 .RB [ \-r 
 .IR from "] " "user ..."
@@ -34,6 +36,11 @@
 .B Mail.local
@@ -32,6 +34,11 @@
 .B \-7
 Do not advertise 8BITMIME support in LMTP mode.
 .TP 

 .B \-b
 Return a permanent error instead of a temporary error
 if a mailbox exceeds quota.
@@ -46,6 +53,13 @@
 .TP
 .B \-l
 Turn on LMTP mode.

 .TP 
 .BI \-r " from"
 Specify the sender's name (for backward compatibility).
@@ -93,7 +107,6 @@
 .PD
 .SH SEE ALSO
 mail(1), 

 
 	/* set from system and protocol used */
diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
--- 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.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 "$Date: 2000/12/15 19:50:46 $"
 .SH NAME
 smrsh \- restricted shell for sendmail
@@ -39,7 +41,7 @@
 Briefly,
 .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,

+``/usr/libexec/sm.bin/vacation''.
 .PP
 System administrators should be conservative about populating
 the sm.bin directory.
@@ -78,11 +79,11 @@
 Reasonable additions are
 .IR vacation (1),
 .IR procmail (1),
@@ -77,11 +78,11 @@
 Compilation should be trivial on most systems.
 You may need to use \-DPATH=\e"\fIpath\fP\e"
 to adjust the default search path

Lines 11-14 Link Here

(-)sendmail-8.11.2/files/site.config.m4 (-1 lines)
11	APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')	11	APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
12	APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')	12	APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
13	APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')	13	APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
14	APPENDDEF(`confCCOPTS', `-DPATH="\"/bin:/usr/bin\""')

Lines 1-4 Link Here

(-)sendmail-8.11.2/files/site.config.m4.pre4 (-1 lines)
1	APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')	1	APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
2	APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')	2	APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
3	APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')	3	APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
4	APPENDDEF(`confCCOPTS', `-DPATH="\"/bin:/usr/bin\""')

Return to bug 23977

Lines 6-13 Link Here

(-)sendmail-8.11.2/Makefile (-8 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= sendmail	8	PORTNAME= sendmail
9	PORTVERSION= 8.11.1	9	PORTVERSION= 8.11.2
10	PORTREVISION= 1
11	CATEGORIES= mail ipv6	10	CATEGORIES= mail ipv6
12	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/	11	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
13	DISTNAME= ${PORTNAME}.${PORTVERSION}	12	DISTNAME= ${PORTNAME}.${PORTVERSION}
Lines 17-22 Link Here
17	NO_PACKAGE= "sendmail included in base system"	16	NO_PACKAGE= "sendmail included in base system"
18		17
19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		19	WCONF= ${WRKSRC}/devtools/Site
20	PLIST= ${WRKDIR}/.PLIST.more	20	PLIST= ${WRKDIR}/.PLIST.more
21		21
22	.if defined(SENDMAIL_WITH_TSL)	22	.if defined(SENDMAIL_WITH_TSL)
Lines 26-43 Link Here
26	.if exists(${DESTDIR}/etc/mail/mailer.conf)	26	.if exists(${DESTDIR}/etc/mail/mailer.conf)
27	pre-configure:	27	pre-configure:
28	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \	28	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
29	${FILESDIR}/site.config.m4 >${WRKSRC}/devtools/Site/site.config.m4	29	${FILESDIR}/site.config.m4 > ${WCONF}/site.config.m4
30	.if defined(SENDMAIL_WITH_TSL)	30	.if defined(SENDMAIL_WITH_TSL)
31	${CAT} ${FILESDIR}/site.config.m4.tls \	31	${CAT} ${FILESDIR}/site.config.m4.tls >> ${WCONF}/site.config.m4
32	>> ${WRKSRC}/devtools/Site/site.config.m4
33	.endif	32	.endif
34	.else	33	.else
35	pre-configure:	34	pre-configure:
36	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \	35	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
37	${FILESDIR}/site.config.m4.pre4 >${WRKSRC}/devtools/Site/site.config.m4	36	${FILESDIR}/site.config.m4.pre4 > ${WCONF}/site.config.m4
38	.if defined(SENDMAIL_WITH_TSL)	37	.if defined(SENDMAIL_WITH_TSL)
39	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" ${FILESDIR}/site.config.m4.ssl \	38	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
40	>> ${WRKSRC}/devtools/Site/site.config.m4	39	${FILESDIR}/site.config.m4.ssl >> ${WCONF}/site.config.m4
41	.endif	40	.endif
42		41
43	PREFIX?= ${DESTDIR}/usr	42	PREFIX?= ${DESTDIR}/usr

Lines 58-83 Link Here

(-)sendmail-8.11.2/files/patch-aa (-26 / +22 lines)
58	echo '#####' using $1 as configuration include directory \| sed 's/\/tmp_mnt//'	58	echo '#####' using $1 as configuration include directory \| sed 's/\/tmp_mnt//'
59	echo "define(\`__HOST__', $host)dnl"	59	echo "define(\`__HOST__', $host)dnl"
60	diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8	60	diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
61	--- mail.local/mail.local.8 Sun Sep 17 19:04:25 2000	61	--- mail.local/mail.local.8.orig Fri Dec 29 19:12:16 2000
62	+++ src/contrib/sendmail/mail.local/mail.local.8 Mon Nov 6 11:23:41 2000	62	+++ mail.local/mail.local.8 Sun Dec 31 10:27:40 2000
63	@@ -10,13 +10,15 @@	63	@@ -10,13 +10,15 @@
64	.\"	64	.\"
65	.\" $Id: mail.local.8,v 8.14.14.3 2000/09/17 17:04:25 gshapiro Exp $	65	.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
66	.\"	66	.\"
67	+.\" $FreeBSD: ports/mail/sendmail/files/patch-aa,v 1.1 2000/12/21 07:32:18 will Exp $	67	+.\" $FreeBSD: ports/mail/sendmail/files/patch-aa,v 1.1 2000/12/21 07:32:18 will Exp $
68	+.\"	68	+.\"
69	.TH MAIL.LOCAL 8 "$Date: 2000/09/17 17:04:25 $"	69	.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
70	.SH NAME	70	.SH NAME
71	.B mail.local	71	mail.local
72	\- store mail in a mailbox	72	\- store mail in a mailbox
73	.SH SYNOPSIS	73	.SH SYNOPSIS
74	.B mail.local	74	.B mail.local
75	-.RB [ \-7 "] [" \-b "] [" \-d "] [" \-l "] [" \-f	75	-.RB [ \-7 "] [" \-b "] [" \-d "] [" \-l "] [" \-f
76	+.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f	76	+.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f
		77	.IR from "] "
		78	.RB [ \-r
77	.IR from "] " "user ..."	79	.IR from "] " "user ..."
78	.SH DESCRIPTION	80	@@ -34,6 +36,11 @@
79	.B Mail.local
80	@@ -32,6 +34,11 @@
81	.B \-7	81	.B \-7
82	Do not advertise 8BITMIME support in LMTP mode.	82	Do not advertise 8BITMIME support in LMTP mode.
83	.TP	83	.TP
Lines 89-95 Link Here
89	.B \-b	89	.B \-b
90	Return a permanent error instead of a temporary error	90	Return a permanent error instead of a temporary error
91	if a mailbox exceeds quota.	91	if a mailbox exceeds quota.
92	@@ -44,6 +51,13 @@	92	@@ -46,6 +53,13 @@
93	.TP	93	.TP
94	.B \-l	94	.B \-l
95	Turn on LMTP mode.	95	Turn on LMTP mode.
Lines 103-109 Link Here
103	.TP	103	.TP
104	.BI \-r " from"	104	.BI \-r " from"
105	Specify the sender's name (for backward compatibility).	105	Specify the sender's name (for backward compatibility).
106	@@ -91,7 +105,6 @@	106	@@ -93,7 +107,6 @@
107	.PD	107	.PD
108	.SH SEE ALSO	108	.SH SEE ALSO
109	mail(1),	109	mail(1),
Lines 269-295 Link Here
269		269
270	/* set from system and protocol used */	270	/* set from system and protocol used */
271	diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8	271	diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
272	--- smrsh/smrsh.8 Tue Jun 15 06:50:19 1999	272	--- smrsh/smrsh.8.orig Sat Dec 16 00:18:40 2000
273	+++ src/contrib/sendmail/smrsh/smrsh.8 Wed Oct 4 23:19:47 2000	273	+++ smrsh/smrsh.8 Sun Dec 31 10:37:02 2000
274	@@ -11,6 +11,8 @@	274	@@ -11,6 +11,8 @@
275	.\"	275	.\"
276	.\" $Id: smrsh.8,v 8.11 1999/06/09 16:51:07 ca Exp $	276	.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
277	.\"	277	.\"
278	+.\" $FreeBSD: ports/mail/sendmail/files/patch-aa,v 1.1 2000/12/21 07:32:18 will Exp $	278	+.\" $FreeBSD: ports/mail/sendmail/files/patch-aa,v 1.1 2000/12/21 07:32:18 will Exp $
279	+.\"	279	+.\"
280	.TH SMRSH 8 11/02/93	280	.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
281	.SH NAME	281	.SH NAME
282	smrsh \- restricted shell for sendmail	282	smrsh \- restricted shell for sendmail
283	@@ -38,7 +40,7 @@	283	@@ -39,7 +41,7 @@
284	Briefly,
285	.I smrsh	284	.I smrsh
286	limits programs to be in the directory	285	limits programs to be in a single directory,
		286	by default
287	-/usr/adm/sm.bin,	287	-/usr/adm/sm.bin,
288	+/usr/libexec/sm.bin,	288	+/usr/libexec/sm.bin,
289	allowing the system administrator to choose the set of acceptable commands,	289	allowing the system administrator to choose the set of acceptable commands,
290	and to the shell builtin commands ``exec'', ``exit'', and ``echo''.	290	and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
291	It also rejects any commands with the characters	291	It also rejects any commands with the characters
292	@@ -49,16 +51,15 @@	292	@@ -50,13 +52,12 @@
293	``"\|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user \|\| exit 75"''	293	``"\|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user \|\| exit 75"''
294	.PP	294	.PP
295	Initial pathnames on programs are stripped,	295	Initial pathnames on programs are stripped,
Lines 304-315 Link Here
304	+``/usr/libexec/sm.bin/vacation''.	304	+``/usr/libexec/sm.bin/vacation''.
305	.PP	305	.PP
306	System administrators should be conservative about populating	306	System administrators should be conservative about populating
307	-/usr/adm/sm.bin.	307	the sm.bin directory.
308	+/usr/libexec/sm.bin.	308	@@ -78,11 +79,11 @@
309	Reasonable additions are
310	.IR vacation (1),
311	.IR procmail (1),
312	@@ -77,11 +78,11 @@
313	Compilation should be trivial on most systems.	309	Compilation should be trivial on most systems.
314	You may need to use \-DPATH=\e"\fIpath\fP\e"	310	You may need to use \-DPATH=\e"\fIpath\fP\e"
315	to adjust the default search path	311	to adjust the default search path