[x2go-keyring] branch master updated (27f2336 -> ec3bb1e)

List overview All Threads
Download

newer

older

[x2go-keyring] branch master...

git-admin＠x2go.org

18 Aug 2019 18 Aug '19

12:48 p.m.

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2go-keyring. from 27f2336 keyrings/: update signatures on all keyring files. new cf2f870 Makefile: create empty keyring files if the index file is empty. new 083d6c4 Makefile: for good measure, also verify signatures on x2go-maintainers{,-removed-keys}/index. new de45f43 Makefile: we don't need keyrings/x2go-maintainers-removed-keys.gpg as a prerequisite for checking index signatures. new 4a3085f Makefile: likewise compare signatures on keyrings/x2go-maintainers{,-removed-keys}.gpg. new 599ff28 Makefile: add maintonly target for generating gpg-1.4/2.0-style keyrings. new 2fd1c6c Makefile: fallback to old-style keyring signature checks if the default new-style ones failed validation. new 1f0555f README.maintainer: update documentation to include old-style keyrings and their signatures. new 0fd2589 Makefile: do not require a full build and verification run for the maintonly target. new b1519ad Makefile: do not try to run gpg1 to export and import keys if the keyrings are actually empty. new f908dd3 Makefile: add old-style keyrings to cleanup. new 9c2f8ef keyrings/: refresh signatures on new-style keyrings. new 8234804 keyrings/: add signatures on old-style keyrings. new ec3bb1e .gitignore: refresh with old-style and vim backup files. The 13 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: .gitignore | 7 ++ Makefile | 86 +++++++++++++++++++++---- README.maintainer | 11 ++++ debian/changelog | 25 +++++++ keyrings/x2go-archive-keyring.gpg.asc | 26 ++++---- keyrings/x2go-archive-keyring.gpg1.asc | 16 +++++ keyrings/x2go-archive-removed-keys.gpg.asc | 26 ++++---- keyrings/x2go-archive-removed-keys.gpg1.asc | 16 +++++ keyrings/x2go-maintainers-keyring.gpg.asc | 26 ++++---- keyrings/x2go-maintainers-keyring.gpg1.asc | 16 +++++ keyrings/x2go-maintainers-removed-keys.gpg.asc | 26 ++++---- keyrings/x2go-maintainers-removed-keys.gpg1.asc | 16 +++++ 12 files changed, 234 insertions(+), 63 deletions(-) create mode 100644 keyrings/x2go-archive-keyring.gpg1.asc create mode 100644 keyrings/x2go-archive-removed-keys.gpg1.asc create mode 100644 keyrings/x2go-maintainers-keyring.gpg1.asc create mode 100644 keyrings/x2go-maintainers-removed-keys.gpg1.asc -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git

Show replies by date

git-admin＠x2go.org

18 Aug 18 Aug

12:48 p.m.

New subject: [x2go-keyring] 01/13: Makefile: create empty keyring files if the index file is empty.

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

git-admin＠x2go.org

12:48 p.m.

New subject: [x2go-keyring] 03/13: Makefile: we don't need keyrings/x2go-maintainers-removed-keys.gpg as a prerequisite for checking index signatures.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit de45f43eec958adf98641d1a3a66f8bfc87ee7b8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 13:11:01 2019 +0200 Makefile: we don't need keyrings/x2go-maintainers-removed-keys.gpg as a prerequisite for checking index signatures. --- Makefile | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 359b796..bdc6e5c 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ GPG := gpg 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 +verify-indices: keyrings/x2go-maintainers-keyring.gpg ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg \ --verify active-keys/index.gpg active-keys/index diff --git a/debian/changelog b/debian/changelog index 18f5c60..fc9e554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium actual data and thus bypassing keybox creation) don't want this. * Makefile: for good measure, also verify signatures on x2go-maintainers{,-removed-keys}/index. + * Makefile: we don't need keyrings/x2go-maintainers-removed-keys.gpg as a + prerequisite for checking index signatures. * 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

12:48 p.m.

New subject: [x2go-keyring] 04/13: Makefile: likewise compare signatures on keyrings/x2go-maintainers{, -removed-keys}.gpg.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 4a3085feddaa7d28304a81b43193ad4ce10a1501 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 13:14:04 2019 +0200 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 | 8 ++++++++ debian/changelog | 3 +++ 2 files changed, 11 insertions(+) diff --git a/Makefile b/Makefile index bdc6e5c..fff7112 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,14 @@ verify-results: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers- --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-archive-removed-keys.gpg.asc \ keyrings/x2go-archive-removed-keys.gpg + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ + keyrings/x2go-maintainers-keyring.gpg.asc \ + keyrings/x2go-maintainers-keyring.gpg + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ + keyrings/x2go-maintainers-removed-keys.gpg.asc \ + keyrings/x2go-maintainers-removed-keys.gpg #FIXME: Do we need to verify the created keyrings in trusted.gpg.d, too? # Maybe "just" checking that no key is added if we merge, but how… diff --git a/debian/changelog b/debian/changelog index fc9e554..8cf7f8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,9 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium x2go-maintainers{,-removed-keys}/index. * Makefile: we don't need keyrings/x2go-maintainers-removed-keys.gpg as a prerequisite for checking index signatures. + * 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. * 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

12:48 p.m.

New subject: [x2go-keyring] 02/13: Makefile: for good measure, also verify signatures on x2go-maintainers{, -removed-keys}/index.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 083d6c4023984a5d8e87cae4c7c105ba36178721 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 13:09:33 2019 +0200 Makefile: for good measure, also verify signatures on x2go-maintainers{,-removed-keys}/index. --- Makefile | 6 ++++++ debian/changelog | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index de3292c..359b796 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,12 @@ verify-indices: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers- ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg \ --verify removed-keys/index.gpg removed-keys/index + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg \ + --verify x2go-maintainers/index.gpg x2go-maintainers/index + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg \ + --verify x2go-maintainers-removed-keys/index.gpg x2go-maintainers-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} \ diff --git a/debian/changelog b/debian/changelog index cd81ff0..18f5c60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,6 +79,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium 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: for good measure, also verify signatures on + x2go-maintainers{,-removed-keys}/index. * 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

12:48 p.m.

New subject: [x2go-keyring] 11/13: keyrings/: refresh signatures on new-style keyrings.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 9c2f8ef63f09680254f729855817a092f5a7433a Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:43:23 2019 +0200 keyrings/: refresh signatures on new-style keyrings. --- debian/changelog | 1 + keyrings/x2go-archive-keyring.gpg.asc | 26 +++++++++++++------------- keyrings/x2go-archive-removed-keys.gpg.asc | 26 +++++++++++++------------- keyrings/x2go-maintainers-keyring.gpg.asc | 26 +++++++++++++------------- keyrings/x2go-maintainers-removed-keys.gpg.asc | 26 +++++++++++++------------- 5 files changed, 53 insertions(+), 52 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ff1489..f0b455d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium * Makefile: do not try to run gpg1 to export and import keys if the keyrings are actually empty. * Makefile: add old-style keyrings to cleanup. + * keyrings/: refresh signatures on new-style keyrings. * debian/control: - Change maintainer to the mailing list. - Add the old package maintainer to the Uploaders field and myself. diff --git a/keyrings/x2go-archive-keyring.gpg.asc b/keyrings/x2go-archive-keyring.gpg.asc index 538cdad..c575d58 100644 --- a/keyrings/x2go-archive-keyring.gpg.asc +++ b/keyrings/x2go-archive-keyring.gpg.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1X1HIACgkQH9Yu2W4l -OocrWw/+PyZ035jl3hnqmx3AjMj1pf0TQzs3nkP78qGDXUFUVDQGnp5MeOdbJD31 -6rsqgfcp7YEDbpTD0woWLl/Bl+I5Tkod8ppA2mkw4Uwdy/mg8iKocm38THfJahcv -cJapfFnjvEhJYwebvNXis1QrdZ1garJIlLQ9eJ/xmsKJVXRyi9vditx3U5OrZ1Pd -WRPRuZMBfqe/xRmPNrlkhWLmTt8RYaKSUi5f+Z7jiIAWOixZVev/uSKuvk7hUDjm -Dx2WH+MlAAPtc2o5AXynrc81VZTYEsKyd5DNSZpseA68y12GLNVJ0IDZZJt3o80j -P+/iCqoccNpEflTZl3qeXWOVuif9CDT7rlji/5ayCitGyC74d890CrOLGtzQwK/B -jZKKhv6IWFY7gEkbO6L1fgRijJ6eA3F+KEuqrLokMA5GvaygobNmdtJt306JXjHm -zc+gXuM7eezW0XV2eD8YCEXbjjfxLaHnX/k/p6YZ+7X1Eu8iKAydxE6H7+CsMv1o -oV7XQfWSJ4lgcMk+lbvU2laHKQ5gLLmwMQctYxlglFDMC3emjgiKt8o5T8Xn2CRy -XIp3C9ItDrCXUCJTvEcYYutTosobX3X9C9ANCbNAdQpov2RCgl632MDHvs0n4moe -O3deRk2EXBAKikIUhbAX5LCy7ie/tIsTUWzkR3uPTjUrJGLGsOU= -=QvF7 +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR5oACgkQH9Yu2W4l +Ooee3g//d+G31cOQh8YIH0KrpOAENtia4f8l8UCAHLQ/vEeUTJcin6zNInOxjhv5 +HqozTtpBaTqX9wGVv90SLufYxw4WTed759ik2Snhkp/YF54HnuhRLkjmH6PoziVP +GSbfv8IDtMf053uOnbHXR5uivNrsGfL2MrYd9ywdK6yMsreQ2KwxmKelsLZknA2+ +RmkXC15PomwmCAeqH5S1nNRk0TKFJt+8MSrwsbG6CEr9JPME+HVlyeJp7v7S4k6m +ves2wi5L6KV5HYGlYUnwIxmqla32gkAEHKjh0G3pgeH5gTuT8rJFkTe1AizZnBJU +eANrkANZWNiXGIw/infWBGTMu9q84uZ5rDAy+xR8+Inc/liotK4kmBi3oXCoJPaK +Hxbys3IZaHVKKosw5/oL+weQyhNFUFpfDvH8vRuAItMHu2V9PkoOR3erJ9/yXz8d +BaAu6femd5S71ysGqj2iuzvlA1PwMxAZlhDgFDtvygstBRtAu+sO7oxbH+Rl7phB +X/dXfSnJ0DBV4/mPy/uUjCGZSupzXW14oCDnPzR8azzJ68KpkGodP7Ug8P++yeMH +DUTsRPqHMehjnx7iRBgq2vfeV0GnKSKHr5CZKRdZ+q+D847O02ghhqFBH0PvzAgr +whS2JWgERLU/rnzVyoHAafvOfFmiVdG1+bUG4v9DTWHUg+rcaBg= +=3JAO -----END PGP SIGNATURE----- diff --git a/keyrings/x2go-archive-removed-keys.gpg.asc b/keyrings/x2go-archive-removed-keys.gpg.asc index 7312f90..122255a 100644 --- a/keyrings/x2go-archive-removed-keys.gpg.asc +++ b/keyrings/x2go-archive-removed-keys.gpg.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1X1IYACgkQH9Yu2W4l -OocPhg//d9id3QUCIue92G1NXINUNLv5H/4gkwWcLxZhP3T6oWFLZDRti15og9S+ -t7UyKaSMYyhy3VLHYAC0RMlJUdLcqkzlRmLYa3xUSEGoVIHywOw7zrYCoF/Kn472 -Ozw/NEoSMcK1J+7Yuxz7UnFdyal9A0sBfIZyqQafBUwd83npSgViDAYZTXLqSOcq -IPXxf8KK2L/Mw3Cf5p7mmkcMhAtdEMua27DSd3jzjYOipvyrL39NNjx4EZVrTHbd -Q56aSQupYXOb2iVRA5Ki1CvbcPjBFjPkCX2Bo1jGOvx6VT3KhoMMNylbY0oCFLIk -RHZqpj0p4Cbbf42LB0+0aW9Fr5SqkrDSfpsYm+kGB3v4mYLi8LpuJdFf52jwT3Xp -Gd2eaxPLdQ0+dwhV+Bk+RUPAroCuoU4QprND7RC9cdXLU7pWv6SfADe+JmET5YXp -5yyl5H0sFibFpN6Iw5oFrZmrs5MdkfY/538hrL5Febnkv/NNVfZDCh0JKBqljD+l -zBfOe2wrXyUQKq4xXsrKMFytz6YrPn8N/KKykNmMRL8t5nWHOcL1c1RW6HQ0DCpH -N5LZ9apHxM+V90ErAv3YpfEoYakEi/nFVUHp45Pe+510dulboTeIkk8a48+ofqXe -ScjA2h0zvQA2aPqlysNEru7IcNUkQVHu6QY2WlgZ5OgnAyIaz8Q= -=SCt1 +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR8IACgkQH9Yu2W4l +OodJiA//fz30E2NNVQh6R+I2O/yJITPit4p2faHvSxLWyKtzL6V9P5Esf2oI7lVC +824/2BX3bReMUNfWrW+zJhb+LXJJ6Rs1KUSbk3cT+cwmlzLsYhA7EurPXnQXCeH5 +7Cwx9+zuACInKzk2YEF2k6vAKVNYJx2SmIIQjDbDfgPC2H2kR3QbTAYuK3vEkRkf +rIXC98W8nnoNNz4O+jHXLErWrUYdB4KgBgaItxn2ih9+bnSt10LDANfmxI/dC06Q +13cTOixOgqLNCTzi2HHVT2EqLeY6CZdI4KRKAWsT8/IXnVZHljkwxfjq1sEs2Fa1 +4cmDtPHUDQ2j9nR97Oa8MQ32PV+84C8sBahPCxicYbnsQ48HI+iL54j+BY2ueoUb +Vu6GC7f9zqdSqdvIA/LBXACtGBHK9P3O00cVAekHMZlOJwfbKKXelTBApIqV7qLh +lAME+XWWLrp5RYH8UB3Dq9RPFPn3UNsvu18iMTlHuR4760G6OVyPhEPkAzM4H2Xf +gMLsY9VEzOSLVl5cPFH3jRrWwEUGuVQkFzGfoYCu6JJPXTNxtq1bgmApjAa75ObG +i07xy5SIiQMC5DV1Qc1INHo0BigYe5FTcdaLhJ7DdT1dtMKgjWHe/snpQ+7dU8gd +4hCUHQoae8zEPl/12n+kRjL35oBTpA21QVAQuF9wT7GExdp7jn0= +=MjFB -----END PGP SIGNATURE----- diff --git a/keyrings/x2go-maintainers-keyring.gpg.asc b/keyrings/x2go-maintainers-keyring.gpg.asc index 10289a4..3337592 100644 --- a/keyrings/x2go-maintainers-keyring.gpg.asc +++ b/keyrings/x2go-maintainers-keyring.gpg.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1X1HgACgkQH9Yu2W4l -OodmqQ/9ElYL8qjJYZ13GrKZAFrbELnfHLR4nC7DTBqCsWuaMUbEXw3PAWJLgmdZ -F2S93ASACIqArXkm+KRNQclkDMqhiXzmVIw+JJJ2QZ1URH7gZdD008nkEgYR7wTA -JoTfCOShPvFWd8NmvNlZ3rlLA+35Gc7yvWm9voLTsai1tPgodbGjRz6Mg93LYHDo -0hPJ1gTOwqABkJ3+L8LebHRmb+DaiQheWAdqTmZcTrdRpZ1P+LXJdoqDwPB9j+AU -G9fZHqpNo0OfQCt3BxgohqNpORU5sLQQR4qjfzCMxOqka5Yc9Y7w3+kV0EMnSbF3 -vggmPX6geqjd23kk6GsGh25FxfZQfNsJnun17tWwW9xJCeFO2M2VDP1h9SJE+A60 -z5s4YP0OJXol5Aewwhd9EyPG7E/nGkdpyuu8Lz44KlxwTJfreACB5gr7VyRfTUhJ -JBHnlqTPwqGTl5vgzebNwmUpuoPQ+GpC9ZPPdhdyeEvttgJy/ruDOtKctR0HdQKn -7AQG+G6cTaO9ItW6/tgn5cDMkV8yIWRvpJM9DLg1bE8rk3Z7wx/kTDHy5WaFqKDs -1ezs5M54da/Tq3Hq87dnJOmTbsgW+Qy+VC7bAeL5iQfD0Z6nGTpBRJoWimWtC3ds -ykbSt8t7Ac37LyCpxVKt+k81I7G8PDzO3OuPZ81zpXZAaX0wkDU= -=r16G +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR5wACgkQH9Yu2W4l +OoeciQ/+J7GW/LTlLHN5gEzSCbJuxQSudycEwqAAdmHIXek5dL784IQKqbJNGZuH +yHa0T+lUh5cMGu2hFMLX4GX1WxZnNCZq2lho0OHX2oa5DYFjZ1FJ/mniDqKZ5ktD +Wmk9PlHniZJ/carfVft85pRoqpmsjjJuxVrKWghcXpMknhnFmCM5w472TbmSe8Wh +moy+zwai5WJhQ7Z49QHWIF59OAimF7rc8B7NCPfHR61JTJ9KcfxmUlexNz34Ht5p +H6K8DwmhL5BDiD13BTnZdbd6Erhhiq5HDwT+q2EsRo2mhrkvCE1G+T2thbixLVCs +2fTA9U15IEgM5XsP+scHOcAzpJf0ryjIthlc+jMFAmQtZAQaq+Aj5khKP8xrG+df +b356ypYKVNenq7Eeqjcz5plH5EnblI4ituYKII19wP6KpoQf0i1TdTtHaEdKp5eX +mEYMy6nlyo08pkqSG1mzc9O0831ymgxiA2RAolQRuEa1Od6ThG/lEYHSiJWzCA2h +MEP4ZtKGSnDqNyaW2alQG9+WHDMBbiPPHUM+16Gd2jYPGAgcn0qnzqVKkcJlTlgt +yhGzdosyXjzTjPJStxrgBmZCG9+7vnq2ws82FgX6RJsTtpZnGim0CGsgXpLx/ZQY +cjYhavgX3n6EvlENN58b3GReu1/5nyu+4piJr8qnqYzxAR5cRo8= +=I2Cd -----END PGP SIGNATURE----- diff --git a/keyrings/x2go-maintainers-removed-keys.gpg.asc b/keyrings/x2go-maintainers-removed-keys.gpg.asc index 9c40f06..fce391e 100644 --- a/keyrings/x2go-maintainers-removed-keys.gpg.asc +++ b/keyrings/x2go-maintainers-removed-keys.gpg.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1X1IsACgkQH9Yu2W4l -OodUjA//RG9fQmUI8N1J2iKp17N1LJgzKO1SORSSi2VXsa0Oyip0TlrKN4vcajli -WTiRq0yJPRCuGvmDuinZQeDDsXxq+u8t8QuMb2f1HTyHF54Bq+ned79dPjNgw8xO -EmAuPxniY4oyiWDx9+QDuRIEM5dw+OrlutuziSTnywqDK2VNVQWfBkGwe85dE2Gx -2jhEq2Pju5f/al4BqgiJO7XEKbzxsg5ooTqKbyRxQev5hBEqs9p1CIFdpKMgJ/IX -exqTFKNhoIb+TD3dZNGL7ntwZJUDF3mA86e2aeN+3oNUH5ZdxuV/xjt1ADiQDClT -PAuOVs9u2HiTzQO2Gt6A1S2wEfx6tJw1bghNx80xZNf82bD0aVH0PsbaISIPf/qV -NibS6WHsreJ24NNn7iGpPi0u3pv67sBV8AUASi2Txq0Fd819atTjwGSjUb0SDRO5 -K9z6v95pEu3m//JbAD8Qi272nvXUX6tLolplmO5Jvwagw+ibP0+KCbVxRIZTBTzi -h+qvc7OSAIvFy6lEhI3+y1htnyBXp8SqTvxO/F7Q31zzasX5AihA1xeFIWBoLeZf -XHFVDH8/KbXKn+/6w9jo/mui8HB+CZVT81LMeXEaB3g0af+w1Odr3EMmZNPVfZF/ -CT0gdurNktymjJtwaOHnAY4BglqZZJJoaDjrP4vRKfnPCfqUxmc= -=pCJx +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR8MACgkQH9Yu2W4l +OodEfxAA0Oyx55WTT+lICjhgdWUStdLwOKU1/GR2P9u1+f+TKWmjwed68jOoLNO3 +2sixA4Yuq9R8jXDkrfZ9Z1XkoN+P+Onjf2On9yrCj9Pn7Y6yv+ImWMrY5mII46ML +oJdgbQmIQ58hOtWqCbARtmTw/gU0aX2AnzyTKLdF+3FNMJSTppyIuBZFaPOv0d01 +/uZCiAThJbmZFZ0huiyF3F+i/Cb51N1QBg7PlM92CMBZVWdb9O3y9F3FK10OG8r0 +gB817XUOCsI8AwDkySPh3SMvQ4hsqK2ImTRgq6WQmoU+WRS2BSUzyNFqtbqcdB1R +RO8XkV5AbxRoOVOO9py5ySIN23KLnXoGLcBuLdTYlW8gGta18kgvJlosJGkuKYbU +9tFM7IzXZQ+aOOWJ6tSuoHEctfDFM3O37pJ+PQFQIxojP/hAn1n7DWHuh29+xRGt +ApjcgKVcEvqd0yDWRufuUcxqVXjQYzzvwr3iQANXox2WnHnEWwgrxWGxxRkZpaMh +67iHehCgKh8gUTp9hPhpwAT5W96+9hcDXuFnR+NYRfibnhdQ6XhdA/hJg1XQ+Fjb +pcrid1YV8pBNo+1l29fKTphOfr4DRceC1pqClis+f7oL71icUJ+K6hZVV603nWVs +Rb9esaTUfEUiPShOrlDNbmNKXPvnYsvQ4mLSh3Bihuvvz5GrbmQ= +=11Yu -----END PGP SIGNATURE----- -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git

git-admin＠x2go.org

12:48 p.m.

New subject: [x2go-keyring] 09/13: Makefile: do not try to run gpg1 to export and import keys if the keyrings are actually empty.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit b1519ad2f042a32e2d3185b8c6d03e5eda9f22ff Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:33:01 2019 +0200 Makefile: do not try to run gpg1 to export and import keys if the keyrings are actually empty. --- Makefile | 16 ++++++++++++---- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8ee0aa..348418f 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,9 @@ keyrings/x2go-archive-keyring.gpg: active-keys/index keyrings/x2go-archive-keyring.gpg1: keyrings/x2go-archive-keyring.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index @@ -95,7 +97,9 @@ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index keyrings/x2go-archive-removed-keys.gpg1: keyrings/x2go-archive-removed-keys.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index @@ -115,7 +119,9 @@ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index keyrings/x2go-maintainers-keyring.gpg1: keyrings/x2go-maintainers-keyring.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index @@ -135,7 +141,9 @@ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index keyrings/x2go-maintainers-removed-keys.gpg1: keyrings/x2go-maintainers-removed-keys.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-keys/index diff --git a/debian/changelog b/debian/changelog index d761b87..4a034f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium their signatures. * Makefile: do not require a full build and verification run for the maintonly target. + * Makefile: do not try to run gpg1 to export and import keys if the keyrings + are actually empty. * 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

12:48 p.m.

New subject: [x2go-keyring] 05/13: Makefile: add maintonly target for generating gpg-1.4/2.0-style keyrings.

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@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

git-admin＠x2go.org

12:48 p.m.

New subject: [x2go-keyring] 12/13: keyrings/: add signatures on old-style keyrings.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 8234804a7b67a070fe5ef0ef4f78a48df7f84dc7 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:44:55 2019 +0200 keyrings/: add signatures on old-style keyrings. --- debian/changelog | 1 + keyrings/x2go-archive-keyring.gpg1.asc | 16 ++++++++++++++++ keyrings/x2go-archive-removed-keys.gpg1.asc | 16 ++++++++++++++++ keyrings/x2go-maintainers-keyring.gpg1.asc | 16 ++++++++++++++++ keyrings/x2go-maintainers-removed-keys.gpg1.asc | 16 ++++++++++++++++ 5 files changed, 65 insertions(+) diff --git a/debian/changelog b/debian/changelog index f0b455d..b88b7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium are actually empty. * Makefile: add old-style keyrings to cleanup. * keyrings/: refresh signatures on new-style keyrings. + * keyrings/: add signatures on old-style keyrings. * debian/control: - Change maintainer to the mailing list. - Add the old package maintainer to the Uploaders field and myself. diff --git a/keyrings/x2go-archive-keyring.gpg1.asc b/keyrings/x2go-archive-keyring.gpg1.asc new file mode 100644 index 0000000..739c5b2 --- /dev/null +++ b/keyrings/x2go-archive-keyring.gpg1.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR5wACgkQH9Yu2W4l +OocuUBAAqPPlfvKRlBDMJRntPFORIwsRFLsWG6nLJlcixPXH0CU6d3JrL9TsLOEM +VVzmy0DX/O5NCFud8PS49SrGRfxgtkIzbpjjrrBQAgUjqHXLgRS3DcsMKNwo+lJO +hcJM0hj1xIximAbAqRDf/Kkah/2sGZ519Amptwx5cpOm2r19OcyEhNq5RannFfbR +qxo+6o/bBfg26JP4dQWr1XL3xid3sz2629bPiFkVUPGOkj+tDnZ+WiDEPwcZe4ng +29TLH/u+yZXrvx2rb9gJ+uHm+Ep2sIoPEfEuZJOKMKALC+OQsNljLERq3WZE4Tpi +vILxYB8+9CqBRczVcilyavd4mWqpL4jlmvIikKhUWryqX21jFjEfpMVjCPfl+pzz +0LJyPuu87hXKsACIqkBQqOxCebJ30bf0IKoPLp5p95iQ13Q1ugOwF4C/9smM5jC/ +vGvrAKzRspzRFPjpecfXzSso/tnOSeeuXIZtbS5svWbhb7wLETKw+KMm7lzCwtwB +Gah5Zr+tgop0IOqABdvU3/fnnJNAUm4iNPN/KjiJM/7tl7iMg5PMfz4Y5vt9TiCk +Nc/y3faRKGFSxNJ+32hpaCzpcboAIXkE/dkaxKyp1by5oerw1tQw8wd+PI3/zBza +tq6UQUa8/fqwGMQC9HqSbvwuhZPxSdSUu/FaYYgNkgbLMmO5Dv8= +=ifRe +-----END PGP SIGNATURE----- diff --git a/keyrings/x2go-archive-removed-keys.gpg1.asc b/keyrings/x2go-archive-removed-keys.gpg1.asc new file mode 100644 index 0000000..ee1298e --- /dev/null +++ b/keyrings/x2go-archive-removed-keys.gpg1.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR8QACgkQH9Yu2W4l +OocirhAAw+pKw9cfOAvaL4rM2pS3+Ss7UF7fmLNr+eeeJGzuKnLgSz1Izo46ZEdb +wGs5X2gNZx3zAH40uLi9rFIvRenpI4tBtu6GGKcHCIKTgOLIfOanbOfBlsKeWV8U +YGPYObAL/p8tRFVDf1v8Qsvcy1wiUrIwhFn7b2sIMneN0vG715q2RiItkOl28VpJ +prVNQ0OaBLiqu03wFnMF+QWf2sP1oDHN/qmkRctaVZWzS1pfVMvk50zZ+Zjpds8f +qNAKI7B9fOhpm08v7L1mOfTxniymo6NOwr0lexzOJqD4sMZ+8NZb+bMtKyyl8I0X +IT96fuRyPL5/1m95gFq10RmL3oz+t1hcvOrcVKFAFqt3fif/6cKrdlzIptpd+vNK +1p0kWKS4qerQlVPvaarE2uSpWBa5b+Ydsa21sSRDZcL63ykofnp4XYQDYLhz00Gj +Hq0+9cIhh3Q1gFOadCJbkUi1C8/LQmSSwXmNSF9tebCNVq254jQ673XMDiosQivo +lHUouvVqNUu7tP97MCA9MLemtco6rIN//ZRlimWjL2iD9vthDzkbwfgYbLNL3JFW +k5+fUPHCe0tZwLVw6YFgYIJy/fyKdwn1czicPPC8Re7/0MAvCkk8OVUwirwiWm8D +Z+eHic0mTcz0CAuUzUE72GWL7JcV9eophCrUyfaGT0YtOy4YDD0= +=BlKS +-----END PGP SIGNATURE----- diff --git a/keyrings/x2go-maintainers-keyring.gpg1.asc b/keyrings/x2go-maintainers-keyring.gpg1.asc new file mode 100644 index 0000000..739c5b2 --- /dev/null +++ b/keyrings/x2go-maintainers-keyring.gpg1.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR5wACgkQH9Yu2W4l +OocuUBAAqPPlfvKRlBDMJRntPFORIwsRFLsWG6nLJlcixPXH0CU6d3JrL9TsLOEM +VVzmy0DX/O5NCFud8PS49SrGRfxgtkIzbpjjrrBQAgUjqHXLgRS3DcsMKNwo+lJO +hcJM0hj1xIximAbAqRDf/Kkah/2sGZ519Amptwx5cpOm2r19OcyEhNq5RannFfbR +qxo+6o/bBfg26JP4dQWr1XL3xid3sz2629bPiFkVUPGOkj+tDnZ+WiDEPwcZe4ng +29TLH/u+yZXrvx2rb9gJ+uHm+Ep2sIoPEfEuZJOKMKALC+OQsNljLERq3WZE4Tpi +vILxYB8+9CqBRczVcilyavd4mWqpL4jlmvIikKhUWryqX21jFjEfpMVjCPfl+pzz +0LJyPuu87hXKsACIqkBQqOxCebJ30bf0IKoPLp5p95iQ13Q1ugOwF4C/9smM5jC/ +vGvrAKzRspzRFPjpecfXzSso/tnOSeeuXIZtbS5svWbhb7wLETKw+KMm7lzCwtwB +Gah5Zr+tgop0IOqABdvU3/fnnJNAUm4iNPN/KjiJM/7tl7iMg5PMfz4Y5vt9TiCk +Nc/y3faRKGFSxNJ+32hpaCzpcboAIXkE/dkaxKyp1by5oerw1tQw8wd+PI3/zBza +tq6UQUa8/fqwGMQC9HqSbvwuhZPxSdSUu/FaYYgNkgbLMmO5Dv8= +=ifRe +-----END PGP SIGNATURE----- diff --git a/keyrings/x2go-maintainers-removed-keys.gpg1.asc b/keyrings/x2go-maintainers-removed-keys.gpg1.asc new file mode 100644 index 0000000..ee1298e --- /dev/null +++ b/keyrings/x2go-maintainers-removed-keys.gpg1.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAl1ZR8QACgkQH9Yu2W4l +OocirhAAw+pKw9cfOAvaL4rM2pS3+Ss7UF7fmLNr+eeeJGzuKnLgSz1Izo46ZEdb +wGs5X2gNZx3zAH40uLi9rFIvRenpI4tBtu6GGKcHCIKTgOLIfOanbOfBlsKeWV8U +YGPYObAL/p8tRFVDf1v8Qsvcy1wiUrIwhFn7b2sIMneN0vG715q2RiItkOl28VpJ +prVNQ0OaBLiqu03wFnMF+QWf2sP1oDHN/qmkRctaVZWzS1pfVMvk50zZ+Zjpds8f +qNAKI7B9fOhpm08v7L1mOfTxniymo6NOwr0lexzOJqD4sMZ+8NZb+bMtKyyl8I0X +IT96fuRyPL5/1m95gFq10RmL3oz+t1hcvOrcVKFAFqt3fif/6cKrdlzIptpd+vNK +1p0kWKS4qerQlVPvaarE2uSpWBa5b+Ydsa21sSRDZcL63ykofnp4XYQDYLhz00Gj +Hq0+9cIhh3Q1gFOadCJbkUi1C8/LQmSSwXmNSF9tebCNVq254jQ673XMDiosQivo +lHUouvVqNUu7tP97MCA9MLemtco6rIN//ZRlimWjL2iD9vthDzkbwfgYbLNL3JFW +k5+fUPHCe0tZwLVw6YFgYIJy/fyKdwn1czicPPC8Re7/0MAvCkk8OVUwirwiWm8D +Z+eHic0mTcz0CAuUzUE72GWL7JcV9eophCrUyfaGT0YtOy4YDD0= +=BlKS +-----END PGP SIGNATURE----- -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git

git-admin＠x2go.org

12:48 p.m.

New subject: [x2go-keyring] 08/13: Makefile: do not require a full build and verification run for the maintonly target.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 0fd258984fa844169171de5fb76a5a1706b2a066 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:27:15 2019 +0200 Makefile: do not require a full build and verification run for the maintonly target. --- Makefile | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eb72fcf..e8ee0aa 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ 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 +maintonly: 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} \ diff --git a/debian/changelog b/debian/changelog index adb0810..d761b87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,6 +92,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium new-style ones failed validation. * README.maintainer: update documentation to include old-style keyrings and their signatures. + * Makefile: do not require a full build and verification run for the + maintonly target. * 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

12:48 p.m.

New subject: [x2go-keyring] 07/13: README.maintainer: update documentation to include old-style keyrings and their signatures.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 1f0555fb237d0e1c778c0d7cee9e62834a3ebada Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:22:21 2019 +0200 README.maintainer: update documentation to include old-style keyrings and their signatures. --- README.maintainer | 11 +++++++++++ debian/changelog | 2 ++ 2 files changed, 13 insertions(+) diff --git a/README.maintainer b/README.maintainer index 6bf765d..352de86 100644 --- a/README.maintainer +++ b/README.maintainer @@ -1,6 +1,11 @@ Maintainer notes ================ +***WARNING*** +As a maintainer, you will need both a modern GnuPG and a legacy GnuPG version installed. +Modern is anything past 2.1.14, legacy is 1.4 up to 2.1. +***WARNING*** + Adding a new team member key ---------------------------- @@ -58,11 +63,17 @@ Pre-build make keyrings/x2go-archive-keyring.gpg make keyrings/x2go-maintainers-keyring.gpg +make maintonly gpg --armor --detach-sign keyrings/x2go-archive-keyring.gpg gpg --armor --detach-sign keyrings/x2go-maintainers-keyring.gpg +gpg --armor --detach-sign keyrings/x2go-archive-keyring.gpg1 +gpg --armor --detach-sign keyrings/x2go-maintainers-keyring.gpg1 + If any keys were removed: make keyrings/x2go-archive-removed-keys.gpg make keyrings/x2go-maintainers-removed-keys.gpg gpg --armor --detach-sign keyrings/x2go-archive-removed-keys.gpg gpg --armor --detach-sign keyrings/x2go-maintainers-removed-keys.gpg +gpg --armor --detach-sign keyrings/x2go-archive-removed-keys.gpg1 +gpg --armor --detach-sign keyrings/x2go-maintainers-removed-keys.gpg1 diff --git a/debian/changelog b/debian/changelog index ca6a51c..adb0810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium keyrings. * Makefile: fallback to old-style keyring signature checks if the default new-style ones failed validation. + * README.maintainer: update documentation to include old-style keyrings and + their signatures. * 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

12:48 p.m.

New subject: [x2go-keyring] 06/13: Makefile: fallback to old-style keyring signature checks if the default new-style ones failed validation.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit 2fd1c6c6c7a08f64ced00527c32b26d78b3bb344 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:16:58 2019 +0200 Makefile: fallback to old-style keyring signature checks if the default new-style ones failed validation. --- Makefile | 24 ++++++++++++++++++++---- debian/changelog | 2 ++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9707436..eb72fcf 100644 --- a/Makefile +++ b/Makefile @@ -26,19 +26,35 @@ verify-results: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers- ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-archive-keyring.gpg.asc \ - keyrings/x2go-archive-keyring.gpg + keyrings/x2go-archive-keyring.gpg || \ + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ + keyrings/x2go-archive-keyring.gpg1.asc \ + keyrings/x2go-archive-keyring.gpg ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-archive-removed-keys.gpg.asc \ - keyrings/x2go-archive-removed-keys.gpg + keyrings/x2go-archive-removed-keys.gpg || \ + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ + keyrings/x2go-archive-removed-keys.gpg1.asc \ + keyrings/x2go-archive-removed-keys.gpg ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-maintainers-keyring.gpg.asc \ - keyrings/x2go-maintainers-keyring.gpg + keyrings/x2go-maintainers-keyring.gpg || \ + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ + keyrings/x2go-maintainers-keyring.gpg1.asc \ + keyrings/x2go-maintainers-keyring.gpg ${GPG} ${GPG_OPTIONS} \ --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ keyrings/x2go-maintainers-removed-keys.gpg.asc \ - keyrings/x2go-maintainers-removed-keys.gpg + keyrings/x2go-maintainers-removed-keys.gpg || \ + ${GPG} ${GPG_OPTIONS} \ + --keyring keyrings/x2go-maintainers-keyring.gpg --verify \ + keyrings/x2go-maintainers-removed-keys.gpg1.asc \ + keyrings/x2go-maintainers-removed-keys.gpg #FIXME: Do we need to verify the created keyrings in trusted.gpg.d, too? # Maybe "just" checking that no key is added if we merge, but how… diff --git a/debian/changelog b/debian/changelog index ce27da4..ca6a51c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium difference for the x2go-maintainers keyring, but why not. * Makefile: add maintonly target for generating gpg-1.4/2.0-style keyrings. + * Makefile: fallback to old-style keyring signature checks if the default + new-style ones failed validation. * 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

12:48 p.m.

New subject: [x2go-keyring] 10/13: Makefile: add old-style keyrings to cleanup.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit f908dd3952e3d5dbdde43d04b9603744fe6d9e14 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:40:52 2019 +0200 Makefile: add old-style keyrings to cleanup. --- Makefile | 20 ++++++++++++-------- debian/changelog | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 348418f..fe12067 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,6 @@ keyrings/x2go-archive-keyring.gpg1: keyrings/x2go-archive-keyring.gpg if [ -s $@ ]; then \ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ fi - rm -f $@~ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index if [ -e 'removed-keys/index' ] && [ ! -s 'removed-keys/index' ]; then \ @@ -100,7 +99,6 @@ keyrings/x2go-archive-removed-keys.gpg1: keyrings/x2go-archive-removed-keys.gpg if [ -s $@ ]; then \ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ fi - rm -f $@~ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index if [ -e 'x2go-maintainers/index' ] && [ ! -s 'x2go-maintainers/index' ]; then \ @@ -122,7 +120,6 @@ keyrings/x2go-maintainers-keyring.gpg1: keyrings/x2go-maintainers-keyring.gpg if [ -s $@ ]; then \ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ fi - 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 \ @@ -144,7 +141,6 @@ keyrings/x2go-maintainers-removed-keys.gpg1: keyrings/x2go-maintainers-removed-k if [ -s $@ ]; then \ ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ fi - rm -f $@~ $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-keys/index mkdir -p $(TMPRING) trusted.gpg @@ -164,16 +160,24 @@ $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-key clean: rm -f keyrings/x2go-archive-keyring.gpg \ keyrings/x2go-archive-keyring.gpg~ \ - keyrings/x2go-archive-keyring.gpg.lastchangeset + keyrings/x2go-archive-keyring.gpg.lastchangeset \ + keyrings/x2go-archive-keyring.gpg1 \ + keyrings/x2go-archive-keyring.gpg1~ rm -f keyrings/x2go-archive-removed-keys.gpg \ keyrings/x2go-archive-removed-keys.gpg~ \ - keyrings/x2go-archive-removed-keys.gpg.lastchangeset + keyrings/x2go-archive-removed-keys.gpg.lastchangeset \ + keyrings/x2go-archive-removed-keys.gpg1 \ + keyrings/x2go-archive-removed-keys.gpg1~ rm -f keyrings/x2go-maintainers-keyring.gpg \ keyrings/x2go-maintainers-keyring.gpg~ \ - keyrings/x2go-maintainers-keyring.gpg.lastchangeset + keyrings/x2go-maintainers-keyring.gpg.lastchangeset \ + keyrings/x2go-maintainers-keyring.gpg1 \ + keyrings/x2go-maintainers-keyring.gpg1~ rm -f keyrings/x2go-maintainers-removed-keys.gpg \ keyrings/x2go-maintainers-removed-keys.gpg~ \ - keyrings/x2go-maintainers-removed-keys.gpg.lastchangeset + keyrings/x2go-maintainers-removed-keys.gpg.lastchangeset \ + keyrings/x2go-maintainers-removed-keys.gpg1 \ + keyrings/x2go-maintainers-removed-keys.gpg1~ rm -rf $(TMPRING) trusted.gpg trustdb.gpg rm -f keyrings/*.cache diff --git a/debian/changelog b/debian/changelog index 4a034f2..7ff1489 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium maintonly target. * Makefile: do not try to run gpg1 to export and import keys if the keyrings are actually empty. + * Makefile: add old-style keyrings to cleanup. * 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

12:48 p.m.

New subject: [x2go-keyring] 13/13: .gitignore: refresh with old-style and vim backup files.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit ec3bb1ebfe4bd960120fe68960737a7da79b0c16 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:47:28 2019 +0200 .gitignore: refresh with old-style and vim backup files. --- .gitignore | 7 +++++++ debian/changelog | 1 + 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 2b367b1..1dc3c75 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,10 @@ keyrings/*.lastchangeset keyrings/*~ keyrings/*.tmp keyrings/*.gpg +keyrings/*.gpg1 + +# This file. +.gitignore + +# vim backup files. +*.sw? diff --git a/debian/changelog b/debian/changelog index b88b7cb..af64578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium * Makefile: add old-style keyrings to cleanup. * keyrings/: refresh signatures on new-style keyrings. * keyrings/: add signatures on old-style keyrings. + * .gitignore: refresh with old-style and vim backup files. * 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

2120

Age (days ago)

2120

Last active (days ago)

x2go-commits@lists.x2go.org

13 comments

1 participants

tags (0)

participants (1)

git-admin＠x2go.org