Date: Tue, 12 Jan 2021 15:31:32 -0400 From: Joseph Mingrone <jrm@FreeBSD.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Cy Schubert <cy@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r561259 - head/security/sudo Message-ID: <861reqkl4b.fsf@phe.ftfl.ca> In-Reply-To: <202101112059.10BKxfb8039825@slippy.cwsent.com> (Cy Schubert's message of "Mon, 11 Jan 2021 12:59:41 -0800") References: <202101112006.10BK6TnQ052930@repo.freebsd.org> <202101112016.10BKGEjJ037336@slippy.cwsent.com> <202101112059.10BKxfb8039825@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 2021-01-11 at 12:59, Cy Schubert <Cy.Schubert@cschubert.com> 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKkBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAl/9+RRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvnsa6EACsAAzuZRHFpBbhoUfdTck9wV+ICtf95MOE 30KEo5iYj6j3pZLV7u7BKDGBoDLecPnxhOdCeuysZMmJiQsktr1EYcEMVgpDMLWt BjtrZrtIv7Jy6VnVPXIOPU6L917qS/lJHFmJgxcgU4uuDYgLlVW97iZWup10Yf7J ryBA+qs7s6K1Y27SUfXpP4QGnVSnueLWXF2Va/blX06kxIqsESfnlf/jbTRYdBTX VoGYs5Y9lwC/TKPfG4e8vDBO0+KUxOtjS4gvU8hyKzppKjmMtvHCS6r0a5ZY1Wov ZO1VUrwyth8fXJ/K/iX+akb+85LISVJMu7XI2E5O19mrH2D41QwDmpZZ7IQg+ePJ MZ5DlPABC1yruMqgnRvz5qkMHgBnPTkolIMfSwvwzUCc1X/utBulZfVbHUqDM01z Bo/aDhyo1sHrSEpMq32zOOqpW/GY3V4LVX4oN0EcHggU/MVeIIh3KLM5JTmi2Qwh CnhanRU0tNt7tlIRY3Clty2UN/HkgwO3O2nZ4skC8KABXuad9C/xDLAbwYxQDq9Q OwfUUkEEkplhHZrWfAtIicwF2Rwn8+8EVx/WCCfGOT/T90lek1tbYAjotcSa2r0s WwCv/QVRlcssOa3E6dXJdqvyrPEVH6LZxjQNrjKm6g0TIMszyWj5S7drGqD/RyzY 9tWEVxU8vw== =73Ds -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?861reqkl4b.fsf>