[X2Go-Commits] [x2go-keyring] 05/13: Makefile: add maintonly target for generating gpg-1.4/2.0-style keyrings.
git-admin at x2go.org
git-admin at x2go.org
Sun Aug 18 14:48:14 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2go-keyring.
commit 599ff289a98a50557c9d4f99933241d30e8b228d
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Aug 18 13:57:42 2019 +0200
Makefile: add maintonly target for generating gpg-1.4/2.0-style keyrings.
---
Makefile | 22 ++++++++++++++++++++++
debian/changelog | 2 ++
2 files changed, 24 insertions(+)
diff --git a/Makefile b/Makefile
index fff7112..9707436 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,10 @@ TMPRING := trusted.gpg/build-area
GPG_OPTIONS := --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name ./trustdb.gpg
GPG := gpg
+GPG1 := gpg1
build: verify-indices keyrings/x2go-archive-keyring.gpg keyrings/x2go-archive-removed-keys.gpg verify-results $(TRUSTED-LIST)
+maintonly: build keyrings/x2go-maintainers-keyring.gpg1 keyrings/x2go-maintainers-removed-keys.gpg1 keyrings/x2go-archive-keyring.gpg1 keyrings/x2go-archive-removed-keys.gpg1
verify-indices: keyrings/x2go-maintainers-keyring.gpg
${GPG} ${GPG_OPTIONS} \
@@ -55,6 +57,11 @@ keyrings/x2go-archive-keyring.gpg: active-keys/index
mv -f $@.tmp $@; \
fi
+keyrings/x2go-archive-keyring.gpg1: keyrings/x2go-archive-keyring.gpg
+ touch $@
+ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import
+ rm -f $@~
+
keyrings/x2go-archive-removed-keys.gpg: removed-keys/index
if [ -e 'removed-keys/index' ] && [ ! -s 'removed-keys/index' ]; then \
touch $@; \
@@ -70,6 +77,11 @@ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index
mv -f $@.tmp $@; \
fi
+keyrings/x2go-archive-removed-keys.gpg1: keyrings/x2go-archive-removed-keys.gpg
+ touch $@
+ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import
+ rm -f $@~
+
keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index
if [ -e 'x2go-maintainers/index' ] && [ ! -s 'x2go-maintainers/index' ]; then \
touch $@; \
@@ -85,6 +97,11 @@ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index
mv -f $@.tmp $@; \
fi
+keyrings/x2go-maintainers-keyring.gpg1: keyrings/x2go-maintainers-keyring.gpg
+ touch $@
+ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import
+ rm -f $@~
+
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 \
touch $@; \
@@ -100,6 +117,11 @@ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index
mv -f $@.tmp $@; \
fi
+keyrings/x2go-maintainers-removed-keys.gpg1: keyrings/x2go-maintainers-removed-keys.gpg
+ touch $@
+ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import
+ rm -f $@~
+
$(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-keys/index
mkdir -p $(TMPRING) trusted.gpg
grep -F $(shell basename $<) -- active-keys/index > $(TMPRING)/index
diff --git a/debian/changelog b/debian/changelog
index 8cf7f8e..ce27da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
* Makefile: likewise compare signatures on
keyrings/x2go-maintainers{,-removed-keys}.gpg. Doesn't really make a huge
difference for the x2go-maintainers keyring, but why not.
+ * Makefile: add maintonly target for generating gpg-1.4/2.0-style
+ keyrings.
* 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
More information about the x2go-commits
mailing list