From owner-svn-src-head@freebsd.org Mon Jun 29 17:13:00 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 D903334EE5D; Mon, 29 Jun 2020 17:13:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wYwD5NNzz45XN; Mon, 29 Jun 2020 17:13:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 9BAC4187ED; Mon, 29 Jun 2020 17:13:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f179.google.com with SMTP id c139so15902253qkg.12; Mon, 29 Jun 2020 10:13:00 -0700 (PDT) X-Gm-Message-State: AOAM530HJvxYbvoUh5buze1WNbv6pdQ5nZPOLRCObN/WKCYIvtVk4nGe 20H/flvo88TBwVp/mgMCAyHgrztEjksOmuaF6oU= X-Google-Smtp-Source: ABdhPJwJv9IR6WuLbwCyEyCviDrK1bmSc1TDpTszvZucQkbUnbXHZXHkXYwbzMIDTkggSh1STNexanLXYgB+wRD+FOk= X-Received: by 2002:a37:bcb:: with SMTP id 194mr16572038qkl.103.1593450780156; Mon, 29 Jun 2020 10:13:00 -0700 (PDT) MIME-Version: 1.0 References: <202006020238.0522cswW076778@repo.freebsd.org> <475e0172-0a4a-0201-3e2f-9e231b75f3e9@FreeBSD.org> In-Reply-To: <475e0172-0a4a-0201-3e2f-9e231b75f3e9@FreeBSD.org> From: Kyle Evans Date: Mon, 29 Jun 2020 12:12:48 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361720 - in head: etc etc/mail usr.sbin/mailwrapper To: John Baldwin Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" 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:13:00 -0000 On Mon, Jun 29, 2020 at 10:46 AM John Baldwin wrote: > > 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 that > > conflict, and hilarity ensues. There's currently three different places that > > 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? Ah, whoops, this is my bad indeed. :-( I had noticed that the mailwrapper install used FILES instead of CONFS like dma(8), but I forgot to go back and correct the inconsistency. Will fix ASAP. Thanks, Kyle Evans