This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2go-keyring. from 4768f19 debian/rules: don't use --no-parallel with dh commands in compat-9-mode. new 8e0a5c0 debian/rules: make sure we pull in gnupg2 on older Debian versions. new b486679 Makefile: make gpg binary pseudo-selectable via a variable, defaulting to "gpg2". new 88ecbb0 Makefile: manually try to clean up keyrings via --export | --import if the filtering command that uses newer GnuPG 2 syntax fails. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 57 +++++++++++++++++++++++++++++++++++++++++++------------- debian/changelog | 5 +++++ debian/control | 4 ++-- 3 files changed, 51 insertions(+), 15 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 88ecbb066fb52cf0f0ca698f541c79c264c2c7b0 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 17 11:14:31 2019 +0200 Makefile: manually try to clean up keyrings via --export | --import if the filtering command that uses newer GnuPG 2 syntax fails. --- Makefile | 40 +++++++++++++++++++++++++++++++++++----- debian/changelog | 2 ++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e14ee9f..5bae230 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,13 @@ keyrings/x2go-archive-keyring.gpg: active-keys/index ${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; \ + } || \ + { \ + $$(: "The command above should only fail if GnuPG 2 is too old."); \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --export | ${GPG} ${GPG_OPTIONS} --keyring $@.tmp --import; \ + }; \ mv -f $@.tmp $@; \ fi @@ -40,7 +46,13 @@ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index ${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; \ + } || \ + { \ + $$(: "The command above should only fail if GnuPG 2 is too old."); \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --export | ${GPG} ${GPG_OPTIONS} --keyring $@.tmp --import; \ + }; \ mv -f $@.tmp $@; \ fi @@ -49,7 +61,13 @@ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index ${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; \ + } || \ + { \ + $$(: "The command above should only fail if GnuPG 2 is too old."); \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --export | ${GPG} ${GPG_OPTIONS} --keyring $@.tmp --import; \ + }; \ mv -f $@.tmp $@; \ fi @@ -58,7 +76,13 @@ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index ${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; \ + } || \ + { \ + $$(: "The command above should only fail if GnuPG 2 is too old."); \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --export | ${GPG} ${GPG_OPTIONS} --keyring $@.tmp --import; \ + }; \ mv -f $@.tmp $@; \ fi @@ -68,7 +92,13 @@ $(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; \ + } || \ + { \ + $$(: "The command above should only fail if GnuPG 2 is too old."); \ + ${GPG} ${GPG_OPTIONS} --keyring $@ --export | ${GPG} ${GPG_OPTIONS} --keyring $@.tmp --import; \ + } mv -f $@.tmp $@ clean: diff --git a/debian/changelog b/debian/changelog index a554c23..7e89794 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium * keyrings/: refresh signature. * Makefile: make gpg binary pseudo-selectable via a variable, defaulting to "gpg2". + * Makefile: manually try to clean up keyrings via --export | --import if the + filtering command that uses newer GnuPG 2 syntax fails. * 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 8e0a5c0d46b7af3ee0b59f86831a0061d81d95bb Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 17 10:26:42 2019 +0200 debian/rules: make sure we pull in gnupg2 on older Debian versions. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8073b4..68bed14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium - Add build-dependency upon coreutils. - Add build-dependency on debhelper >= 7. - Bump up dh dependency to 9. + - Make sure we pull in gnupg2 on older Debian versions. * debian/rules: - Simplify file... a lot. - Don't use --no-parallel with dh commands in compat-9-mode. diff --git a/debian/control b/debian/control index 66701f9..4a00854 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, Mihai Moldovan <ionic@ionic.de>, Build-Depends: - gnupg, + gnupg2 | gnupg, jetring, bash, coreutils, @@ -21,7 +21,7 @@ Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Recommends: gnupg +Recommends: gnupg2 | gnupg Description: GnuPG keys of all X2Go developers and the X2Go archive The Debian project requires developers to digitally sign the announcements of their packages with GnuPG, to protect against -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git
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
-
git-admin＠x2go.org