Bump version to 20150606

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'.
2025-09-13 09:56:18 +02:00 · 2015-06-06 15:27:00 +03:00 · 2015-06-06 15:22:51 +03:00 · 2015-06-06 15:22:33 +03:00 · 2015-05-14 10:38:49 +02:00 · 2015-05-14 10:36:24 +02:00
3 changed files with 6 additions and 5 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-V=20150228
+V=20150606

 PREFIX = /usr/local

--- 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"
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -156,7 +156,8 @@ prepare_chroot() {
 	# Read .makepkg.conf and gnupg pubring
 	if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then
 		install -D "$USER_HOME/.gnupg/pubring.kbx" "$copydir/build/.gnupg/pubring.kbx"
-	elif [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
+	fi
+	if [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
 		install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
 	fi

@@ -383,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" \
Author	SHA1	Message	Date
Evangelos Foutras	f5ef88ec59	Bump version to `20150606`	2015-06-06 15:27:00 +03:00
Evangelos Foutras	80ba87881a	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'.	2015-06-06 15:22:51 +03:00
Johannes Löthberg	763d8ffb53	commitpkg: Force unarmored signatures Pacman cannot handle armored signatures, so force a generation of a binary one using the --no-armor flag.	2015-06-06 15:22:33 +03:00
Pierre Schmitz	a1594ae1f6	Prepare release	2015-05-14 10:38:49 +02:00
Christian Hesse	49ad7e6dbe	fix handling of public keyring Chances are that pubring.kbx has been created by gpgsm but pubring.gpg is still around with valid data. We do not know what file contains what we need, so just copy both. Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2015-05-14 10:36:24 +02:00