Index: stable/4/contrib/sendmail/FREEBSD-upgrade =================================================================== --- stable/4/contrib/sendmail/FREEBSD-upgrade (revision 121761) +++ stable/4/contrib/sendmail/FREEBSD-upgrade (revision 121762) @@ -1,95 +1,96 @@ $FreeBSD$ sendmail 8.12.10 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: Build cf/cf/Build cf/cf/generic-*.cf devtools/* doc/op/op.ps */Build [e-v]*/*.0 sendmail/makesendmail sendmail/sysexits.h The following directories were renamed: sendmail -> src Imported using: cvs import -m 'Import sendmail 8.12.10' \ src/contrib/sendmail SENDMAIL v8_12_10 To make local changes to sendmail, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) branch. All local changes should be submitted to the Sendmail Consortium for inclusion in the next vendor release. The following files make up the sendmail build/install/runtime infrastructure in FreeBSD: Makefile.inc1 bin/Makefile bin/rmail/Makefile contrib/sendmail/ etc/Makefile etc/defaults/make.conf (RELENG_4) etc/defaults/periodic.conf etc/defaults/rc.conf etc/mail/Makefile etc/mail/README etc/mail/access.sample etc/mail/aliases etc/mail/mailer.conf etc/mail/mailertable.sample etc/mail/virtusertable.sample etc/mtree/BSD.include.dist etc/mtree/BSD.sendmail.dist etc/mtree/BSD.usr.dist etc/mtree/BSD.var.dist etc/periodic/daily/440.status-mailq etc/periodic/daily/500.queuerun etc/rc etc/sendmail/Makefile etc/sendmail/freebsd.mc + etc/sendmail/freebsd.submit.mc etc/sendmail/freefall.mc etc/sendmail/rc.sendmail lib/Makefile lib/libmilter/Makefile lib/libsm/Makefile lib/libsmdb/Makefile lib/libsmutil/Makefile libexec/Makefile libexec/mail.local/Makefile libexec/smrsh/Makefile share/Makefile share/doc/smm/Makefile share/doc/smm/08.sendmailop/Makefile share/examples/etc/make.conf (HEAD) share/man/man5/make.conf.5 share/man/man5/periodic.conf.5 share/man/man5/rc.conf.5 share/man/man7/hier.7 share/man/man8/Makefile share/man/man8/rc.sendmail.8 share/mk/bsd.libnames.mk share/sendmail/Makefile usr.bin/Makefile usr.bin/vacation/Makefile usr.sbin/Makefile usr.sbin/editmap/Makefile usr.sbin/mailstats/Makefile usr.sbin/makemap/Makefile usr.sbin/praliases/Makefile usr.sbin/sendmail/Makefile usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org 19-September-2003 Index: stable/4/etc/sendmail/Makefile =================================================================== --- stable/4/etc/sendmail/Makefile (revision 121761) +++ stable/4/etc/sendmail/Makefile (revision 121762) @@ -1,109 +1,99 @@ # @(#)Makefile 8.19 (Berkeley) 1/14/97 # $FreeBSD$ M4= m4 CHMOD= chmod ROMODE= 444 RM= rm -f SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src SENDMAIL_CF_DIR?=${SENDMAIL_DIR}/cf # this is overkill, but.... M4FILES!= find ${SENDMAIL_CF_DIR} -type f -name '*.m4' -print .SUFFIXES: .mc .cf .mc.cf: ${M4FILES} ${RM} ${.TARGET} ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET} ${CHMOD} ${ROMODE} ${.TARGET} DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf DEST_SUBMIT_CF= ${DESTDIR}/etc/mail/submit.cf ALL= freebsd.cf freebsd.submit.cf CLEANFILES= freebsd.cf freebsd.submit.cf # Local SENDMAIL_MC or SENDMAIL_CF may be set in /etc/make.conf. # Warning! If set, this causes 'make install' to always copy it # over /etc/mail/sendmail.cf!!! # Caveat emptor! Be sure you want this before you enable it. .if defined(SENDMAIL_MC) INSTALL_CF= ${SENDMAIL_MC:T:R}.cf ALL+= ${INSTALL_CF} CLEANFILES+= ${SENDMAIL_MC:T:R}.cf ${INSTALL_CF}: ${SENDMAIL_MC} .elif defined(SENDMAIL_CF) ALL+= ${SENDMAIL_CF} INSTALL_CF= ${SENDMAIL_CF} .endif .if !defined(SENDMAIL_SET_USER_ID) && defined(SENDMAIL_SUBMIT_MC) INSTALL_SUBMIT_CF= ${SENDMAIL_SUBMIT_MC:T:R}.cf ALL+= ${INSTALL_SUBMIT_CF} CLEANFILES+= ${INSTALL_SUBMIT_CF} ${INSTALL_SUBMIT_CF}: ${SENDMAIL_SUBMIT_MC} .endif # Additional .cf files to build. .if defined(SENDMAIL_ADDITIONAL_MC) SENDMAIL_ADDITIONAL_CF= ${SENDMAIL_ADDITIONAL_MC:T:S/.mc$/.cf/} ALL+= ${SENDMAIL_ADDITIONAL_CF} CLEANFILES+= ${SENDMAIL_ADDITIONAL_CF} .for mc in ${SENDMAIL_ADDITIONAL_MC} ${mc:T:R}.cf: ${mc} .endfor .endif all: ${ALL} -# Build the installed submit.cf from the sendmail distributed submit.mc. -freebsd.submit.cf: ${SENDMAIL_CF_DIR}/cf/submit.mc - ${RM} ${.TARGET} - ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \ - ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.ALLSRC} > ${.TARGET} - ${CHMOD} ${ROMODE} ${.TARGET} - install distribution: .if defined(SENDMAIL_MC) && defined(SENDMAIL_CF) @echo ">>> ERROR: Both SENDMAIL_MC and SENDMAIL_CF cannot be set" @false .endif .if make(distribution) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${SENDMAIL_CF_DIR}/cf/submit.mc \ - ${DESTDIR}/etc/mail/freebsd.submit.mc - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - freebsd.submit.cf ${DESTDIR}/etc/mail + ${.CURDIR}/freebsd.submit.mc freebsd.submit.cf ${DESTDIR}/etc/mail ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${SMDIR}/helpfile ${DESTDIR}/etc/mail ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \ /dev/null ${DESTDIR}/var/log/sendmail.st .endif .if defined(INSTALL_CF) && ${INSTALL_CF} != ${DEST_CF} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_CF} ${DEST_CF} .elif make(distribution) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ freebsd.cf ${DEST_CF} .endif .if defined(SENDMAIL_ADDITIONAL_CF) && make(install) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail .endif .if !defined(SENDMAIL_SET_USER_ID) .if defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .elif make(distribution) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ freebsd.submit.cf ${DEST_SUBMIT_CF} .endif .endif .include