From owner-svn-src-head@freebsd.org Mon Jun 29 17:10:03 2020 Return-Path: Delivered-To: svn-src-head@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 F2CC734EDDD; Mon, 29 Jun 2020 17:10:03 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wYrn2j2xz458Z; Mon, 29 Jun 2020 17:10:00 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1593450598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s+W/hGRub6ZRH0gNB7OaWQYidm48iycL9Ncbj9T1YXw=; b=hMVnezBre76XyIIprwOEPqvZ5emJCg7viFa5fn8Q5ut4F9Mgb/jw/iwfP9ikkAPVTFG/YT 0qsFLHaad8v274QeY8spCdYiS+yy+0mNXynRJMKKK4eJR53lcQcJArUb8G7Ms5zfZwGh3+ eht0ipAcFktmhh6Lbr5iQqt3tK40fto= Received: from amy.home (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 70c2e2e3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 29 Jun 2020 17:09:58 +0000 (UTC) Date: Mon, 29 Jun 2020 19:09:58 +0200 From: Emmanuel Vadot To: Cy Schubert Cc: John Baldwin , 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 Message-Id: <20200629190958.56a010736905355abb924952@bidouilliste.com> In-Reply-To: <202006291652.05TGqFvu005068@slippy.cwsent.com> References: <202006020238.0522cswW076778@repo.freebsd.org> <475e0172-0a4a-0201-3e2f-9e231b75f3e9@FreeBSD.org> <202006291652.05TGqFvu005068@slippy.cwsent.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49wYrn2j2xz458Z X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=hMVnezBr; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-2.97 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.01)[-1.010]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-0.42)[-0.422]; NEURAL_HAM_MEDIUM(-1.03)[-1.034]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2020 17:10:04 -0000 On Mon, 29 Jun 2020 09:52:15 -0700 Cy Schubert 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.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. 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. And no we won't want a knob to have a "pkgbase build", this will cause more problems. > > -- > 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. > > -- Emmanuel Vadot