From owner-svn-ports-all@freebsd.org Tue Jan 12 20:47:49 2021 Return-Path: Delivered-To: svn-ports-all@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 A56B64E55E6; Tue, 12 Jan 2021 20:47:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DFjM91Hq5z4dQq; Tue, 12 Jan 2021 20:47:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id zQZtkCfpA34axzQZukr89D; Tue, 12 Jan 2021 13:47:47 -0700 X-Authority-Analysis: v=2.4 cv=LvQsdlRc c=1 sm=1 tr=0 ts=5ffe0af3 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=EmqxpYm9HcoA:10 a=jaa8EuXyAAAA:8 a=YxBL1-UpAAAA:8 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=LAwIqlsGKF4HfGEtbNIA:9 a=CjuIK1q_8ugA:10 a=8ehxReBs7a4A:10 a=PL_DULBQHCqb1WPX_gWP:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id F3970EC; Tue, 12 Jan 2021 12:47:44 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 10CKliIt003213; Tue, 12 Jan 2021 12:47:44 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202101122047.10CKliIt003213@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Joseph Mingrone cc: Cy Schubert , Cy Schubert , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r561259 - head/security/sudo In-reply-to: <861reqkl4b.fsf@phe.ftfl.ca> References: <202101112006.10BK6TnQ052930@repo.freebsd.org> <202101112016.10BKGEjJ037336@slippy.cwsent.com> <202101112059.10BKxfb8039825@slippy.cwsent.com> <861reqkl4b.fsf@phe.ftfl.ca> Comments: In-reply-to Joseph Mingrone message dated "Tue, 12 Jan 2021 15:31:32 -0400." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 12 Jan 2021 12:47:44 -0800 X-CMAE-Envelope: MS4xfC/D+9nSRrzE0NBJPx7pOlj3LF/NTqP534Eh04NYgI9g9v4N4piesjGn/XiYRFn7GKRjS0m07BrwBt63QiLO4j0qy+s+CuXOJvNgxEgpz3r469tbuF6R hpGq26TVGxn8VGf3CXYkexqF1ArePS8zV/NWlH+p5LgE68L6XA/JjARp6RooOYbVDm9m/EwEPFt6/577rK5ElRVHWRS72TQpQmLwU7Oqo5Km63+IJN8YEBPv Vb7pixcm1uGcFmJthAnbeygAPluGIaZow5ROxCvZDXx4NHVTqovflZ+0MitNqP8ZV4RA+20joSJXA5zeQhCRsyDaXQi6WNhAVJ4D/f++cdk= X-Rspamd-Queue-Id: 4DFjM91Hq5z4dQq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 20:47:49 -0000 In message <861reqkl4b.fsf@phe.ftfl.ca>, Joseph Mingrone writes: > --=-=-= > Content-Type: text/plain > Content-Transfer-Encoding: quoted-printable > > On Mon, 2021-01-11 at 12:59, Cy Schubert wrote: > > > In message <202101112016.10BKGEjJ037336@slippy.cwsent.com>, Cy Schubert=20 > > writes: > >> In message <202101112006.10BK6TnQ052930@repo.freebsd.org>, Cy Schubert=20 > >> writes: > >> > Author: cy > >> > Date: Mon Jan 11 20:06:29 2021 > >> > New Revision: 561259 > >> > URL: https://svnweb.freebsd.org/changeset/ports/561259 > > >> > Log: > >> > Update 1.9.4p2 --> 1.9.5 > > >> > PR: 252583 > >> > Submitted by: cy > >> > Reported by: cy > >> > Approved by: garga (maintainer) > >> > MFH: 2021Q1 > >> > Security: CVE-2021-23239 > > >> Looks like a hash mismatch in git-svn has caused my vuxml update not to = > be=20 > >> committed. I'll need to do that commit over again later. > > > .gitauthors was the culprit. It may have been updated after nc@ made his= > =20 > > first commit. This caused git-svn a bit of gas. > > The .gitauthors files was updated on the 4th and nc@ first committed on > the 9th. What I am guessing happened is that your previous `git svn > rebase` was before each of these commits. It's a problem that I > discussed on git@freenode a few times. You need an updated .gitauthors > before doing `git svn rebase`, but need a `git svn rebase` to get the > new .gitauthors file. One workaround is to manually edit and commit > .gitauthors to match the latest version, then do the `git svn rebase` > again. Another workaround is to temporarily remove reference to the > authors file from your git configuration. > > I'm told the ports tree will transition to git after 2021Q1 (someone > please correct me if I'm wrong), so this problem will go away soon. > > Joe I managed to work around it by pointing to a .gitauthors file in a svn checkout I have here, after doing svn up in it first. But it did stop the second commit that was "cached" dead in its tracks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.