From owner-svn-src-user@freebsd.org Sat Sep 12 16:35:08 2020 Return-Path: Delivered-To: svn-src-user@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 14C233DD098 for ; Sat, 12 Sep 2020 16:35:08 +0000 (UTC) (envelope-from 01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (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 4BpdWt66Llz4CnL for ; Sat, 12 Sep 2020 16:35:06 +0000 (UTC) (envelope-from 01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1599928505; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=yjnlbkj/QKyBjBxhK5227d6oqyONZm/s2XQmDvnnT1w=; b=gxO6adStBGr7Qm+E7bfL53yr9aBhC8LqZ4vN+Implo7rWdQ242lbN2P9lW91DafP RVZoR4HknEo5eDgF2/F2ucTRKB6XOY9qM12ZEClnhrxflMZBKtoHTwdMKtFjH1cNeJW WJlTIhc1I4gLWGpxiAVKLIDVoVJ+GgEuXytpsGJU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=224i4yxa5dv7c2xz3womw6peuasteono; d=amazonses.com; t=1599928505; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=yjnlbkj/QKyBjBxhK5227d6oqyONZm/s2XQmDvnnT1w=; b=DeuvEFm/rTaBbHFKYxt2HBP1gaVsYReMlNNHCExi5+oXTlKAv2Re2yk7+s7rOrUZ Oiez4kaBXNhN0TCYULswyUiTIiWG7DkIFmArw4HF6Vw++z6bOv1uSVh2r+aBUh/T+x0 grlTELuOxTmhIhyOymojMzO+RljTfc5skqG4EokY= Subject: Re: svn commit: r365660 - user/cperciva/freebsd-update-build/patches/12.2-BETA1 To: Alan Somers , Gordon Tetlow Cc: src-committers , svn-src-user@freebsd.org References: <202009121518.08CFIqmE024560@repo.freebsd.org> From: Colin Percival 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: <01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@email.amazonses.com> Date: Sat, 12 Sep 2020 16:35:05 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-SES-Outgoing: 2020.09.12-54.240.8.237 Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-Rspamd-Queue-Id: 4BpdWt66Llz4CnL X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn header.b=gxO6adSt; dkim=pass header.d=amazonses.com header.s=224i4yxa5dv7c2xz3womw6peuasteono header.b=DeuvEFm/; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com designates 54.240.8.237 as permitted sender) smtp.mailfrom=01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com X-Spamd-Result: default: False [-0.92 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.993]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn,amazonses.com:s=224i4yxa5dv7c2xz3womw6peuasteono]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.99)[-0.990]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.237:from]; NEURAL_HAM_SHORT(-0.74)[-0.736]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com]; RCVD_COUNT_ZERO(0.00)[0]; RWL_MAILSPIKE_POSSIBLE(0.00)[54.240.8.237:from]; MIME_TRACE(0.00)[0:+]; 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,01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com]; MAILMAN_DEST(0.00)[svn-src-user] X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 16:35:08 -0000 On 2020-09-12 08:31, Alan Somers wrote: > On Sat, Sep 12, 2020 at 9:19 AM Gordon Tetlow > wrote: > > Author: gordon > Date: Sat Sep 12 15:18:52 2020 > New Revision: 365660 > URL: https://svnweb.freebsd.org/changeset/base/365660 > > Log: >   Add needed patch for 12.2-BETA1 to prevent spurious changes through >   freebsd-update processing. > > Added: >   user/cperciva/freebsd-update-build/patches/12.2-BETA1/ >   user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers > > What kinds of spurious changes do you see without this patch? There's three issues: 1. The code which selects which file to install as /etc/pkg/FreeBSD.conf doesn't recognize a fake branch name and installs the "latest" file instead of the "quarterly" file. 2. The branch name gets into /bin/freebsd-version, which is technically correct, but confuses freebsd-update's "don't update files if the only change is the version number" code. 3. The branch name gets into every single .o file in the kernel build, and at this point all hell breaks loose. -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid