From 763d8ffb53c55fa3a1a8a46f779fd959ea776123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= Date: Mon, 25 May 2015 22:53:57 +0200 Subject: commitpkg: Force unarmored signatures Pacman cannot handle armored signatures, so force a generation of a binary one using the --no-armor flag. --- commitpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commitpkg.in b/commitpkg.in index 1095006..d779e96 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -147,7 +147,7 @@ for _arch in ${arch[@]}; do if [[ -n $GPGKEY ]]; then SIGNWITHKEY="-u ${GPGKEY}" fi - gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || die + gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "${pkgfile}" || die fi if ! gpg --verify "$sigfile" >/dev/null 2>&1; then die "Signature %s.sig is incorrect!" "$pkgfile" -- cgit v1.2.3 From 80ba87881ab698e9ed1c166642eeeaa60fd4be35 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Wed, 3 Jun 2015 21:16:52 +0300 Subject: makechrootpkg: verify sources before preparing chroot This is needed in order to use GPG's auto-key-retrieve keyserver option, otherwise the keyring will get copied to the chroot before the required keys are retrieved during 'makepkg --verifysource'. --- makechrootpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 207a148..3c8a20f 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -384,10 +384,10 @@ $update_first && arch-nspawn "$copydir" \ [[ -n ${install_pkgs[*]} ]] && install_packages -prepare_chroot - download_sources +prepare_chroot + if arch-nspawn "$copydir" \ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ -- cgit v1.2.3 From f5ef88ec591efa169c927e3a9d80386a59d60568 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Sat, 6 Jun 2015 15:27:00 +0300 Subject: Bump version to 20150606 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 646258c..dcdb522 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20150514 +V=20150606 PREFIX = /usr/local -- cgit v1.2.3