This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit cf2f87049c3382800908fa0f781619c9f62e2b53 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 17 19:02:47 2019 +0200 Makefile: create empty keyring files if the index file is empty. Newer GnuPG versions create keybox files by default, but we explicitly (or rather implicitly through jetring touching keyring files before importing actual data and thus bypassing keybox creation) don't want this. --- Makefile | 8 ++++---- debian/changelog | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c931a1e..de3292c 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ 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; \ + touch $@; \ else \ jetring-build -I $@ active-keys; \ { \ @@ -43,7 +43,7 @@ keyrings/x2go-archive-keyring.gpg: active-keys/index keyrings/x2go-archive-removed-keys.gpg: removed-keys/index if [ -e 'removed-keys/index' ] && [ ! -s 'removed-keys/index' ]; then \ - ${GPG} ${GPG_OPTIONS} --keyring $@ --fingerprint; \ + touch $@; \ else \ jetring-build -I $@ removed-keys; \ { \ @@ -58,7 +58,7 @@ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index if [ -e 'x2go-maintainers/index' ] && [ ! -s 'x2go-maintainers/index' ]; then \ - ${GPG} ${GPG_OPTIONS} --keyring $@ --fingerprint; \ + touch $@; \ else \ jetring-build -I $@ x2go-maintainers; \ { \ @@ -73,7 +73,7 @@ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index 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; \ + touch $@; \ else \ jetring-build -I $@ x2go-maintainers-removed-keys; \ { \ diff --git a/debian/changelog b/debian/changelog index a0f7e6b..cd81ff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,10 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium before signing them and also reference the maintainers keyring which DOES get installed in our package. * keyrings/: update signatures on all keyring files. + * Makefile: create empty keyring files if the index file is empty. Newer + GnuPG versions create keybox files by default, but we explicitly (or + rather implicitly through jetring touching keyring files before importing + actual data and thus bypassing keybox creation) don't want this. * 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