svn commit: r561259 - head/security/sudo

[Joseph Mingrone]

On Mon, 2021-01-11 at 12:59, Cy Schubert <Cy.Schubert at cschubert.com> wrote:

> In message <202101112016.10BKGEjJ037336 at slippy.cwsent.com>, Cy Schubert 
> writes:
>> In message <202101112006.10BK6TnQ052930 at repo.freebsd.org>, Cy Schubert 
>> 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 
>> committed. I'll need to do that commit over again later.

> .gitauthors was the culprit. It may have been updated after nc@ made his 
> 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 at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 987 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20210112/29a4d7ef/attachment.sig>