From owner-freebsd-pkgbase@freebsd.org Sun Jun 7 10:14:54 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 80F4934EB3A for ; Sun, 7 Jun 2020 10:14:54 +0000 (UTC) (envelope-from matthew@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 49fsgy225hz4NW1 for ; Sun, 7 Jun 2020 10:14:54 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.infracaninophile.co.uk (smtp.infracaninophile.co.uk [81.2.117.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.infracaninophile.co.uk", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: matthew/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id DD04D2F6B9 for ; Sun, 7 Jun 2020 10:14:53 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from liminal.local (unknown [IPv6:2001:8b0:151:1:bdb6:c043:2911:592f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: m.seaman@infracaninophile.co.uk) by smtp.infracaninophile.co.uk (Postfix) with ESMTPSA id 7B45D37C0 for ; Sun, 7 Jun 2020 10:14:51 +0000 (UTC) Authentication-Results: smtp.infracaninophile.co.uk; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: smtp.infracaninophile.co.uk/7B45D37C0; dkim=none; dkim-atps=neutral To: freebsd-pkgbase@freebsd.org From: Matthew Seaman Subject: Not getting expected 3-way merge Autocrypt: addr=matthew@FreeBSD.org; prefer-encrypt=mutual; keydata= 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 D2UGgsFXnd7KkBLadQs= Message-ID: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> Date: Sun, 7 Jun 2020 11:17:08 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc" 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 10:14:54 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc Content-Type: multipart/mixed; boundary="WDSiGIua2MhvB9ezqH9LA0V8HTeYj7tFj" --WDSiGIua2MhvB9ezqH9LA0V8HTeYj7tFj Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable 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. 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. Cheers, Matthew --WDSiGIua2MhvB9ezqH9LA0V8HTeYj7tFj-- --0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAl7cvqRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5OceeQ//c4fn6Ga+oi41fFfa56881n/ibhszKHhmlEyJhxnVqQWo7DGhdGEzjQTG /aisLHPM3utWEGH9HPacYe7jzZoirtT6+yDtbryEFv737WawrTDXSKINqmaBLaad v84Tr8bGZrbTSC+D8CeRBeSW2MmD7pnriSdUIA68+th8GfFtQlHLmks8nK0Czd3s EeGj/5UcpQlzlKsFKxg0nAt9OGXD3JFCPdvcz7m++lL7g71O8h1J+8GglhRjKe0D MHAT8yEzVQPYiUgEuU4UbOEyVmF4l+m8TJCpx0i3YWL+fDe1nD88c967FiHxPTRX HqkqIm1vlShi71DujC1HoZ1hHN3Vf0x6CkCu/DRuxUXVzG3piyWIfwHtHvfln4W5 J+4Y+bVoOzRDitEbZEcxX+Shvxe8yVCqR9W0qHU3kYq5pn1pwWpTv64zPWEc8Io6 3ojQiJNDrjI2ZzE7XmUW5yRN6ARc71TxTgkjaCbgnL1gwKQCHe9gwyY8Ydfd/6j0 TCS+0CkBErjbGQQQHAQq5uJc7jl8SjrP/170BKPzbCEIKxJ/HD4NYsZ8N/QM6ySb 7xr+lVV1pBIJ7w1m+U0wZKsRWfP2tEPVZ9CvrUnsS0QVfzqMTu12LoIPsRTMvUak 0S6yFCvk6EC034I5kLG6DDdXEmczChBq/r5bXIWoqvooksb7NyY= =MtvM -----END PGP SIGNATURE----- --0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc-- 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 From owner-freebsd-pkgbase@freebsd.org Mon Jun 8 05:28:51 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 737003432A5 for ; Mon, 8 Jun 2020 05:28:51 +0000 (UTC) (envelope-from matthew@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 49gMHR1pLGz4XHH; Mon, 8 Jun 2020 05:28:51 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.infracaninophile.co.uk (smtp.infracaninophile.co.uk [81.2.117.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.infracaninophile.co.uk", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: matthew/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EBDCA17FFB; Mon, 8 Jun 2020 05:28:50 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from liminal.local (unknown [IPv6:2001:8b0:151:1:b414:dfc8:8ea2:fe06]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: m.seaman@infracaninophile.co.uk) by smtp.infracaninophile.co.uk (Postfix) with ESMTPSA id 05C5AB0A1; Mon, 8 Jun 2020 05:28:48 +0000 (UTC) Authentication-Results: smtp.infracaninophile.co.uk; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: smtp.infracaninophile.co.uk/05C5AB0A1; dkim=none; dkim-atps=neutral Subject: Re: Not getting expected 3-way merge To: Kyle Evans Cc: freebsd-pkgbase@freebsd.org References: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> From: Matthew Seaman Autocrypt: addr=matthew@FreeBSD.org; prefer-encrypt=mutual; keydata= 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 D2UGgsFXnd7KkBLadQs= Message-ID: <045fe46b-537a-3a09-0e8b-9e4f2577f1f7@FreeBSD.org> Date: Mon, 8 Jun 2020 06:31:09 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF" 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: Mon, 08 Jun 2020 05:28:51 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF Content-Type: multipart/mixed; boundary="r4I5SLSJ07HH7MEAfOzZxzW6xpg3rJ0NL" --r4I5SLSJ07HH7MEAfOzZxzW6xpg3rJ0NL Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable On 07/06/2020 15:50, Kyle Evans wrote: > 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? >=20 Looks like that's exactly what happenend, according to my syslog: Jun 7 09:02:40 codling pkg[92260]: FreeBSD-utilities-13.0.s20200530093747 deinstalled Jun 7 09:02:40 codling pkg[92260]: FreeBSD-runtime-13.0.s20200530093747 deinstalled Jun 7 09:02:40 codling pkg[92260]: FreeBSD-runtime-development-13.0.s20200530093747 deinstalled Jun 7 09:02:42 codling pkg[92260]: FreeBSD-clibs upgraded: 13.0.s20200530093747 -> 13.0.s20200607031954 Jun 7 09:02:42 codling pkg[92260]: FreeBSD-ftp-13.0.s20200530093747 deinstalled Jun 7 09:02:42 codling pkg[92260]: FreeBSD-telnet-13.0.s20200530093747 deinstalled Jun 7 09:02:47 codling pkg[92260]: FreeBSD-runtime-13.0.s20200607031954 installed Jun 7 09:02:47 codling pkg[92260]: FreeBSD-wpa upgraded: 13.0.s20200530093747 -> 13.0.s20200607031954 Jun 7 09:02:47 codling pkg[92260]: FreeBSD-vi upgraded: 13.0.s20200530093747 -> 13.0.s20200607031954 Jun 7 09:02:59 codling pkg[92260]: FreeBSD-utilities-13.0.s20200607031954 installed Jun 7 09:02:59 codling pkg[92260]: FreeBSD-unbound upgraded: 13.0.s20200530093747 -> 13.0.s20200607031954 Jun 7 09:03:11 codling pkg[92260]: FreeBSD-tests upgraded: 13.0.s20200530093747 -> 13.0.s20200607031954 [...] There was a lot of churn with this upgrade to to all of the *-development packages being renamed to *-dev, a lot of which required manual cleanup. It would have gone a lot better if pkg(8) had some mechanism to understand that the two packages were related. Cheers, Matthew --r4I5SLSJ07HH7MEAfOzZxzW6xpg3rJ0NL-- --0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAl7dzR1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5OeSfxAAgFfXIOzFd1Vpmdb9GaZXOsEgSxCPaI2w2/hdncc1qzuVpQIiq5GAz0d/ 8RXS+bw0E7R9ckX9KWdOQprkucw03iZPFrtFuFp0whIguAo4V/iDFYIzlGOu2HIA tK406AXtcBS4U5kHxOWi0+T1I0W4FBg6Cye//I4ys/tOANogzZVTB7J4aqjKsoDf e0/vZvHXM1uAQRBDEyE4rRyJdzH9cMsDkrrF2mJ0V+69/Q2AKe5JsefoKyZ6IB8n c0rUvK45SdxnrAz+2b7p41JTzX9EV6A4nsNxnkEaIQms1ym2tTW/r6HPeuzbpkRO flw9K0fXAcGddGZQRMVttogTEko2ewn4pLLw1XQm7RaIc9W99uC6gun3S0MnuYFS PmFiVKg9Gu/6zfsQMTokjelyi6U3CeIyjiOceXCKMDx/lgauHMSd3a56C6InarL7 Agtm8tez+uFFWG7LVygG8FLexFmiuvOrKwy/qAnoxVWu0QNW58e6VOBwxAq5uUpG gYxSlHTSSIcAUwFpsh1nDuHMYgdOh0Lg9TLC1zP3fgIBfZs/S0oRQGpKG4HTtyK6 MTKqQ+zaOjUGB77EFp0MpoQVur2LnmGj9U7E8H6XAUUCCLXWbfuY8pCZmHNAbE1I uyjHm5W7OaKvr/Q/wg36VIFXdMX36kF6jCe+gQ7bgefA6e/Kwtw= =6dY7 -----END PGP SIGNATURE----- --0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF-- From owner-freebsd-pkgbase@freebsd.org Mon Jun 8 05:45:18 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 DF71834392D for ; Mon, 8 Jun 2020 05:45:18 +0000 (UTC) (envelope-from matthew@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 49gMfQ3frmz4ZHN for ; Mon, 8 Jun 2020 05:45:18 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.infracaninophile.co.uk (smtp.infracaninophile.co.uk [81.2.117.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.infracaninophile.co.uk", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: matthew/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 3418B185A7 for ; Mon, 8 Jun 2020 05:45:18 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from liminal.local (unknown [IPv6:2001:8b0:151:1:b414:dfc8:8ea2:fe06]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: m.seaman@infracaninophile.co.uk) by smtp.infracaninophile.co.uk (Postfix) with ESMTPSA id 2D575B038 for ; Mon, 8 Jun 2020 05:45:17 +0000 (UTC) Authentication-Results: smtp.infracaninophile.co.uk; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: smtp.infracaninophile.co.uk/2D575B038; dkim=none; dkim-atps=neutral Subject: Re: Not getting expected 3-way merge To: freebsd-pkgbase@freebsd.org References: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> <045fe46b-537a-3a09-0e8b-9e4f2577f1f7@FreeBSD.org> From: Matthew Seaman Autocrypt: addr=matthew@FreeBSD.org; prefer-encrypt=mutual; keydata= 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 D2UGgsFXnd7KkBLadQs= Message-ID: Date: Mon, 8 Jun 2020 06:47:37 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <045fe46b-537a-3a09-0e8b-9e4f2577f1f7@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="EowipOGwAzdepJYLKJv73XoBws2WSQhZj" 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: Mon, 08 Jun 2020 05:45:19 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EowipOGwAzdepJYLKJv73XoBws2WSQhZj Content-Type: multipart/mixed; boundary="od8UlGiOjWSOMOS4Nt6O9HSgrHs6KUZy1" --od8UlGiOjWSOMOS4Nt6O9HSgrHs6KUZy1 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable On 08/06/2020 06:31, Matthew Seaman wrote: > On 07/06/2020 15:50, Kyle Evans wrote: >> 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? >> >=20 > Looks like that's exactly what happenend, according to my syslog: >=20 > Jun 7 09:02:40 codling pkg[92260]: > FreeBSD-utilities-13.0.s20200530093747 deinstalled > Jun 7 09:02:40 codling pkg[92260]: FreeBSD-runtime-13.0.s2020053009374= 7 > deinstalled > Jun 7 09:02:40 codling pkg[92260]: > FreeBSD-runtime-development-13.0.s20200530093747 deinstalled > Jun 7 09:02:42 codling pkg[92260]: FreeBSD-clibs upgraded: > 13.0.s20200530093747 -> 13.0.s20200607031954 > Jun 7 09:02:42 codling pkg[92260]: FreeBSD-ftp-13.0.s20200530093747 > deinstalled > Jun 7 09:02:42 codling pkg[92260]: FreeBSD-telnet-13.0.s20200530093747= > deinstalled > Jun 7 09:02:47 codling pkg[92260]: FreeBSD-runtime-13.0.s2020060703195= 4 > installed > Jun 7 09:02:47 codling pkg[92260]: FreeBSD-wpa upgraded: > 13.0.s20200530093747 -> 13.0.s20200607031954 > Jun 7 09:02:47 codling pkg[92260]: FreeBSD-vi upgraded: > 13.0.s20200530093747 -> 13.0.s20200607031954 > Jun 7 09:02:59 codling pkg[92260]: > FreeBSD-utilities-13.0.s20200607031954 installed > Jun 7 09:02:59 codling pkg[92260]: FreeBSD-unbound upgraded: > 13.0.s20200530093747 -> 13.0.s20200607031954 > Jun 7 09:03:11 codling pkg[92260]: FreeBSD-tests upgraded: > 13.0.s20200530093747 -> 13.0.s20200607031954 > [...] >=20 > There was a lot of churn with this upgrade to to all of the > *-development packages being renamed to *-dev, a lot of which required > manual cleanup. It would have gone a lot better if pkg(8) had some > mechanism to understand that the two packages were related. Github issue https://github.com/freebsd/pkg/issues/1845 raised. Cheers, Matthew --od8UlGiOjWSOMOS4Nt6O9HSgrHs6KUZy1-- --EowipOGwAzdepJYLKJv73XoBws2WSQhZj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAl7d0PlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5Of06g//eJhiZjy4KznYmnxnD/eZWjhXQQ9h2rCCUytvqN1mLaESXn6K9rLAkWEJ hx0hSGyHCKMZOG3x7ybr+sE6kdLCRQRaD6swn5dl0bFJ8q7923A+aXVxzmuHgbfC +bouHZtLgQpBsb6gTfHQIGsx/6Xa9MwJzb0pd2ZAvcYgOH5s9hA1J0j46ls7HWFx 7had/5CRBWQCXefcdJQE5Z0+H1E1VYS3gz9JjBzl9S5SG5StN7DgWSqKzrnIp6it K2+cNe4vmwT+kRIt7Mblgd54gK3rGxmGBysEfw9jJzbE7cRSIGJsm5DkRPTvT0BG JFt8NLt80ACWoMusB2KEmYfRKs9sKG0AeiL9kOMl1547FH4VC0zPtx91fQG4SsKC 3duwqDBL8DW7HgKT6MP67EykSzgLgEXKQNVoZXlBn49f3VlVNrzVCFV/uiF0JP98 XPWzbJpR3RQQk0jsGH7JtX9qY7Ie/cj4ytlIP2HB/egDwTSOJqbtPr9k1FQj1Aml PG1gv+QzC6EH2bSoiCFofuUlGQb4H7d3ZzhjpxwyUrvGu3NckhCEWAtm3LTfegVe DR9Z++q2Svr0JKUqXMwXYGTib7Zh6izlHILpPfhwJ/H9C/srq82BW5f69L1YmJuT EasK6i646inpYTTj/lUVnb5AxympJBER5RLPXWwOUHfhFSsJxI0= =7CK6 -----END PGP SIGNATURE----- --EowipOGwAzdepJYLKJv73XoBws2WSQhZj--