From owner-svn-src-stable@freebsd.org Sat Apr 20 18:16:24 2019 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 408F115720C8 for ; Sat, 20 Apr 2019 18:16:24 +0000 (UTC) (envelope-from 0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@amazonses.com) Received: from a8-176.smtp-out.amazonses.com (a8-176.smtp-out.amazonses.com [54.240.8.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9BC646D1E6 for ; Sat, 20 Apr 2019 18:16:23 +0000 (UTC) (envelope-from 0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1555783958; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type; bh=vsEmpfbgpnePpFEnjMW68YEbS7xvLTOk75YrVb3iK1Q=; b=nSgtXn/AUEtpS79AJhDp8D/qA+3E0Bf54b26nZbUfF/t0Ex5vDgG9S6fywUDMUCe gHlca7YE/xaKNc1tUlsiQUiTwwp+CpSruZh985QUwJEaNn7uVsTfyVhSI0wanrIg6dk z6EueQzNvMjpmwTRuyhUJBFtpxFOv/BoNnWjKASo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1555783958; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Feedback-ID; bh=vsEmpfbgpnePpFEnjMW68YEbS7xvLTOk75YrVb3iK1Q=; b=esHVgGZmAwsjsls/oSfay2mLSsLmRwI1pcWDKGHwNOJZxECVkJ38nhIJvJcB9NUb DXwCo2NwQsprXG6MyOn6/OY4mN+wt/jmBZjw6rvVoYb2jANTXqXb0/KernHZkXY9LfJ dakigKHg7Z2/U233w1WEdN9N0n1DH75QsIp9JFX8= Subject: Re: svn commit: r340905 - in stable/12: release/pkg_repos usr.sbin/pkg To: Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org, portmgr@freebsd.org References: <201811241747.wAOHlr6W029937@repo.freebsd.org> <0100016a32795508-fd8bbc41-2b38-40ae-903a-e3ef3739dfd8-000000@email.amazonses.com> <20190419130522.GI39941@FreeBSD.org> From: Colin Percival Openpgp: preference=signencrypt Autocrypt: addr=cperciva@tarsnap.com; prefer-encrypt=mutual; keydata= mQGhBElrAAcRBACDfDys4ZtK+ErCJ1HAzYeteKpm3OEsvT/49AjUTLihkF79HhIKrCQU+1KC zv7BwHCMLb6hq30As9L7iFKG7n5QFLFC4Te/VcITUnWHMG/c3ViLOfJGvi+9/nOEHaM1dVJY D6tEp5yM1nHmVQpo9932j4KGuGFR0LhOK5IHXOSfGwCgxSFDPdgxe2OEjWxjGgY+oV3EafcD +JROXCTjlcQiG/OguQH4Vks3mhHfFnEppLxTkDuYgHZQiUtpcT9ssH5khgqoTyMar05OUdAj ZIhNbWDh4LgTj+7ZmvLhXT5Zxw8LX9d7T36aTB8XDQSenDqEtinMWOb0TCBBLbsB8EFG1WTT ESbZci9jJS5yhtktuZoY/eM8uXMD/3k4FWFO80VRRkELSp+XSy/VlSQjyi/rhl2nQq/oOA9F oJbDaB0yq9VNhxP+uFBzBWSqeIX0t1ZWLtNfVFr4TRP5hihI5ICrg/0OpqgisKsU2NFe9xyO hyJLYmfD8ebpDJ/9k30C7Iju9pVrwLm1QgS4S2fqJRcR+U4WbjvP7CgStCVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+iGEEExECACEFAklrALYCGwMHCwkIBwMCAQQV AggDBBYCAwECHgECF4AACgkQOM7KaQxqam6/igCgn+z2k3V5ggNppmWrZstt1U2lugsAoL7L wS9V9yLtil3oWmHtwpUqYruEuQINBElrAAcQCAD3ZLMIsP4CIDoJORg+YY0lqLVBgcnF7pFb 4Uy2+KvdWofN+DKH61rZLjgXXkNE9M4EQC1B4lGttBP8IY2gs41y3AUogGdyFbidq99rCBz7 LTsgARHwFxZoaHmXyiZLEU1QZuMqwPZV1mCviRhN5E3rRqYNXVcrnXAAuhBpvNyj/ntHvcDN 2/m+ochiuBYueU4kX3lHya7sOj+mTsndcWmQ9soOUyr8O0r/BG088bMn4qqtUw4dl5/pglXk jbl7uOOPinKf0WVd2r6M0wLPJCD4NPHrCWRLLLAjwfjrtoSRvXxDbXhCdgGBa72+K8eYLzVs hgq7tJOoBWzjVK6XRxR7AAMGB/9Mo3iJ2DxqDecd02KCB5BsFDICbJGhPltU7FwrtbC7djSb XUrwsEVLHi4st4cbdGNCWCrp0BRezXZKohKnNAPFOTK++ZfgeKxrV2sJod+Q9RILF86tQ4XF 7A7Yme5hy92t/WgiU4vc/fWbgP8gV/19f8nunaT2E9NSa70mZFjZNu4iuwThoUUO5CV3Wo0Y UISsnRK8XD1+LR3A2qVyLiFRwh/miC1hgLFCTGCQ3GLxZeZzIpYSlGdQJ0L5lixW5ZQD9r1I 8i/8zhE6qRFAM0upUMI3Gt1Oq2w03DiXrZU0Fu/R8Rm8rlnkQKA+95mRTUq1xL5P5NZIi4gJ Z569OPMFiEkEGBECAAkFAklrAAcCGwwACgkQOM7KaQxqam41igCfbaldnFTu5uAdrnrghESv EI3CAo8AoLkNMks1pThl2BJNRm4CtTK9xZeH Message-ID: <0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@email.amazonses.com> Date: Sat, 20 Apr 2019 18:12:38 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <20190419130522.GI39941@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------A0326B08556C6D6EF3308B02" Content-Language: en-US X-SES-Outgoing: 2019.04.20-54.240.8.176 Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-Rspamd-Queue-Id: 9BC646D1E6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57 header.b=nSgtXn/A; dkim=pass header.d=amazonses.com header.s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw header.b=esHVgGZm; spf=pass (mx1.freebsd.org: domain of 0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@amazonses.com designates 54.240.8.176 as permitted sender) smtp.mailfrom=0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@amazonses.com X-Spamd-Result: default: False [-2.58 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57,amazonses.com:s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; DMARC_NA(0.00)[tarsnap.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+]; MX_GOOD(-0.01)[cached: feedback-smtp.us-east-1.amazonses.com]; RCVD_IN_DNSWL_NONE(0.00)[176.8.240.54.list.dnswl.org : 127.0.15.0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@amazonses.com]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-1.99)[ip: (-2.22), ipnet: 54.240.8.0/21(-4.59), asn: 14618(-3.08), country: US(-0.06)]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,0100016a3bf34041-41280f42-6540-44db-8c73-7f2dda333f10-000000@amazonses.com]; MIME_UNKNOWN(0.10)[text/x-patch] X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 18:16:24 -0000 This is a multi-part message in MIME format. --------------A0326B08556C6D6EF3308B02 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 4/19/19 6:05 AM, Glen Barber wrote: > On Thu, Apr 18, 2019 at 10:02:53PM +0000, Colin Percival wrote: >> On 11/24/18 9:47 AM, Glen Barber wrote: >>> Log: >>> Revert r340161 in stable/12, setting the default pkg(8) repository back >>> to 'latest' from 'quarterly' prior to branching releng/12.0. >> It looks like this is incorrect for non-x86 architectures. Portmgr may >> correct me here, but it looks like "latest" builds are only done on non-x86 >> architectures on HEAD. (The same problem also applies on stable/11.) >> >> I'm guessing that the answer here is to have different package configurations >> installed depending on the architecture; I knew how to do this with the old >> style of src/etc but I'm not sure how to do it now that pkgbase has spread >> configuration files all over the tree. > > For 13.0-CURRENT, both latest and quarterly are updated. For non-x86 on > 12.0-STABLE and 11.2-STABLE, quarterly is updated (not latest), so from > a general sense of this particular commit, it is correct. > > But you are also correct in your assertion that the current default > (latest) for non-x86 does appear to be incorrect. I think this patch does what we need in stable/12 -- installing a different FreeBSD.conf file depending on whether TARGET_ARCH is amd64/i386. I'm not sure if we should have anything similar in HEAD since we want to use "latest" packages on all architectures there; we might want to have both configuration files in HEAD but always install the same one there. Let me know what you'd like done; this is the last issue (aside from MFCs) blocking ARM64 AMIs from working on stable/12. -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid --------------A0326B08556C6D6EF3308B02 Content-Type: text/x-patch; name="FreeBSD-conf.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="FreeBSD-conf.diff" Index: usr.sbin/pkg/FreeBSD.conf =================================================================== --- usr.sbin/pkg/FreeBSD.conf (revision 346346) +++ usr.sbin/pkg/FreeBSD.conf (nonexistent) @@ -1,16 +0,0 @@ -# $FreeBSD$ -# -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: -# -# mkdir -p /usr/local/etc/pkg/repos -# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf -# - -FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", - enabled: yes -} Property changes on: usr.sbin/pkg/FreeBSD.conf ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: usr.sbin/pkg/FreeBSD.conf.latest =================================================================== --- usr.sbin/pkg/FreeBSD.conf.latest (nonexistent) +++ usr.sbin/pkg/FreeBSD.conf.latest (working copy) @@ -0,0 +1,16 @@ +# $FreeBSD: stable/12/usr.sbin/pkg/FreeBSD.conf 340905 2018-11-24 17:47:53Z gjb $ +# +# To disable this repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# +# mkdir -p /usr/local/etc/pkg/repos +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# + +FreeBSD: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} Index: usr.sbin/pkg/FreeBSD.conf.quarterly =================================================================== --- usr.sbin/pkg/FreeBSD.conf.quarterly (nonexistent) +++ usr.sbin/pkg/FreeBSD.conf.quarterly (working copy) @@ -0,0 +1,16 @@ +# $FreeBSD: stable/12/usr.sbin/pkg/FreeBSD.conf 340905 2018-11-24 17:47:53Z gjb $ +# +# To disable this repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# +# mkdir -p /usr/local/etc/pkg/repos +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# + +FreeBSD: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} Index: usr.sbin/pkg/Makefile =================================================================== --- usr.sbin/pkg/Makefile (revision 346346) +++ usr.sbin/pkg/Makefile (working copy) @@ -1,6 +1,12 @@ # $FreeBSD$ -CONFS= FreeBSD.conf +.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386" +CONFS= FreeBSD.conf.quarterly +.else +CONFS= FreeBSD.conf.latest +.endif +CONFSNAME= FreeBSD.conf + CONFSDIR= /etc/pkg CONFSMODE= 644 PROG= pkg --------------A0326B08556C6D6EF3308B02--