From owner-svn-src-all@freebsd.org Mon Jun 29 16:52:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A340B34DFB9; Mon, 29 Jun 2020 16:52:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wYSN72R8z43vR; Mon, 29 Jun 2020 16:52:20 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id px0zj5lWKYYpxpx10jbeto; Mon, 29 Jun 2020 10:52:19 -0600 X-Authority-Analysis: v=2.3 cv=OubUNx3t c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=nTHF0DUjJn0A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=iUpnydi_MgWrUi0BTRUA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 2DF0825C; Mon, 29 Jun 2020 09:52:16 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 05TGqF9t005071; Mon, 29 Jun 2020 09:52:15 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 05TGqFvu005068; Mon, 29 Jun 2020 09:52:15 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202006291652.05TGqFvu005068@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: John Baldwin cc: Kyle Evans , 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 In-reply-to: <475e0172-0a4a-0201-3e2f-9e231b75f3e9@FreeBSD.org> References: <202006020238.0522cswW076778@repo.freebsd.org> <475e0172-0a4a-0201-3e2f-9e231b75f3e9@FreeBSD.org> Comments: In-reply-to John Baldwin message dated "Mon, 29 Jun 2020 08:46:43 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 29 Jun 2020 09:52:15 -0700 X-CMAE-Envelope: MS4wfEXHJm2v3M8lmyJm7T8P/QWP/cqJuB+zczE16VWkEnkKrvkC0VN2MLXR+AEIlIpL/ztQSUL96XkalqbXqzS0vM+gai3igfgv5cORBxBUtot32hTnn2dP h9O6vfB5GbYklN5arniJQOQhHxO38CdFMUquFkbMZWpGLOLhMYJvbaMJ73vhaHsavyPqf6CFMU8X89MXZJH4jwNChhF4nSzehM/5Whshk4NC/Sdmgn6MiBbz 69LJxsW6FhT7y+QbHSTZKos01TadF5dAOKiqOyMglTwRjtnpYEd4Tf5wJMRwlL3Xj8CRrxasdq/EYiEJu3XRtw== X-Rspamd-Queue-Id: 49wYSN72R8z43vR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2020 16:52:21 -0000 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.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. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.