aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2016-04-13 12:34:32 +0200
committerMarcoFalke <[email protected]>2016-04-15 11:58:46 +0200
commitfaf4c837fba119437ddbb36d6a799dc5fd79db37 (patch)
tree4019774bd678fe58cd0dca252f81ce038e46d27f
parent[gitian] Add marcofalke-key.pgp (diff)
downloaddiscoin-faf4c837fba119437ddbb36d6a799dc5fd79db37.tar.xz
discoin-faf4c837fba119437ddbb36d6a799dc5fd79db37.zip
[gitian] Move keys to contrib/gitian-keys
-rw-r--r--contrib/README.md6
-rw-r--r--contrib/gitian-keys/achow101-key.pgp (renamed from contrib/gitian-downloader/achow101-key.pgp)0
-rw-r--r--contrib/gitian-keys/aschildbach-key.pgp (renamed from contrib/gitian-downloader/aschildbach-key.pgp)bin1993 -> 1993 bytes
-rw-r--r--contrib/gitian-keys/bluematt-key.pgp (renamed from contrib/gitian-downloader/bluematt-key.pgp)bin10324 -> 10324 bytes
-rw-r--r--contrib/gitian-keys/btcdrak-key.pgp (renamed from contrib/gitian-downloader/btcdrak-key.pgp)0
-rw-r--r--contrib/gitian-keys/cdecker-key.pgp (renamed from contrib/gitian-downloader/cdecker-key.pgp)bin2230 -> 2230 bytes
-rw-r--r--contrib/gitian-keys/centaur1-key.pgp (renamed from contrib/gitian-downloader/centaur1-key.pgp)0
-rw-r--r--contrib/gitian-keys/cfields-key.pgp (renamed from contrib/gitian-downloader/cfields-key.pgp)0
-rw-r--r--contrib/gitian-keys/devrandom-key.pgp (renamed from contrib/gitian-downloader/devrandom-key.pgp)bin2213 -> 2213 bytes
-rw-r--r--contrib/gitian-keys/erkmos.pgp (renamed from contrib/gitian-downloader/erkmos.pgp)bin10205 -> 10205 bytes
-rw-r--r--contrib/gitian-keys/fanquake-key.pgp (renamed from contrib/gitian-downloader/fanquake-key.pgp)0
-rw-r--r--contrib/gitian-keys/gavinandresen-key.pgp (renamed from contrib/gitian-downloader/gavinandresen-key.pgp)bin1176 -> 1176 bytes
-rw-r--r--contrib/gitian-keys/jl2012-key.pgp (renamed from contrib/gitian-downloader/jl2012-key.pgp)0
-rw-r--r--contrib/gitian-keys/jonasschnelli-key.pgp (renamed from contrib/gitian-downloader/jonasschnelli-key.pgp)0
-rw-r--r--contrib/gitian-keys/laanwj-key.pgp (renamed from contrib/gitian-downloader/laanwj-key.pgp)0
-rw-r--r--contrib/gitian-keys/luke-jr-key.pgp (renamed from contrib/gitian-downloader/luke-jr-key.pgp)bin6518 -> 6518 bytes
-rw-r--r--contrib/gitian-keys/marcofalke-key.pgp (renamed from contrib/gitian-downloader/marcofalke-key.pgp)0
-rw-r--r--contrib/gitian-keys/michagogo-key.pgp (renamed from contrib/gitian-downloader/michagogo-key.pgp)0
-rw-r--r--contrib/gitian-keys/petertodd-key.pgp (renamed from contrib/gitian-downloader/petertodd-key.pgp)0
-rw-r--r--contrib/gitian-keys/prab-key.pgp (renamed from contrib/gitian-downloader/prab-key.pgp)0
-rw-r--r--contrib/gitian-keys/sipa-key.pgp (renamed from contrib/gitian-downloader/sipa-key.pgp)bin137597 -> 137597 bytes
-rw-r--r--contrib/gitian-keys/tcatm-key.pgp (renamed from contrib/gitian-downloader/tcatm-key.pgp)bin1554 -> 1554 bytes
-rw-r--r--contrib/gitian-keys/wtogami-key.pgp (renamed from contrib/gitian-downloader/wtogami-key.pgp)0
-rw-r--r--doc/release-process.md2
24 files changed, 4 insertions, 4 deletions
diff --git a/contrib/README.md b/contrib/README.md
index 946153916..32b3a170a 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -34,10 +34,10 @@ Contains files used to package bitcoind/bitcoin-qt
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
### [Gitian-descriptors](/contrib/gitian-descriptors) ###
-Gavin's notes on getting gitian builds up and running using KVM.
+Notes on getting Gitian builds up and running using KVM.
-### [Gitian-downloader](/contrib/gitian-downloader)
-Various PGP files of core developers.
+### [Gitian-keys](/contrib/gitian-keys)
+PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds.
diff --git a/contrib/gitian-downloader/achow101-key.pgp b/contrib/gitian-keys/achow101-key.pgp
index 030fd5cf3..030fd5cf3 100644
--- a/contrib/gitian-downloader/achow101-key.pgp
+++ b/contrib/gitian-keys/achow101-key.pgp
diff --git a/contrib/gitian-downloader/aschildbach-key.pgp b/contrib/gitian-keys/aschildbach-key.pgp
index df06e19fa..df06e19fa 100644
--- a/contrib/gitian-downloader/aschildbach-key.pgp
+++ b/contrib/gitian-keys/aschildbach-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/bluematt-key.pgp b/contrib/gitian-keys/bluematt-key.pgp
index 2389d4657..2389d4657 100644
--- a/contrib/gitian-downloader/bluematt-key.pgp
+++ b/contrib/gitian-keys/bluematt-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/btcdrak-key.pgp b/contrib/gitian-keys/btcdrak-key.pgp
index 60d76c0ec..60d76c0ec 100644
--- a/contrib/gitian-downloader/btcdrak-key.pgp
+++ b/contrib/gitian-keys/btcdrak-key.pgp
diff --git a/contrib/gitian-downloader/cdecker-key.pgp b/contrib/gitian-keys/cdecker-key.pgp
index 928a74b31..928a74b31 100644
--- a/contrib/gitian-downloader/cdecker-key.pgp
+++ b/contrib/gitian-keys/cdecker-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/centaur1-key.pgp b/contrib/gitian-keys/centaur1-key.pgp
index 71a42e514..71a42e514 100644
--- a/contrib/gitian-downloader/centaur1-key.pgp
+++ b/contrib/gitian-keys/centaur1-key.pgp
diff --git a/contrib/gitian-downloader/cfields-key.pgp b/contrib/gitian-keys/cfields-key.pgp
index 6b0bd240b..6b0bd240b 100644
--- a/contrib/gitian-downloader/cfields-key.pgp
+++ b/contrib/gitian-keys/cfields-key.pgp
diff --git a/contrib/gitian-downloader/devrandom-key.pgp b/contrib/gitian-keys/devrandom-key.pgp
index 71898127b..71898127b 100644
--- a/contrib/gitian-downloader/devrandom-key.pgp
+++ b/contrib/gitian-keys/devrandom-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/erkmos.pgp b/contrib/gitian-keys/erkmos.pgp
index 9d3f06062..9d3f06062 100644
--- a/contrib/gitian-downloader/erkmos.pgp
+++ b/contrib/gitian-keys/erkmos.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/fanquake-key.pgp b/contrib/gitian-keys/fanquake-key.pgp
index 9c03ff452..9c03ff452 100644
--- a/contrib/gitian-downloader/fanquake-key.pgp
+++ b/contrib/gitian-keys/fanquake-key.pgp
diff --git a/contrib/gitian-downloader/gavinandresen-key.pgp b/contrib/gitian-keys/gavinandresen-key.pgp
index f81f44e87..f81f44e87 100644
--- a/contrib/gitian-downloader/gavinandresen-key.pgp
+++ b/contrib/gitian-keys/gavinandresen-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/jl2012-key.pgp b/contrib/gitian-keys/jl2012-key.pgp
index b8aad7fd8..b8aad7fd8 100644
--- a/contrib/gitian-downloader/jl2012-key.pgp
+++ b/contrib/gitian-keys/jl2012-key.pgp
diff --git a/contrib/gitian-downloader/jonasschnelli-key.pgp b/contrib/gitian-keys/jonasschnelli-key.pgp
index 3831eaea1..3831eaea1 100644
--- a/contrib/gitian-downloader/jonasschnelli-key.pgp
+++ b/contrib/gitian-keys/jonasschnelli-key.pgp
diff --git a/contrib/gitian-downloader/laanwj-key.pgp b/contrib/gitian-keys/laanwj-key.pgp
index 559295109..559295109 100644
--- a/contrib/gitian-downloader/laanwj-key.pgp
+++ b/contrib/gitian-keys/laanwj-key.pgp
diff --git a/contrib/gitian-downloader/luke-jr-key.pgp b/contrib/gitian-keys/luke-jr-key.pgp
index 4406e6d5b..4406e6d5b 100644
--- a/contrib/gitian-downloader/luke-jr-key.pgp
+++ b/contrib/gitian-keys/luke-jr-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/marcofalke-key.pgp b/contrib/gitian-keys/marcofalke-key.pgp
index ee626500a..ee626500a 100644
--- a/contrib/gitian-downloader/marcofalke-key.pgp
+++ b/contrib/gitian-keys/marcofalke-key.pgp
diff --git a/contrib/gitian-downloader/michagogo-key.pgp b/contrib/gitian-keys/michagogo-key.pgp
index 47bc40455..47bc40455 100644
--- a/contrib/gitian-downloader/michagogo-key.pgp
+++ b/contrib/gitian-keys/michagogo-key.pgp
diff --git a/contrib/gitian-downloader/petertodd-key.pgp b/contrib/gitian-keys/petertodd-key.pgp
index 5ee82a6f7..5ee82a6f7 100644
--- a/contrib/gitian-downloader/petertodd-key.pgp
+++ b/contrib/gitian-keys/petertodd-key.pgp
diff --git a/contrib/gitian-downloader/prab-key.pgp b/contrib/gitian-keys/prab-key.pgp
index 0870c88b9..0870c88b9 100644
--- a/contrib/gitian-downloader/prab-key.pgp
+++ b/contrib/gitian-keys/prab-key.pgp
diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-keys/sipa-key.pgp
index a1930ddee..a1930ddee 100644
--- a/contrib/gitian-downloader/sipa-key.pgp
+++ b/contrib/gitian-keys/sipa-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/tcatm-key.pgp b/contrib/gitian-keys/tcatm-key.pgp
index baaec76b8..baaec76b8 100644
--- a/contrib/gitian-downloader/tcatm-key.pgp
+++ b/contrib/gitian-keys/tcatm-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/wtogami-key.pgp b/contrib/gitian-keys/wtogami-key.pgp
index e0f6c4c5f..e0f6c4c5f 100644
--- a/contrib/gitian-downloader/wtogami-key.pgp
+++ b/contrib/gitian-keys/wtogami-key.pgp
diff --git a/doc/release-process.md b/doc/release-process.md
index 2c83896c2..5a6ac8482 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -115,7 +115,7 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
Add other gitian builders keys to your gpg keyring
- gpg --import ../bitcoin/contrib/gitian-downloader/*.pgp
+ gpg --import ../bitcoin/contrib/gitian-keys/*.pgp
Verify the signatures