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

Fix repository.

Browse Source 
Some versions of gpg don't select the key as the default after import,
and it must be specified explicitly. Select the last imported key.

PiperOrigin-RevId: 432009606
This commit is contained in:
Adin Scannell
2022-03-02 13:07:11 -08:00
committed by gVisor bot
parent 137468a8eb
commit 6d66109a53
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/make_apt.sh
+10 -2
View File
@@ -84,6 +84,12 @@ trap cleanup EXIT
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)"
readonly keyid
# Copy the packages into the root.
for pkg in "$@"; do
if ! [[ -f "${pkg}" ]]; then
@@ -105,12 +111,14 @@ for pkg in "$@"; do
# Copy & sign the package.
mkdir -p "${destdir}"
cp -a -L "$(dirname "${pkg}")/${name}.deb" "${destdir}"
cp -a -L "$(dirname "${pkg}")/${name}.changes" "${destdir}"
if [[ -f "$(dirname "${pkg}")/${name}.changes" ]]; then
cp -a -L "$(dirname "${pkg}")/${name}.changes" "${destdir}"
fi
chmod 0644 "${destdir}"/"${name}".*
# Sign a package only if it isn't signed yet.
# We use [*] here to expand the gpg_opts array into a single shell-word.
dpkg-sig -g "${gpg_opts[*]}" --verify "${destdir}/${name}.deb" ||
dpkg-sig -g "${gpg_opts[*]}" --sign builder "${destdir}/${name}.deb"
dpkg-sig -g "${gpg_opts[*]}" --sign builder -k "${keyid}" "${destdir}/${name}.deb"
done
# Build the package list.