From owner-freebsd-pkgbase@freebsd.org Sun Jun 7 14:51:07 2020 Return-Path: Delivered-To: freebsd-pkgbase@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 338A632E04C for ; Sun, 7 Jun 2020 14:51:07 +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 49fzpg0fH4z3gJl; Sun, 7 Jun 2020 14:51:07 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (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 0C3D31190B; Sun, 7 Jun 2020 14:51:07 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f50.google.com with SMTP id cv17so7119776qvb.13; Sun, 07 Jun 2020 07:51:07 -0700 (PDT) X-Gm-Message-State: AOAM5313H5OllUf+Q2mB+DDezArCZr6DSr5PCiUnWMBOx38TulNNvbnh Ji87dgUwQSQz+W0TwASRpMln8e81PQFD88tMKmg= X-Google-Smtp-Source: ABdhPJw+tYmrYLHc90MunmqN41TQalBUwrVwpcQJjI++ex6T6InU9qdE0ZtISssQCyjRZSSMSEgQ16HAKFqWqcIMTvc= X-Received: by 2002:a05:6214:405:: with SMTP id z5mr17873729qvx.112.1591541466555; Sun, 07 Jun 2020 07:51:06 -0700 (PDT) MIME-Version: 1.0 References: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> In-Reply-To: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> From: Kyle Evans Date: Sun, 7 Jun 2020 09:50:55 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Not getting expected 3-way merge To: Matthew Seaman Cc: freebsd-pkgbase@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-pkgbase@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "Packaging the FreeBSD base system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jun 2020 14:51:07 -0000 On Sun, Jun 7, 2020 at 5:14 AM Matthew Seaman wrote: > > I just had a somewhat amusing time updating my CURRENT pkgbase VM. > > pkg(8) managed to blow away my /etc/master.passwd and /etc/group, > replacing them with default versions. I believe this was triggered by > the introduction of the new 'test' user and group upstream. Luckily I > noticed pretty quickly and could manually merge with the copies from > /var/backup, before I did anything like trying to reboot. That would > have got me locked out of the system. > > Now, `pkg info -R FreeBSD-runtime-13.0.s20200607031954` lists both of > those files under the `config` section -- so presumably, pkg(8) should > do a 3-way merge? Is there something I'm missing here? This seems too > obvious a bug not to have been squashed already. > Hmm, I think pkg executed the merge successfully when the test user was introduced here. Do you still have the transcript from this upgrade available to make sure that it didn't deinstall -runtime due to a conflict before reinstalling it? I spoke with bapt and manu about this a week or two ago when I used WITHOUT_SENDMAIL=yes and hit a conflict on /etc/mail/mailer.conf, because that's not really ideal from a user perspective. > I also find that /etc/mail/aliases keeps getting overwritten -- but that > file is not listed in the `config` section in the FreeBSD-runtime > manifest, which I think it probably should be. > Yeah, I noticed that when I was fixing the mailer.conf conflict... ^/usr.sbin/mailwrapper handles mailer.conf as a FILES (it never got converted to CONFS) while dmagent handles it as CONFS, and the ^/etc/Makefile installation of aliases does a straight install with just a package tag of aliases along with the various .sample/Makefile/README. aliases should be split out. Thanks, Kyle Evans