Skip to content

Commit

Permalink
Move signature checking from buildinfo into repro
Browse files Browse the repository at this point in the history
Signed-off-by: Morten Linderud <[email protected]>
  • Loading branch information
Foxboron committed Apr 27, 2020
1 parent cfc30fa commit 1dc31a5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
7 changes: 3 additions & 4 deletions buildinfo
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,11 @@ function download_archive_package () {
if verify_archive_link "${target}"; then
local filename="$(basename ${target})"
echo "Downloading ${filename}" >&2
curl -L --remote-name-all "${target}" "${target}.sig" 2>/dev/null
if gpg --keyring /etc/pacman.d/gnupg/pubring.gpg --verify "${filename}.sig" "${filename}" 2>/dev/null; then
mv "${filename}" "${cachedir}/"
if curl -L --remote-name-all "${target}" "${target}.sig" 2>/dev/null; then
mv "${filename}"{,.sig} "${cachedir}/"
echo "${2}/${filename}"
else
echo "${filename} doesn't pass signature verification" >&2
echo "Couldn't download ${filename}" >&2
echo "check ${workdir}" >&2
exit 1
fi
Expand Down
3 changes: 3 additions & 0 deletions repro.in
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ function cmd_check(){
printf 'PKGEXT=".pkg.tar%s"\n' "${pkg##*tar}"
} >> "$BUILDDIRECTORY/$build/etc/makepkg.conf"

# We do the signature checking with pacman -Udd
sed -i "s/LocalFileSigLevel.*//g" "$BUILDDIRECTORY/$build/etc/pacman.conf"

# Father I have sinned
exec_nspawn "build" \
bash <<-__END__
Expand Down

0 comments on commit 1dc31a5

Please sign in to comment.