netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix gpg package signing (redux).

Browse Source 
The semantics for gpg seem to vary in subtle way across systems. This
attempts to identify the key fingerprint on import, since listing the
secret keys afterwards does not appear to have the intended effect.

PiperOrigin-RevId: 432067329
This commit is contained in:
Adin Scannell
2022-03-02 17:26:02 -08:00
committed by gVisor bot
parent 1a7f7a5c92
commit 17b93a84fa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/make_apt.sh
+7 -6
View File
@@ -81,13 +81,14 @@ trap cleanup EXIT
# is not found. This isn't actually a failure for us, because we don't require
# the public key (this may be stored separately). The second import will succeed
# because, in reality, the first import succeeded and it's a no-op.
gpg "${gpg_opts[@]}" --import "${private_key}" || \
gpg "${gpg_opts[@]}" --import "${private_key}"
# Select the private key version. For some versions of gpg, it seems like some
# will fail with the "no default secret" error.
declare keyid
keyid="$(gpg --no-default-keyring --secret-keyring "${keyring}" --list-secret-keys | grep -E '^ ' | tail -1)"
keyid=$(
(gpg "${gpg_opts[@]}" --import "${private_key}" 2>&1 ||
gpg "${gpg_opts[@]}" --import "${private_key}" 2>&1) |
grep "secret key imported" |
head -1 |
cut -d':' -f2 |
awk '{print $2;}')
readonly keyid
# Copy the packages into the root.