This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit b4866797b03d19d6c0b469ab981f6afc0690ea9b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 17 11:08:23 2019 +0200 Makefile: make gpg binary pseudo-selectable via a variable, defaulting to "gpg2". --- Makefile | 27 ++++++++++++++------------- debian/changelog | 2 ++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 5c10df5..e14ee9f 100644 --- a/Makefile +++ b/Makefile @@ -2,23 +2,24 @@ TRUSTED-LIST := $(patsubst active-keys/add-%,trusted.gpg/x2go-archive-%.gpg,$(wi TMPRING := trusted.gpg/build-area GPG_OPTIONS := --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name ./trustdb.gpg +GPG := gpg2 build: verify-indices keyrings/x2go-archive-keyring.gpg keyrings/x2go-archive-removed-keys.gpg verify-results $(TRUSTED-LIST) verify-indices: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers-removed-keys.gpg - gpg ${GPG_OPTIONS} \ + ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg \ --verify active-keys/index.gpg active-keys/index - gpg ${GPG_OPTIONS} \ + ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg \ --verify removed-keys/index.gpg removed-keys/index verify-results: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers-removed-keys.gpg keyrings/x2go-archive-keyring.gpg keyrings/x2go-archive-removed-keys.gpg - gpg ${GPG_OPTIONS} \ + ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-archive-keyring.gpg.asc \ keyrings/x2go-archive-keyring.gpg - gpg ${GPG_OPTIONS} \ + ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-archive-removed-keys.gpg.asc \ keyrings/x2go-archive-removed-keys.gpg @@ -27,37 +28,37 @@ verify-results: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers- keyrings/x2go-archive-keyring.gpg: active-keys/index if [ -e 'active-keys/index' ] && [ ! -s 'active-keys/index' ]; then \ - gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --fingerprint; \ else \ jetring-build -I $@ active-keys; \ - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ + ${GPG} ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ mv -f $@.tmp $@; \ fi keyrings/x2go-archive-removed-keys.gpg: removed-keys/index if [ -e 'removed-keys/index' ] && [ ! -s 'removed-keys/index' ]; then \ - gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --fingerprint; \ else \ jetring-build -I $@ removed-keys; \ - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ + ${GPG} ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ mv -f $@.tmp $@; \ fi keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index if [ -e 'x2go-maintainers/index' ] && [ ! -s 'x2go-maintainers/index' ]; then \ - gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --fingerprint; \ else \ jetring-build -I $@ x2go-maintainers; \ - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ + ${GPG} ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ mv -f $@.tmp $@; \ fi keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index if [ -e 'x2go-maintainers-removed-keys/index' ] && [ ! -s 'x2go-maintainers-removed-keys/index' ]; then \ - gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --fingerprint; \ else \ jetring-build -I $@ x2go-maintainers-removed-keys; \ - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ + ${GPG} ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \ mv -f $@.tmp $@; \ fi @@ -67,7 +68,7 @@ $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-key cp $< $(TMPRING) jetring-build -I $@ $(TMPRING) rm -rf $(TMPRING) - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp + ${GPG} ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp mv -f $@.tmp $@ clean: diff --git a/debian/changelog b/debian/changelog index 68bed14..a554c23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium * t/keyids-complete.t: fix key name checking. * active-keys/: add new RSA4096-based X2Go Packages Automatic Signing Key. * keyrings/: refresh signature. + * Makefile: make gpg binary pseudo-selectable via a variable, defaulting to + "gpg2". * debian/control: - Change maintainer to the mailing list. - Add the old package maintainer to the Uploaders field and myself. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git