Date: Mon, 12 Oct 2015 21:02:36 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289200 - in head: . etc/sendmail Message-ID: <201510122102.t9CL2aHq038087@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Mon Oct 12 21:02:36 2015 New Revision: 289200 URL: https://svnweb.freebsd.org/changeset/base/289200 Log: If world is built with a custom sendmail.cf, use it for the distribution target. This is the feeder for mergemaster / etcupdate. This change makes installworld/mergemaster/etcupdate behave the same regardless of whether SENDMAIL_MC or SENDMAIL_CF is used. If you use a custom SENDMAIL_MC/CF in make.conf and excluded it from mergemaster.rc/etcupdate.conf to work around the conflicts, you may wish to revert that or change it from 'ignore' to 'always install'. If you do not use a custom SENDMAIL_MC/CF, there should be no change in behavior. Modified: head/UPDATING head/etc/sendmail/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Oct 12 20:21:17 2015 (r289199) +++ head/UPDATING Mon Oct 12 21:02:36 2015 (r289200) @@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151012: + If you specify SENDMAIL_MC or SENDMAIL_CF in make.conf, mergemaster + and etcupdate will now use this file. A custom sendmail.cf is now + updated via this mechanism rather than via installworld. If you had + excluded sendmail.cf in mergemaster.rc or etcupdate.conf, you may + want to remove the exclusion or change it to "always install". + /etc/mail/sendmail.cf is now managed the same way regardless of + whether SENDMAIL_MC/SENDMAIL_CF is used. If you are not using + SENDMAIL_MC/SENDMAIL_CF there should be no change in behavior. + 20151011: Compatibility shims for legacy ATA device names have been removed. It includes ATA_STATIC_ID kernel option, kern.cam.ada.legacy_aliases Modified: head/etc/sendmail/Makefile ============================================================================== --- head/etc/sendmail/Makefile Mon Oct 12 20:21:17 2015 (r289199) +++ head/etc/sendmail/Makefile Mon Oct 12 21:02:36 2015 (r289200) @@ -72,24 +72,25 @@ distribution: ${SMDIR}/helpfile ${DESTDIR}/etc/mail ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \ /dev/null ${DESTDIR}/var/log/sendmail.st - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - freebsd.cf ${DEST_CF} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - freebsd.submit.cf ${DEST_SUBMIT_CF} - -install: -.if defined(INSTALL_CF) && ${INSTALL_CF} != ${DEST_CF} +.if defined(INSTALL_CF) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_CF} ${DEST_CF} +.else + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + freebsd.cf ${DEST_CF} .endif .if defined(SENDMAIL_ADDITIONAL_CF) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail .endif -.if !defined(SENDMAIL_SET_USER_ID) && \ - defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ +.if !defined(SENDMAIL_SET_USER_ID) +.if defined(INSTALL_SUBMIT_CF) + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} +.else + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ + freebsd.submit.cf ${DEST_SUBMIT_CF} +.endif .endif .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510122102.t9CL2aHq038087>