svn commit: r361720 - in head: etc etc/mail usr.sbin/mailwrapper

[John Baldwin]

On 6/29/20 9:52 AM, Cy Schubert wrote:
> In message <475e0172-0a4a-0201-3e2f-9e231b75f3e9 at FreeBSD.org>, John Baldwin 
> wri
> tes:
>> On 6/1/20 7:38 PM, Kyle Evans wrote:
>>> Author: kevans
>>> Date: Tue Jun  2 02:38:54 2020
>>> New Revision: 361720
>>> URL: https://svnweb.freebsd.org/changeset/base/361720
>>>
>>> Log:
>>>   pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL
>>>   
>>>   When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf th
>> at
>>>   conflict, and hilarity ensues. There's currently three different places t
>> hat
>>>   we might install mailer.conf:
>>
>> Something about this change has made etcupdate stop updating this file.
>> Perhaps it is now a "plain" FILE instead of a config file, so 'installconfig'
>> no longer installs it?  Given that users do edit this file (e.g. if using
>> postfix from ports), it does seem like this should be treated as a config
>> file?
> 
> Yes, plain file vs config file. There was a change a couple of months ago 
> by someone else that changed config files to plain files which totally 
> messed up /etc after etcupdate was run. It also affected mergemaster BTW.
> 
> If pkgbase needs config files to be plain files we might need a knob to 
> make it so when pkgbase is invoking make.

pkgbase understands config files I believe, I think it was just a bug in this
commit to not set a suitable Makefile variable so mailer.conf is a "config"
file.

-- 
John Baldwin