mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-27 08:00:11 +00:00
Code Issues Releases Activity

The rest of the changes needed to support the new version of sendmail (8.11.0).

Browse Source 
Beyond changes to the build system, this includes fixing up the sample
freebsd.mc configuration for changes in defaults and syntax, removing
outdated documentation, and updating the release notes.
This commit is contained in:
Gregory Neil Shapiro 2000-08-12 22:39:25 +00:00
parent cd904b75f9
commit 88c75941e6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=64567
18 changed files with 220 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/rmail/Makefile
View File

@ -1,10 +1,23 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/sendmail/rmail
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/rmail
PROG= rmail
SRCS= rmail.c
MAN8= rmail.8
CFLAGS+=-I${SENDMAIL_DIR}/include
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMUTIL}
LDADD+= ${LIBSMUTIL}
# If you want to have your rmail queuing the mail only, uncomment the
# following:

6
etc/mail/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
all: access.db mailertable.db virtusertable.db \
# /etc/aliases.db
# /etc/mail/aliases.db
access.db: access
/usr/sbin/makemap hash access < access
@ -12,9 +12,9 @@ virtusertable.db: virtusertable
mailertable.db: mailertable
/usr/sbin/makemap hash mailertable < mailertable
#/etc/aliases.db: /etc/aliases
#/etc/mail/aliases.db: /etc/mail/aliases
# newaliases
mailertable:
@echo Generating empty mailertable
sed -e 's/^/#/' < mailertable.sample > mailertable

5
etc/sendmail/freebsd.mc
View File

@ -53,14 +53,15 @@ FEATURE(blacklist_recipients)dnl
FEATURE(virtusertable, `hash -o /etc/mail/virtusertable')dnl
dnl Uncomment to activate Realtime Blackhole List (recommended!)
dnl information available at http://maps.vix.com/rbl/
dnl FEATURE(rbl)dnl
dnl FEATURE(dnsbl)dnl
dnl Many sites reject email connections from dialup ip addresses
dnl by using the MAPS Dial-up User List (DUL). http://maps.vix.com/dul/
dnl Dialup users should uncomment and define this appropriately
dnl define(`SMART_HOST', `your.isp.mail.server')dnl
FEATURE(local_lmtp)dnl
define(`LOCAL_MAILER_FLAGS', LOCAL_MAILER_FLAGS`'P)dnl
define(`confCW_FILE', `-o /etc/mail/sendmail.cw')dnl
dnl Uncomment to change the location of the default /etc/mail/local-host-names
dnl define(`confCW_FILE', `-o /etc/mail/sendmail.cw')dnl
define(`confNO_RCPT_ACTION', `add-to-undisclosed')dnl
define(`confMAX_MIME_HEADER_LENGTH', `256/128')dnl
MAILER(local)dnl

7
lib/Makefile
View File

@ -26,7 +26,7 @@ SUBDIR= ${_csu} libcom_err ${_libcrypt} msun libmd \
libftpio libgnumalloc ${_libio} libipsec libipx libkvm libmenu \
${_libncp} \
libnetgraph libopie libpam libpanel libpcap \
libposix1e libresolv librpcsvc libss \
libposix1e libresolv librpcsvc ${_libsmdb} libss ${_libsmutil} \
libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
@ -43,6 +43,11 @@ _libc_r= libc_r
_libbind= libbind
.endif
.if !defined(NO_SENDMAIL)
_libsmdb= libsmdb
_libsmutil= libsmutil
.endif
_libcrypt= libcrypt
.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) && !defined(NO_DESCRYPT)
# Build both libraries. They have different names, so no harm,

17
lib/libsmdb/Makefile Normal file
View File

@ -0,0 +1,17 @@
# $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmdb
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
CFLAGS+=-DNEWDB -DNOT_SENDMAIL
LIB= smdb
SRCS+= smdb.c smdb1.c smdb2.c smndbm.c
INTERNALLIB= true
NOPIC= true
INTERNALSTATICLIB= true
.include <bsd.lib.mk>

17
lib/libsmutil/Makefile Normal file
View File

@ -0,0 +1,17 @@
# $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmutil
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
LIB= smutil
SRCS+= debug.c errstring.c lockfile.c safefile.c snprintf.c strl.c
INTERNALLIB= true
NOPIC= true
INTERNALSTATICLIB= true
.include <bsd.lib.mk>

17
libexec/mail.local/Makefile
View File

@ -1,13 +1,24 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/sendmail/mail.local \
${.CURDIR}/../../contrib/sendmail/src
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mail.local
PROG= mail.local
SRCS= mail.local.c snprintf.c
SRCS= mail.local.c
MAN8= mail.local.8
BINMODE=4555
INSTALLFLAGS=-fschg
CFLAGS+=-I${SENDMAIL_DIR}/include
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMUTIL}
LDADD+= ${LIBSMUTIL}
.include <bsd.prog.mk>

17
libexec/smrsh/Makefile
View File

@ -1,9 +1,22 @@
# @(#)Makefile 8.1 (Berkeley) 7/2/95
# $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/sendmail/smrsh
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/smrsh
PROG= smrsh
SRCS= smrsh.c
MAN8= smrsh.8
CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMUTIL}
LDADD+= ${LIBSMUTIL}
.include <bsd.prog.mk>

6
release/texts/alpha/RELNOTES.TXT
View File

@ -120,6 +120,12 @@ be run as more(1). [MERGED]
ls(1) can produce colorized listings with the -G flag (and appropriate
terminal support). [MERGED]
sendmail upgraded from version 8.9.3 to version 8.11.0. Important changes
include: new default file locations (see
/usr/src/contrib/sendmail/cf/README); newaliases is limited to root and
trusted users; and the MSA port (587) is turned on by default. See
/usr/src/contrib/sendmail/RELEASE_NOTES for more information.
2. Supported Configurations
---------------------------

7
release/texts/i386/RELNOTES.TXT
View File

@ -151,6 +151,13 @@ Network Address Translation), as well as new translation options.
FreeBSD can now be installed over an IPv6-only network. [MERGED]
sendmail upgraded from version 8.9.3 to version 8.11.0. Important changes
include: new default file locations (see
/usr/src/contrib/sendmail/cf/README); newaliases is limited to root and
trusted users; and the MSA port (587) is turned on by default. See
/usr/src/contrib/sendmail/RELEASE_NOTES for more information.
2. Supported Configurations
---------------------------

39
secure/usr.sbin/sendmail/Makefile
View File

@ -1,7 +1,8 @@
# @(#)Makefile 8.8 (Berkeley) 3/28/97
# $FreeBSD$
SMDIR= ${.CURDIR}/../../contrib/sendmail/src
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
.PATH: ${SMDIR}
BINDIR?=/usr/libexec/sendmail
@ -17,15 +18,15 @@ NIS= -DNIS
# Map extensions
MAPS= -DMAP_REGEX
CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
CFLAGS+=-D_FFR_MAX_MIME_HEADER_LENGTH
CFLAGS+=-D_FFR_MAX_HEADERS_LENGTH
CFLAGS+=-I${SMDIR} -I${SENDMAIL_DIR}/include
CFLAGS+=${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
SRCS= alias.c arpadate.c clock.c collect.c conf.c control.c convtime.c \
daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c \
main.c map.c mci.c mime.c parseaddr.c queue.c readcf.c recipient.c \
safefile.c savemail.c snprintf.c srvrsmtp.c stab.c stats.c \
sysexits.c trace.c udb.c usersmtp.c util.c version.c
SRCS= alias.c arpadate.c bf_torek.c clock.c collect.c conf.c control.c \
convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \
macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \
readcf.c recipient.c savemail.c sfsasl.c shmticklib.c srvrsmtp.c \
stab.c stats.c sysexits.c timers.c trace.c udb.c usersmtp.c util.c \
version.c
DPADD= ${LIBUTIL} ${LIBWRAP}
LDADD= -lutil -lwrap
MAN1= mailq.1 newaliases.1
@ -33,11 +34,21 @@ MAN5= aliases.5
MAN8= sendmail.8
BINMODE=4555
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMUTIL}
LDADD+= ${LIBSMUTIL}
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/sendmail.st
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/sendmail.hf \
${DESTDIR}/usr/share/misc
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
${DESTDIR}/etc/mail/helpfile
afterinstall:
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/sendmail.cf -a \
@ -46,5 +57,11 @@ afterinstall:
mv -f ${DESTDIR}/etc/sendmail.cf \
${DESTDIR}/etc/mail/sendmail.cf; \
fi
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/aliases -a \
! -f ${DESTDIR}/etc/mail/aliases ]; then \
set -x; \
cp ${DESTDIR}/etc/aliases \
${DESTDIR}/etc/mail/aliases; \
fi
.include <bsd.prog.mk>

11
share/doc/smm/09.sendmail/Makefile
View File

@ -1,11 +0,0 @@
# From: @(#)Makefile 8.2 (Berkeley) 2/28/94
# $FreeBSD$
VOLUME= smm/09.sendmail
SRCS= intro.me
MACROS= -me
USE_PIC= yes
SRCDIR= ${.CURDIR}/../../../../contrib/sendmail/doc/intro
.include <bsd.doc.mk>

2
share/doc/smm/Makefile
View File

@ -12,7 +12,7 @@
# 07.lpd
SUBDIR= title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \
06.nfs 08.sendmailop 09.sendmail 10.named 11.timedop \
06.nfs 08.sendmailop 10.named 11.timedop \
12.timed 18.net
.include <bsd.subdir.mk>

6
share/doc/smm/contents/contents.ms
View File

@ -30,6 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)00.contents 8.1 (Berkeley) 7/5/93
.\" $FreeBSD$
.\"
.OH '''SMM Contents'
.EH 'SMM Contents'''
@ -99,11 +100,6 @@ for the line printer spooling system.
The last word in installing and operating the \fIsendmail\fP program.
.ne 3
.IP
.tl 'Sendmail \- An Internetwork Mail Router''SMM:9'
.QP
An overview document on the design and implementation of \fIsendmail\fP.
.IP
.tl 'Name Server Operations Guide for BIND''SMM:10'
.QP

17
usr.sbin/mailstats/Makefile
View File

@ -1,9 +1,22 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96
# $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mailstats
PROG= mailstats
SRCS= mailstats.c
MAN8= mailstats.8
CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL
.PATH: ${.CURDIR}/../../contrib/sendmail/mailstats
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMUTIL}
LDADD+= ${LIBSMUTIL}
.include <bsd.prog.mk>

26
usr.sbin/makemap/Makefile
View File

@ -1,12 +1,30 @@
# @(#)Makefile 8.4 (Berkeley) 6/10/97
# $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/makemap
PROG= makemap
SRCS= makemap.c safefile.c snprintf.c
SRCS= makemap.c
MAN8= makemap.8
CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB -DNOT_SENDMAIL
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
CFLAGS+=-DNEWDB -DNOT_SENDMAIL
.PATH: ${.CURDIR}/../../contrib/sendmail/makemap \
${.CURDIR}/../../contrib/sendmail/src
.if exists(${.OBJDIR}/../../lib/libsmdb)
LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb
.else
LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR
.endif
LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMDB} ${LIBSMUTIL}
LDADD+= ${LIBSMDB} ${LIBSMUTIL}
.include <bsd.prog.mk>

25
usr.sbin/praliases/Makefile
View File

@ -1,9 +1,30 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96
# $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/sendmail/praliases
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/praliases
PROG= praliases
SRCS= praliases.c
MAN8= praliases.8
CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
CFLAGS+=-DNEWDB -DNOT_SENDMAIL
.if exists(${.OBJDIR}/../../lib/libsmdb)
LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb
.else
LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR
.endif
LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMDB} ${LIBSMUTIL}
LDADD+= ${LIBSMDB} ${LIBSMUTIL}
.include <bsd.prog.mk>

39
usr.sbin/sendmail/Makefile
View File

@ -1,7 +1,8 @@
# @(#)Makefile 8.8 (Berkeley) 3/28/97
# $FreeBSD$
SMDIR= ${.CURDIR}/../../contrib/sendmail/src
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
.PATH: ${SMDIR}
BINDIR?=/usr/libexec/sendmail
@ -17,15 +18,15 @@ NIS= -DNIS
# Map extensions
MAPS= -DMAP_REGEX
CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
CFLAGS+=-D_FFR_MAX_MIME_HEADER_LENGTH
CFLAGS+=-D_FFR_MAX_HEADERS_LENGTH
CFLAGS+=-I${SMDIR} -I${SENDMAIL_DIR}/include
CFLAGS+=${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
SRCS= alias.c arpadate.c clock.c collect.c conf.c control.c convtime.c \
daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c \
main.c map.c mci.c mime.c parseaddr.c queue.c readcf.c recipient.c \
safefile.c savemail.c snprintf.c srvrsmtp.c stab.c stats.c \
sysexits.c trace.c udb.c usersmtp.c util.c version.c
SRCS= alias.c arpadate.c bf_torek.c clock.c collect.c conf.c control.c \
convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \
macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \
readcf.c recipient.c savemail.c sfsasl.c shmticklib.c srvrsmtp.c \
stab.c stats.c sysexits.c timers.c trace.c udb.c usersmtp.c util.c \
version.c
DPADD= ${LIBUTIL} ${LIBWRAP}
LDADD= -lutil -lwrap
MAN1= mailq.1 newaliases.1
@ -33,11 +34,21 @@ MAN5= aliases.5
MAN8= sendmail.8
BINMODE=4555
.if exists(${.OBJDIR}/../../lib/libsmutil)
LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil
.else
LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
.endif
LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a
DPADD+= ${LIBSMUTIL}
LDADD+= ${LIBSMUTIL}
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/sendmail.st
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/sendmail.hf \
${DESTDIR}/usr/share/misc
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
${DESTDIR}/etc/mail/helpfile
afterinstall:
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/sendmail.cf -a \
@ -46,5 +57,11 @@ afterinstall:
mv -f ${DESTDIR}/etc/sendmail.cf \
${DESTDIR}/etc/mail/sendmail.cf; \
fi
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/aliases -a \
! -f ${DESTDIR}/etc/mail/aliases ]; then \
set -x; \
cp ${DESTDIR}/etc/aliases \
${DESTDIR}/etc/mail/aliases; \
fi
.include <bsd.prog.mk>