From 9876a2739b8ee720477cf15b388e000d4f900ba6 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Wed, 17 Jun 2015 16:30:34 -0400 Subject: [PATCH 01/10] About-Us: Describe History & Ownership --- _templates/about-us.html | 7 +++++++ _translations/en.yml | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/_templates/about-us.html b/_templates/about-us.html index 8d5edc70..83f13cda 100644 --- a/_templates/about-us.html +++ b/_templates/about-us.html @@ -11,6 +11,13 @@ id: about-us

{% translate own %}

{% translate owntxt %}

+{% case page.lang %} +{% when 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %} +{% else %} +

{% translate owntxt2 %}

+

{% translate owntxt3 %}

+

{% translate owntxt4 %}

+{% endcase %}

{% translate control %}

{% translate controltxt %}

diff --git a/_translations/en.yml b/_translations/en.yml index e67eb4ea..edf86bd3 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -4,7 +4,10 @@ en: pagetitle: "About bitcoin.org" pagedesc: "Bitcoin.org is dedicated to help Bitcoin to develop in a sustainable way." own: "Who owns bitcoin.org?" - owntxt: "Bitcoin.org is the original domain name used with the first Bitcoin website. It was registered and is still managed by Bitcoin core developers and by additional community members, with the input of Bitcoin communities. Bitcoin.org is not an official website. Just like nobody owns the email technology, nobody owns the Bitcoin network. As such, nobody can speak with authority in the name of Bitcoin." + owntxt: "Bitcoin.org was originally registered and owned by Bitcoin's first two developers, Satoshi Nakamoto and Martti Malmi. When Nakamoto left the project, he gave ownership of the domain to additional people, separate from the Bitcoin developers, to spread responsibility and prevent any one person or group from easily gaining control over the Bitcoin project." + owntxt2: "From 2011 to 2013, the site was primarily used for releasing new versions of the software now called Bitcoin Core. In 2013, the site was redesigned into its current form, adding numerous pages, listing additional Bitcoin software, and creating the translation system. Developer documentation was added in 2014." + owntxt3: "Today the site is an independent open source project with contributors from around the world. Final publication authority is held by the co-owners, but all regular activity is organized through the public pull request process and managed by the site co-maintainers." + owntxt4: "Bitcoin.org is not Bitcoin's official website. Just like nobody owns the email technology, nobody owns the Bitcoin network. As such, nobody can speak with authority in the name of Bitcoin." control: "Then... who controls Bitcoin?" controltxt: "Bitcoin is controlled by all Bitcoin users around the world. Developers are improving the software but they can't force a change in the rules of the Bitcoin protocol because all users are free to choose what software they use. In order to stay compatible with each other, all users need to use software complying with the same rules. Bitcoin can only work decently with a complete consensus between all users. Therefore, all users and developers have strong incentives to adopt and protect this consensus." mission: "Mission" From 887b63d10e3bf4f9f910c5076615e045c7720a46 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Wed, 17 Jun 2015 19:16:49 -0400 Subject: [PATCH 02/10] About-us: Contributor changes --- _templates/about-us.html | 15 +++++++++++---- _translations/en.yml | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/_templates/about-us.html b/_templates/about-us.html index 83f13cda..9d168ba3 100644 --- a/_templates/about-us.html +++ b/_templates/about-us.html @@ -39,14 +39,15 @@ id: about-us

{% translate maintenance %}

-

Saïvann CarignanWebsite maintenance
Translation coordination

-

David A. HardingWebsite maintenance
Volunteer coordination
Documentation writing

-

Craig WatkinsWallet reviews

+

Saïvann CarignanWebsite maintainer

+

David A. HardingDocumentation maintainer

+

Craig WatkinsWallet maintainer

{% translate translation %}

+

Garland William Binns IIITranslation coordination

Ar ViccoRussian

Simon Alexander HinterreiterGerman

Jacob BurenstamSwedish

@@ -61,10 +62,16 @@ id: about-us

{% translate inactive_contributors %}

-

Garland William Binns IIITranslation maintenance

Greg SandersDocumentation Writing

+

{% translate owners %} — {% translate partial_list %}

+ +
+

Martti Malmi(AKA Sirius)
Inactive

+

Michael Marquardt(AKA Theymos)

+
+

{% translate github %}

diff --git a/_translations/en.yml b/_translations/en.yml index edf86bd3..d56fd82d 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -24,6 +24,8 @@ en: documentation: "Documentation" translation: "Translation" inactive_contributors: "Inactive Contributors" + owners: "Domain Owners" + partial_list: "Partial List" github: "Contributors on GitHub" bitcoin-for-businesses: title: "Bitcoin for Businesses - Bitcoin" From 3b50ddbad2b015fb62159c22c89de3c822767408 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Thu, 25 Jun 2015 19:53:57 -0400 Subject: [PATCH 03/10] Build Scripts: Require GPG-signed Commits - Update build script - Add authorized keys --- .../auto-build-committers.gnupg/pubring.gpg | Bin 0 -> 10447 bytes _build/update_site.sh | 26 ++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 _build/auto-build-committers.gnupg/pubring.gpg diff --git a/_build/auto-build-committers.gnupg/pubring.gpg b/_build/auto-build-committers.gnupg/pubring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..1a6a7433c6d9ea66f84f7a158ce73c4b3ef51ac5 GIT binary patch literal 10447 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" + echo + echo "auto: only builds if the latest commit is GPG signed by an authorized key" + echo "force: builds latest commit no matter what" + ;; +esac + # Copy files to temporary directory rsync -rt --delete "$SITEDIR/" "$WORKDIR/" From 9202f789b2b1314deb55c4229f0215b45c4dc97b Mon Sep 17 00:00:00 2001 From: will binns Date: Thu, 25 Jun 2015 23:04:43 -0600 Subject: [PATCH 04/10] Update Will's name. --- _templates/about-us.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_templates/about-us.html b/_templates/about-us.html index 9d168ba3..d06ec6a5 100644 --- a/_templates/about-us.html +++ b/_templates/about-us.html @@ -47,7 +47,7 @@ id: about-us

{% translate translation %}

-

Garland William Binns IIITranslation coordination

+

Will BinnsTranslation coordination

Ar ViccoRussian

Simon Alexander HinterreiterGerman

Jacob BurenstamSwedish

From 5339dc8687bcf129bc0094727bdf5e73b0985ab1 Mon Sep 17 00:00:00 2001 From: Saivann Date: Fri, 26 Jun 2015 00:20:44 -0400 Subject: [PATCH 05/10] Enclose variable into single quotes --- _build/update_site.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_build/update_site.sh b/_build/update_site.sh index c02ecec1..b2e4429d 100755 --- a/_build/update_site.sh +++ b/_build/update_site.sh @@ -7,7 +7,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin source /etc/profile.d/rvm.sh -AUTHORIZED_SIGNERS_DIR=/bitcoin.org/auto-build-committers.gnupg +AUTHORIZED_SIGNERS_DIR='/bitcoin.org/auto-build-committers.gnupg' REPO='https://github.com/bitcoin-dot-org/bitcoin.org.git' SITEDIR='/bitcoin.org/site' DESTDIR='build@bitcoinorgsite:/var/www/site' From 39d6121c8984310a7a001bfe6e138418323f9e18 Mon Sep 17 00:00:00 2001 From: Saivann Date: Fri, 26 Jun 2015 00:21:24 -0400 Subject: [PATCH 06/10] Prevent concurrent unsigned script from aborting ongoing signed builds --- _build/update_site.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/_build/update_site.sh b/_build/update_site.sh index b2e4429d..09745740 100755 --- a/_build/update_site.sh +++ b/_build/update_site.sh @@ -95,13 +95,12 @@ do fi # Cancel script if a concurrent script has touched _buildlock - time=0 if [ -e "$SITEDIR/_buildlock" ]; then time=`stat -c %Y "$SITEDIR/_buildlock" | cut -d ' ' -f1` - fi - if [ $time != $lasttime ]; then - echo "Build cancelled" - exit + if [ $time != $lasttime ]; then + echo "Build cancelled" + exit + fi fi sleep 1 From 120030f73b219d8011134796a133ecbe81d28d37 Mon Sep 17 00:00:00 2001 From: Saivann Date: Fri, 26 Jun 2015 00:22:08 -0400 Subject: [PATCH 07/10] Exit if no argument is provided instead of defaulting to "auto" --- _build/update_site.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/_build/update_site.sh b/_build/update_site.sh index 09745740..f5ada4cc 100755 --- a/_build/update_site.sh +++ b/_build/update_site.sh @@ -62,6 +62,7 @@ case "${1:-nil}" in echo echo "auto: only builds if the latest commit is GPG signed by an authorized key" echo "force: builds latest commit no matter what" + exit 1 ;; esac From 4d9f830f533c757c149a768daec5621d0fd3a9ca Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Fri, 26 Jun 2015 19:55:35 -0400 Subject: [PATCH 08/10] Add Wladimir's Releases Key -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hello, Starting with 0.11.0rc3, SHA256SUMS.asc will be signed with the following key: pub 4096R/36C2E964 2015-06-24 Wladimir J. van der Laan (Bitcoin Core binary release signing key) Primary key fingerprint: 01EA 5486 DE18 A882 D4C2 6845 90C8 019E 36C2 E964 For gitian and commit signing I will keep using this key. Wladimir -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBCgAGBQJViphCAAoJEHSBCwEjRsmmtRoIALBzJMGXzoj5t9OQSedxjnjP sxfHuBwQxeuPYXbRlMjY5UZhmabbt0/mLRfVSdscnCzp0YxbMRwD7I6MdHqXyBtd oS+TUfMNir5lk7Ti2hRStgvxqsAbHUJ08LlqpJXV5dq3QgeJyJwZM76a6yyaGwxP SwqvKklQZ/qdrKOgjjn6d5HywgsmybJSDzEDR3k+ogkLsfM1jcpqZhwFeRVpk94m SgZGLLx5zAIKcLHn4I1FaZ+OAmmS0ukYcmotMOUk6NBEjHTDfjEFBrbrlwvL4G7r kjd1mRxkaJMxX3nJicXiEQClVoeUrMVyJrrsTGyPixSicdQbItuyLWXm37fAfE0= =4v49 -----END PGP SIGNATURE----- --- en/full-node.md | 11 ++++++++--- laanwj-releases.asc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 laanwj-releases.asc diff --git a/en/full-node.md b/en/full-node.md index 0bb84bf5..f7d49e0b 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -24,12 +24,17 @@ Configuration](#network-configuration) section for details. If you know how to use PGP, you should also click the *Verify Release Signatures* link on the download page to download a signed list of SHA256 -file hashes. The file is currently signed by [Wladimir J. van der Laan's -key](/laanwj.asc). His primary key's fingerprint is: +file hashes. The 0.11 and later releases are signed by [Wladimir J. van +der Laan's releases key](/laanwj-releases.asc) with the fingerprint: + + 01EA 5486 DE18 A882 D4C2 6845 90C8 019E 36C2 E964 + +Earlier releases were signed by [Wladimir J. van der Laan's regular +key](/laanwj.asc). That key's fingerprint is: 71A3 B167 3540 5025 D447 E8F2 7481 0B01 2346 C9A6 -Many previous releases were signed by [Gavin Andresen's +Even earlier releases were signed by [Gavin Andresen's key](/gavinandresen.asc). His primary key's fingerprint is: 2664 6D99 CBAE C9B8 1982 EF60 29D9 EE6B 1FC7 30C1 diff --git a/laanwj-releases.asc b/laanwj-releases.asc new file mode 100644 index 00000000..c5b50083 --- /dev/null +++ b/laanwj-releases.asc @@ -0,0 +1,36 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFWKlBcBEACgZJd/6LrSgNSVxiyq5N9h0E7zgSHG/ahuWAnWeFtxaxHeukH+ +Q2Zq6F8FLbq40PphyroRylMBpzPBcyxjee7mDj1DpJ9ayv6GGPTyQzOImhChEV8p +bA42dvXnB5ju0rPh2GxctbiZZD1kiPH4jlmDIgomvupAj9OFntA5jfkuSFBekZrw +QyZowz/paMBIe24YH2LyaZjC2DqLy8Znh78OfAZxZsWSdZxK5LsbkCE9l8Li3gQa +rxm4aEMBHhvns+s8Ufa47sdJAYAfVnAWb5Dfe4oVFh70PvB8GSGFS9qeib0eEQBD +71c9MN+REDTSOYO2VnUSFbu7IrKsPsClqwfT9KzI/uz5fpHSKdCp5AO7oDZiU36s +LsSOBbukTmFQfVrAniFEZxHLCBufXCsAwp07xtUH9ytbW0Y/eHYlZojoWJJPT//1 +cQ/A2Ix/nxbSkSPq8wpCUhBxvTQoU9BXeQIbSy0yUmj5nS+3DR7IK2Q7ACyVClr7 +LVQOGxgZhHr9Kq87RDqc1wlvbCxb+KTJQhJySpOVoiaME6jLBzgE7G+5N6IXTK5u +OriOsQwcLdeBu7TPgft79uBYnmYeaNVdovlBB//7H7UvY0kAxAg4NPgK6eYRdzn+ +8ZtbntNXi/23RJvzeZJVBqQ7bYt4fjmHmRYrbM4jWKJEoJOE6wzpmELUowARAQAB +tFVXbGFkaW1pciBKLiB2YW4gZGVyIExhYW4gKEJpdGNvaW4gQ29yZSBiaW5hcnkg +cmVsZWFzZSBzaWduaW5nIGtleSkgPGxhYW53akBnbWFpbC5jb20+iQI+BBMBAgAo +BQJVipQXAhsDBQkDFwQABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCQyAGe +NsLpZOBRD/wLfujEC4ZYMFwPXnhvOGEWAPeuOg06iXhEqJ1biOvxhFfwwjPoXGMQ +i/pdfGck5xZVFcxObpdHBp0p9ardos1aRXAS8JTnTQXTX0qs0QNxnLTBz+5DrIc4 +l7r5DAlr/FapUKNSbjobOrbv+F371b7XhLJ7oob5XXo+IS7kEY+Si5BXb0uVy8ms +SaKDooO2RfByrFI3LTHW3VESuuNnXgH6309yeGORgBazKtnxZPPlD2raTNXe9q7U +dF2Xv6Rr53iCGGN5xncL5A6nF3fou0tGvqLFBkrs4BqeNNwC6/jQLfpOfqiQ+XGR +q1KmT9E5E1qRXOb1Fc2koIUt/mSzRzxfxaEjI1UR0I4QtPsF2aP11sOJ1MJXyrEi +Kx1Nb0eUAYw0ZLTfm+uToUUTXzaB5gZqxmyY/eRFddCuGn+UwZnCiUImCWuk5yLq +ivyNbPfD1nwiZqNd879DkwFovNQfbOes4gfZyS28FXuYD/3mNN2WqGeJHZBGpglR +8EbiuJcgo7wPVC7aiIG0deSe6Flw04f2JE75zBKbzWccydtk16GzUBorbhJ4+Q7V +ikss1m4O/hDCU32t9V02+666l0ewM3H7AlTGxmWPWcaeADkywDHGb3frZU8Wh7to +e8I7ST0ap2vf11stL4Ejeyymcy2Xx1S7C57GuBSBCMJv962YIalk+4kBHAQQAQoA +BgUCVYqVFgAKCRB0gQsBI0bJpmthB/9tHtBEUuR9Ce1HBWin8AG18FDhw+019GvK +uMysu004imrPQRnH+I780W3htFBFhiZ+yhSllb4sJrW5awitIQxxe3V+xcDjyidh +32GjKDXvb4GHHuDC6uK2Hj0PB8XfqT1O1eCN3E/tn00al6qx/SvLnhW0BlqWwvVh +cJpQE5pa7E97Gw+arD1/XPy0WRX8SuEphdZ+sN1tP8yZZK8Bvi0rz+p0n5aop6Z6 +6Fj2buJnVQK6xDfXwt6/F5s7lyx1QKC4wF0MiMA8jv2KkbFEuiuiteNynrsGV7UZ +0VNvCdXe1cDKPnC64HP7nPluFRMLZbWq4DESbfGCCrmzz7f7eAEn +=mufP +-----END PGP PUBLIC KEY BLOCK----- From 9d351edbab13626f72f88b3dcfb97084b4ade99b Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Sat, 27 Jun 2015 16:55:29 -0400 Subject: [PATCH 09/10] Releases: Link To Signing Keys On Download Page --- _templates/download.html | 11 +++++++++++ _translations/en.yml | 2 ++ 2 files changed, 13 insertions(+) diff --git a/_templates/download.html b/_templates/download.html index b32ba6a8..55930f22 100755 --- a/_templates/download.html +++ b/_templates/download.html @@ -83,6 +83,17 @@ lin64: "linux64.tar.gz" {% translate versionhistory %}

+ +

Bitcoin Core Release Signing Keys

+ + + +
+

note{% translate patient %}

{% translate notesync %} {% translate full_node_guide %}

{% translate notelicense %}

diff --git a/_translations/en.yml b/_translations/en.yml index 0789dffa..8ce09343 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -251,6 +251,8 @@ en: notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over 20GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open." full_node_guide: "Read the full node guide for details." patient: "Check your bandwidth and space" + to: "to" + and_later: "and later" events: title: "Conferences and events - Bitcoin" pagetitle: "Conferences and events" From 3a89870ad7f15cad7750d20cdc72c162a12e0438 Mon Sep 17 00:00:00 2001 From: Saivann Date: Sat, 27 Jun 2015 21:55:07 -0400 Subject: [PATCH 10/10] Display release keys along other links with icons --- _less/screen.less | 16 ++++++++++++++-- _templates/download.html | 18 +++++++----------- _translations/en.yml | 3 +-- img/icons/mini_ico_key.png | Bin 0 -> 515 bytes img/icons/mini_ico_key.svg | 17 +++++++++++++++++ 5 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 img/icons/mini_ico_key.png create mode 100644 img/icons/mini_ico_key.svg diff --git a/_less/screen.less b/_less/screen.less index f29cc4e1..6531ccfe 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -1846,10 +1846,22 @@ h2 .rssicon{ .downloadbox p{ margin:0; } -.downloadbox p a{ +.downloadbox p.downloadmore a{ font-size:90%; } -.downloadbox a{ +.downloadbox p.downloadkeys{ + font-size:80%; + margin-top:15px; +} +.downloadbox p.downloadkeys span{ + display:block; +} +.downloadbox p.downloadkeys a{ + display:inline-block; + padding: 5px 10px 0 20px; + background:url(/img/icons/mini_ico_key.svg) left 8px no-repeat; +} +.downloadbox div a{ display:inline-block; } .downloadbox div{ diff --git a/_templates/download.html b/_templates/download.html index 55930f22..7a9bfa5b 100755 --- a/_templates/download.html +++ b/_templates/download.html @@ -76,24 +76,20 @@ lin64: "linux64.tar.gz"
-

+

{% translate downloadsig %}
{% translate downloadtorrent %} {% if site.DOWNLOAD_MAGNETLINK %} {% endif %}
{% translate versionhistory %}

+

+ {% translate releasekeys %} + v0.8.6 - 0.9.2.1 + v0.9.3 - 0.10.2 + v0.11.0+ +

-

Bitcoin Core Release Signing Keys

- - - -
-

note{% translate patient %}

{% translate notesync %} {% translate full_node_guide %}

{% translate notelicense %}

diff --git a/_translations/en.yml b/_translations/en.yml index 8ce09343..8355ff33 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -251,8 +251,7 @@ en: notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over 20GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open." full_node_guide: "Read the full node guide for details." patient: "Check your bandwidth and space" - to: "to" - and_later: "and later" + releasekeys: "Bitcoin Core Release Signing Keys" events: title: "Conferences and events - Bitcoin" pagetitle: "Conferences and events" diff --git a/img/icons/mini_ico_key.png b/img/icons/mini_ico_key.png new file mode 100644 index 0000000000000000000000000000000000000000..b778a0b6090395a0edd8c7c7ecca3f339eb29a1a GIT binary patch literal 515 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH})6 z^6MbX=%g{b0w^e1;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0H|0G|+7 zApQUU|AvN!Ns}h^_4T#2wRLuOc6WDob#?Xj_V$1QkPD>y!2qZR$Oei)lmQt)08|VF za5h8%kPBqM#o>YwWe`~i36TPl)22;>s0UiLeED*q?8c27_wV2T;K2hR`}60|fByX8 zEp*nueB+skM`DP)=!OZT+;_^OmkywR7*j?xa+X_azCFP@)x_E+A= zYG2Xes2{5KG4It&RaUhtOqiVYNO^OJ(!;-R#1p5eeyX^)gn6;z#O#WRay?DgqV7c* zWH|+$E_|-=EJq^n(e93?&s4T=cHQ4H!&K?&4Yx(!o0_Jqw*0EI#Ae;5AJ^n={CLhf YZ-IdF97&B;K({b>y85}Sb4q9e08w%7Z2$lO literal 0 HcmV?d00001 diff --git a/img/icons/mini_ico_key.svg b/img/icons/mini_ico_key.svg new file mode 100644 index 00000000..dea8986f --- /dev/null +++ b/img/icons/mini_ico_key.svg @@ -0,0 +1,17 @@ + + + + + image/svg+xml + + + + + + + + + + + +