Date: Mon, 29 Jun 2020 10:29:57 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Emmanuel Vadot <manu@bidouilliste.com> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, John Baldwin <jhb@FreeBSD.org>, Kyle Evans <kevans@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r361720 - in head: etc etc/mail usr.sbin/mailwrapper Message-ID: <202006291729.05THTves005518@slippy.cwsent.com> In-Reply-To: <20200629190958.56a010736905355abb924952@bidouilliste.com> References: <202006020238.0522cswW076778@repo.freebsd.org> <475e0172-0a4a-0201-3e2f-9e231b75f3e9@FreeBSD.org> <202006291652.05TGqFvu005068@slippy.cwsent.com> <20200629190958.56a010736905355abb924952@bidouilliste.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20200629190958.56a010736905355abb924952@bidouilliste.com>, Emmanuel Vadot writes: > On Mon, 29 Jun 2020 09:52:15 -0700 > Cy Schubert <Cy.Schubert@cschubert.com> wrote: > > > In message <475e0172-0a4a-0201-3e2f-9e231b75f3e9@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.con > f th > > > at > > > > conflict, and hilarity ensues. There's currently three different plac > es 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 'installcon > fig' > > > 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. > > This was https://svnweb.freebsd.org/base?view=revision&revision=359294 > > > If pkgbase needs config files to be plain files we might need a knob to > > make it so when pkgbase is invoking make. > > It doesn't, pkg needs to know about config files, the problem with my > commit is more an etcupdate/mergemaster problem than a pkgbase one. > iirc etcupdate do a make distribution to find new files and diffs and > switching a config file from a plain files will cause the file to be > installed by installworld so etcupdate thinks that it was deleted. I've > tried a bit to fix that in etcupdate but couldn't find a proper way to > do it. Mergemaster also does make distribution. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006291729.05THTves005518>