|
 |
162ce98 |
diff -rupN debian-archive-keyring-2017.6/Makefile debian-archive-keyring-2017.6-new/Makefile
|
|
|
162ce98 |
--- debian-archive-keyring-2017.6/Makefile 2017-09-03 18:52:14.000000000 +0200
|
|
|
162ce98 |
+++ debian-archive-keyring-2017.6-new/Makefile 2017-09-07 14:19:31.121453700 +0200
|
|
|
162ce98 |
@@ -6,19 +6,19 @@ GPG_OPTIONS := --no-options --no-default
|
|
|
162ce98 |
build: verify-indices keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg verify-results $(TRUSTED-LIST)
|
|
|
162ce98 |
|
|
|
162ce98 |
verify-indices: keyrings/team-members.gpg
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} \
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} \
|
|
|
162ce98 |
--keyring keyrings/team-members.gpg \
|
|
|
162ce98 |
--verify active-keys/index.gpg active-keys/index
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} \
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} \
|
|
|
162ce98 |
--keyring keyrings/team-members.gpg \
|
|
|
162ce98 |
--verify removed-keys/index.gpg removed-keys/index
|
|
|
162ce98 |
|
|
|
162ce98 |
verify-results: keyrings/team-members.gpg keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} \
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} \
|
|
|
162ce98 |
--keyring keyrings/team-members.gpg --verify \
|
|
|
162ce98 |
keyrings/debian-archive-keyring.gpg.asc \
|
|
|
162ce98 |
keyrings/debian-archive-keyring.gpg
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} \
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} \
|
|
|
162ce98 |
--keyring keyrings/team-members.gpg --verify \
|
|
|
162ce98 |
keyrings/debian-archive-removed-keys.gpg.asc \
|
|
|
162ce98 |
keyrings/debian-archive-removed-keys.gpg
|
|
|
162ce98 |
@@ -27,17 +27,17 @@ verify-results: keyrings/team-members.gp
|
|
|
162ce98 |
|
|
|
162ce98 |
keyrings/debian-archive-keyring.gpg: active-keys/index
|
|
|
162ce98 |
jetring-build -I $@ active-keys
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
mv -f $@.tmp $@
|
|
|
162ce98 |
|
|
|
162ce98 |
keyrings/debian-archive-removed-keys.gpg: removed-keys/index
|
|
|
162ce98 |
jetring-build -I $@ removed-keys
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
mv -f $@.tmp $@
|
|
|
162ce98 |
|
|
|
162ce98 |
keyrings/team-members.gpg: team-members/index
|
|
|
162ce98 |
jetring-build -I $@ team-members
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
mv -f $@.tmp $@
|
|
|
162ce98 |
|
|
|
162ce98 |
$(TRUSTED-LIST) :: trusted.gpg/debian-archive-%.gpg : active-keys/add-% active-keys/index
|
|
|
162ce98 |
@@ -46,7 +46,7 @@ $(TRUSTED-LIST) :: trusted.gpg/debian-ar
|
|
|
162ce98 |
cp $< $(TMPRING)
|
|
|
162ce98 |
jetring-build -I $@ $(TMPRING)
|
|
|
162ce98 |
rm -rf $(TMPRING)
|
|
|
162ce98 |
- gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
+ gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
|
|
|
162ce98 |
mv -f $@.tmp $@
|
|
|
162ce98 |
|
|
|
162ce98 |
clean:
|