Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mention pkuczynski gpg key in docs and cli #4519

Merged
merged 1 commit into from
Dec 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Change Log

## [Unreleased](https://github.com/rvm/rvm/tree/HEAD)
[Full Changelog](https://github.com/rvm/rvm/compare/1.29.5...HEAD)
[Full Changelog](https://github.com/rvm/rvm/compare/1.29.6...HEAD)

#### New features:
*
Expand All @@ -15,8 +15,15 @@
#### Binaries:
*

## [1.29.6](https://github.com/rvm/rvm/tag/1.29.6)
12 December 2018 - [Full Changelog](https://github.com/rvm/rvm/compare/1.29.5...1.29.6)

#### Bug fixes:
* Correct version listed in VERSION file
* Mention pkuczynski gpg key in docs and cli

## [1.29.5](https://github.com/rvm/rvm/tag/1.29.5)
1 July 2018 - [Full Changelog](https://github.com/rvm/rvm/compare/1.29.4...1.29.5)
12 December 2018 - [Full Changelog](https://github.com/rvm/rvm/compare/1.29.4...1.29.5)

#### New features:
* Switch to new maven-based JRuby download URLs
Expand Down
7 changes: 4 additions & 3 deletions binscripts/rvm-installer
Original file line number Diff line number Diff line change
Expand Up @@ -415,16 +415,17 @@ Assuming you trust Michal Papis import the mpapis public key (downloading the si

GPG signature verification failed for '$1' - '$3'! Try to install GPG v2 and then fetch the public key:

${SUDO_USER:+sudo }gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
${SUDO_USER:+sudo }${rvm_gpg_command##*/} --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB

or if it fails:

command curl -sSL https://rvm.io/mpapis.asc | ${SUDO_USER:+sudo }${rvm_gpg_command##*/} --import -
command curl -sSL https://rvm.io/pkuczynski.asc | ${SUDO_USER:+sudo }${rvm_gpg_command##*/} --import -

the key can be compared with:

https://rvm.io/mpapis.asc
https://keybase.io/mpapis
https://rvm.io/mpapis.asc or https://keybase.io/mpapis
https://rvm.io/pkuczynski.asc

NOTE: GPG version 2.1.17 have a bug which cause failures during fetching keys from remote server. Please downgrade \
or upgrade to newer version (if available) or use the second method described above.
Expand Down
26 changes: 13 additions & 13 deletions binscripts/rvm-installer.asc
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEYsnl9NowDZSsNhZr4gbCn78E/xcFAlrAAgAACgkQ4gbCn78E
/xfyYw//SJqHyaTQnP4vo0UtsEi+LbdHwyHGxnYbmxEEcoA9QFiYV1xMMK19oedv
zQpFKmQ8Eme1LbmelSPDQvg/LgYvPuofRw0zdfImxymGGIGG3laSzmoEW7mWa7WV
/p6KH4B/Pbs23X5R+nNDBz+BeRNVnZDb5oM+wvVEw+AKn4SI40VxnXOCO0L7xFKS
W2o9NY4CMfghKxbu+AkssPWhvxVoMKyTnqFHGKEVES7mJGRe7t2TGS1mufocmjLm
ZSlM1L94AmwKPioZTLBB+rxQ5cHrH0QLHTs/BTKcajRqszOsRSoaYculewFrp4Ps
uSavoQpFs6vz/DR/JNLpWiMXafymi0/d78kGUfj3Gp3q/bozmyee4v4Uw9Prppno
1MlFYQmg4K3553vAU/ZWACc7l00PnH2lUbbaBw7Du5oIS0q56vHm/pk7aLN1a3OK
Z0Qowz7C8cAaIF7HyhbLWXzyHSDY3mc8I6o2UX5gu4InQ6hUaktbykuxrxZz9QEv
iXRVpf64jkrXkjhEWZTT+5Mkmm/qn9CaHkYKljpGsOQVzC9KbC9mFArn/YT9ciYx
ith/5ohS80vutFtyTiJOU5Bhjyl5c5GI1BLxSL+/W8rGVcAYK6s5xjMXwBmADDyv
56zik7n8YK9ajSjDxOB0SQ3ez+hHzjUJ/CF5DEMvg8vHiHZLvxg=
=1rHi
iQIzBAABCAAdFiEEfSuvHPN7E+IGnWlWEFvQ5zlJm9sFAlwRMesACgkQEFvQ5zlJ
m9vurA/8DW9FPqrWvdBaSvirELcrLj6H5x9BdiYb8tpyoqWnf4Rj5Xr1XccnnYe+
171NIKN3SPJsdUVGaAeT352K4Q/sHMT2KPKfRlEFUoVE5XklY+NvYEDtoxNI7tx1
3UQnPFif+WUY4aQcw9e+Y7qPdiXED+Tqq+o4ONgfh0AKjN4CofrHE00Gmn+iYy6Y
eaO2w0KKccsi3gQ6O9vKLTxOtV0m0QbJ+1k99n0BhxV00Nbq1VVsVFabQZ/LvOC0
Tzy+/ixlGhFaJXRxKUb9Sg+uHW0DaaFoOCxrBIjNoR9PitgRF4WMnv4B5r7fZp3l
xyzi8RrOn1ggpP2LkOtjMGTf/bSyifRaIHaxslL+iEckWJZyQzlmuyy8UuD1rjgp
O6OmOepzXLoSq+h0Rkltsm1lj8wlXp3HqgjesWM0IldLavAYHTsQ+AstWkgd3rka
TXre2THbHt6I97zx7hXfTuJnjbs5qHDO/8pVNaMgGfjwZMD8cKKZOeLO3z4yq/E5
uOuKbq8gi2MZL91HAWnSMQChDhKUkpD6cbSWZb7/8eeGflCpmIGBjLLSLUEXxqGx
P3rHcJV0UG47+u5WDFcFF5+xTUjzYZ+Xgmb1yI/mLf6XQ/L5rBwzUu/4oLY5vGa5
AoaMAoCYKWo2X+qQzajlST2M6iRvHehvJIMZVNCAEjGJs5KWqTs=
=idq8
-----END PGP SIGNATURE-----
6 changes: 3 additions & 3 deletions docs/gpg.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ run our code - trust our keys.

1. import keys:

gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 # mpapis@gmail.com

gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 # mpapis@gmail.com
gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB # piotr.kuczynski@gmail.com

2. refresh keys:

Expand All @@ -31,7 +31,7 @@ run our code - trust our keys.
3. trust developers:

echo 409B6B1796C275462A1703113804BB82D39DC0E3:6: | gpg2 --import-ownertrust # mpapis@gmail.com

echo 7D2BAF1CF37B13E2069D6956105BD0E739499BDB:6: | gpg2 --import-ownertrust # piotr.kuczynski@gmail.com

4. verified installation:

Expand Down
7 changes: 4 additions & 3 deletions scripts/functions/cli
Original file line number Diff line number Diff line change
Expand Up @@ -221,16 +221,17 @@ Assuming you trust Michal Papis import the mpapis public key (downloading the si

GPG signature verification failed for '$1' - '$3'! Try to install GPG v2 and then fetch the public key:

${SUDO_USER:+sudo }gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
${SUDO_USER:+sudo }${rvm_gpg_command##*/} --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB

or if it fails:

command curl -sSL https://rvm.io/mpapis.asc | ${SUDO_USER:+sudo }${rvm_gpg_command##*/} --import -
command curl -sSL https://rvm.io/pkuczynski.asc | ${SUDO_USER:+sudo }${rvm_gpg_command##*/} --import -

the key can be compared with:

https://rvm.io/mpapis.asc
https://keybase.io/mpapis
https://rvm.io/mpapis.asc or https://keybase.io/mpapis
https://rvm.io/pkuczynski.asc

NOTE: GPG version 2.1.17 have a bug which cause failures during fetching keys from remote server. Please downgrade \
or upgrade to newer version (if available) or use the second method described above.
Expand Down