Opened 3 months ago

Closed 3 months ago

#30128 closed defect (fixed)

git-gpg-wrapper is incompatible with git ≥ 2.21

Reported by: acat Owned by: tbb-team
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: tbb-rbm, TorBrowserTeam201904R
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

Something like #20757, it seems they swapped the first two parameters in https://github.com/git/git/commit/58af57e1c886a7c9fed7fb35f2dd8dd14cc5e4e0. So for me git is calling with:
--keyid-format=long --status-fd=1 --verify /tmp/.git_vtag_tmp0WyCC4 -

This throws errors for expired signatures (cmake, tor, obfs4).

Child Tickets

Change History (7)

comment:1 Changed 3 months ago by gk

Keywords: tbb-rbm added

comment:2 Changed 3 months ago by acat

comment:3 in reply to:  2 Changed 3 months ago by boklm

Keywords: TorBrowserTeam201904R added
Status: newneeds_review

Replying to acat:

One possible fix that works for me: https://github.com/acatarineu/tor-browser-build/commit/30128

This patch looks good. But maybe we can check only for the --verify argument, to make it more likely to work with future changes.

https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_30128&id=b1c9b90240c537a19ce74ae5db0dce158dec54fd

Does this patch work for you?

comment:4 Changed 3 months ago by acat

Yes, that works. There's an error though (which seems to be ignored): line 4: local: can only be used in a function.

comment:5 in reply to:  4 Changed 3 months ago by boklm

Replying to acat:

Yes, that works. There's an error though (which seems to be ignored): line 4: local: can only be used in a function.

Ah, indeed. I fixed that in branch bug_30128_v2:
https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_30128_v2&id=e47bc3b70e798a10906c25d8d38fae09e1a1657f

comment:6 Changed 3 months ago by acat

Yes, that works. Thanks!

comment:7 Changed 3 months ago by gk

Resolution: fixed
Status: needs_reviewclosed

Looks good to me. Merged to master (commit 9a5354b1ba43853e845e93ed1d25c5d2ba582fe6).

Note: See TracTickets for help on using tickets.