From d030dbcab19e9997fb08454ceccefeb74654461e Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 4 Apr 2016 09:02:50 +0100 Subject: [PATCH] Add download details, including download signature for beta. Not pushing to front page until we have proper download links. Will probably adjust somewhat for the proper release. The location of the signature file will almost certainly change. --- common/code/boost_pages.php | 69 +++++++++++-------- feed/history/boost_1_61_0.qbk | 2 +- generated/state/feed-pages.txt | 5 +- generated/state/rss-items.txt | 2 +- .../signatures/boost_1_61_0_b1.sums.asc | 25 +++++++ users/history/version_1_61_0.html | 3 + 6 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 users/download/signatures/boost_1_61_0_b1.sums.asc diff --git a/common/code/boost_pages.php b/common/code/boost_pages.php index 728e0cdb..3909edbd 100644 --- a/common/code/boost_pages.php +++ b/common/code/boost_pages.php @@ -322,31 +322,34 @@ class BoostPages_Page { function download_table_data() { if (strpos($this->download_basename, 'boost_1_61_0') === 0) { return array( - 'unix' => array( - array( - 'url' => "{$this->download_item}{$this->download_basename}.tar.bz2", - 'hash' => 'something', + 'downloads' => array( + 'unix' => array( + array( + 'url' => "http://boost.cowic.de/rc/boost_1_61_0_b1.tar.bz2", + 'sha256' => '866941f0038b27fcc69ced1490b2dc5fa8d20f505d66b939a92a68ef194d1a6c', + ), + array( + 'url' => "http://boost.cowic.de/rc/boost_1_61_0_b1.tar.gz", + 'sha256' => '0b92c5fb5b91641409b9675b2fd11d3b3fa5f71dd986d3b5fb03da201bf55474', + ), ), - array( - 'url' => "{$this->download_item}{$this->download_basename}.tar.gz", - 'hash' => 'something', - ), - ), - 'windows' => array( - array( - 'url' => "{$this->download_item}{$this->download_basename}.7z", - 'hash' => 'something', - ), - array( - 'url' => "{$this->download_item}{$this->download_basename}.zip", - 'hash' => 'something', + 'windows' => array( + array( + 'url' => "http://boost.cowic.de/rc/boost_1_61_0_b1.7z", + 'sha256' => '3f8888099ee6f62b412a13be916dead2bacbdd6d69e5afd5b6fea4bb738e5df4', + ), + array( + 'url' => "http://boost.cowic.de/rc/boost_1_61_0_b1.zip", + 'sha256' => '9dffe5ee7f5f7bf7695f5738c686e44bd266933e3ca68732b0de5520c3c82615', + ), ), ), + 'signature' => 'users/download/signatures/boost_1_61_0_b1.sums.asc', ); } else if ($this->download_basename) { $url_base = "{$this->download_item}{$this->download_basename}"; - return array( + return array('downloads' => array( 'unix' => array( array('url' => "{$url_base}.tar.bz2"), array('url' => "{$url_base}.tar.gz"), @@ -355,7 +358,7 @@ class BoostPages_Page { array('url' => "{$url_base}.7z"), array('url' => "{$url_base}.zip"), ), - ); + )); } else if (preg_match('@.*/boost/(\d+)\.(\d+)\.(\d+)/@', $this->download_item, $match)) { $major = intval($match[1]); $minor = intval($match[2]); @@ -382,7 +385,7 @@ class BoostPages_Page { $downloads['windows'][] = array('url' => $url_base.'.7z'); } $downloads['windows'][] = array('url' => $url_base.'.zip'); - return $downloads; + return array('downloads' => $downloads); } else { return $this->download_item; @@ -390,9 +393,13 @@ class BoostPages_Page { } function download_table() { - if ($this->type == 'release' && empty($this->flags['beta']) && empty($this->flags['released'])) { - return ''; - } + // TODO: Removing this temporarily so I can add the download links + // without putting the release notes on the front page. + // Might remove this code permananently, I'm not sure if it + // does any good. + //if ($this->type == 'release' && empty($this->flags['beta']) && empty($this->flags['released'])) { + // return ''; + //} $downloads = $this->download_table_data(); @@ -400,9 +407,9 @@ class BoostPages_Page { # Print the download table. $hash_column = false; - foreach($downloads as $x) { + foreach($downloads['downloads'] as $x) { foreach($x as $y) { - if (array_key_exists('hash', $y)) { + if (array_key_exists('sha256', $y)) { $hash_column = true; } } @@ -417,12 +424,12 @@ class BoostPages_Page { } $output .= 'PlatformFile'; if ($hash_column) { - $output .= 'Hash'; + $output .= 'SHA256 Hash'; } $output .= ''; foreach (array('unix', 'windows') as $platform) { - $platform_downloads = $downloads[$platform]; + $platform_downloads = $downloads['downloads'][$platform]; $output .= "\n"; $output .= ' 1) { @@ -446,7 +453,7 @@ class BoostPages_Page { $output .= ''; if ($hash_column) { $output .= ''; - $output .= html_encode($this->array_get($download, 'hash')); + $output .= html_encode($this->array_get($download, 'sha256')); $output .= ''; } $output .= ''; @@ -454,6 +461,12 @@ class BoostPages_Page { } $output .= ''; + + if (array_key_exists('signature', $downloads)) { + $output .= "

PGP signed list of checksums.

\n"; + } + return $output; } else if (is_string($downloads)) { # If the link didn't match the normal version number pattern diff --git a/feed/history/boost_1_61_0.qbk b/feed/history/boost_1_61_0.qbk index b62f1c3b..c459359a 100644 --- a/feed/history/boost_1_61_0.qbk +++ b/feed/history/boost_1_61_0.qbk @@ -17,6 +17,7 @@ [/ Add attributes here as release progresses. See end of file for details. ] [documentation /doc/libs/1_61_0_b1/] [final_documentation /doc/libs/1_61_0/] +[download_basename boost_1_61_0_b1] [section New Libraries] @@ -237,7 +238,6 @@ For Beta release, something like: [status beta] [download http://sourceforge.net/projects/boost/files/boost/1.56.0.beta.1/] -[download_basename boost_1_56_0_b1] [documentation /doc/libs/1_56_0_b1/] Add libraries to 'purpose field'. diff --git a/generated/state/feed-pages.txt b/generated/state/feed-pages.txt index c2020746..99709b37 100644 --- a/generated/state/feed-pages.txt +++ b/generated/state/feed-pages.txt @@ -2393,12 +2393,13 @@ "/doc/libs/1_61_0_b1/ -download -download_basename +"boost_1_61_0_b1 -final_documentation "/doc/libs/1_61_0/ -id "version_1_61_0 -last_modified -=1459754607 +=1459756918 -location "users/history/version_1_61_0.html -notice @@ -2411,7 +2412,7 @@ " New Libraries: Updated Libraries: " -qbk_hash -"f7c30f42d2f96897f518d05bdf32ae86838620f03cd422be07386c5219e8422a +"bc34edcdea6f44d2c7fb152559d1cd5771c7ef98a33d44979816d8d407959ece -release_status "dev -title diff --git a/generated/state/rss-items.txt b/generated/state/rss-items.txt index 0ee7038e..cbf08962 100644 --- a/generated/state/rss-items.txt +++ b/generated/state/rss-items.txt @@ -31371,7 +31371,7 @@ " </div> " -last_modified -=1459754607 +=1459756918 -quickbook "feed/history/boost_1_61_0.qbk ) diff --git a/users/download/signatures/boost_1_61_0_b1.sums.asc b/users/download/signatures/boost_1_61_0_b1.sums.asc new file mode 100644 index 00000000..f709c202 --- /dev/null +++ b/users/download/signatures/boost_1_61_0_b1.sums.asc @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +3f8888099ee6f62b412a13be916dead2bacbdd6d69e5afd5b6fea4bb738e5df4 boost_1_61_0_b1.7z +dc206518024ff95758832a846c3bcb5565e98a21cd8db97334a53348a0e26239 boost_1_61_0_b1.sums +866941f0038b27fcc69ced1490b2dc5fa8d20f505d66b939a92a68ef194d1a6c boost_1_61_0_b1.tar.bz2 +0b92c5fb5b91641409b9675b2fd11d3b3fa5f71dd986d3b5fb03da201bf55474 boost_1_61_0_b1.tar.gz +9dffe5ee7f5f7bf7695f5738c686e44bd266933e3ca68732b0de5520c3c82615 boost_1_61_0_b1.zip +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBAgAGBQJW/Y96AAoJEA8aPs1OrCMWetUP/2TeeN2jHX+EPUQk1cqWKiEJ +sYFZ5YozHMCDL3dsAOFYPdceWHTtbxWYJzNdgIuBm6VvYa1JKqze7OC7bTzFLoHI +0T3RBOk17HQoUMRakRseMZ91HoHc+jGQGsbMMIGj/MYjcGKTrOgSrp4B0TX4U6PZ +htNXGoTtV5ZjrRAKY6BQgDAdV8JUmS4hfjXeBsLpk3hW/DDoI8+yPmnm6uwgh/Xz +n2wS3hzia7GrGtUTAS4JAivlcGo4wLm0ubUKARrpXUcAvyaFpBGG7CoZHnUJGWFS +IYUdqB65183idO0ysSCn2uRc0wLxX26ZSY0ns+uB4xKw+v+Ol2Ng2fdI00U9D0M9 +jH+2uws4s7nGIANGA72N9bvDcwVeVBnTeq0ga1R7syW2exO2mu0CwltgHSZpuujm +2GVqHjp0sFqhBC+Ww11CupAw2H/LvZ92wX85RW6jpFpTvQi7Bj7GQDjlIKMbF5yW +weUzf6kQkpXcjJPWBlczIPYD5kn9ybOyrXsARq2fsyWPny8XH6d9NJVx/RLdLgIl +0S9XXn1Sj0dspjYno2p5JLXZRIC9FU/BeIFhF5y0RfFAVwmYM11koQReotFX/Hn5 +eHO4hSgAaagr4upoC29AVbuVmmJvBj6jaU2gWJC9kw+8bUwawwbWu0DnRav3UNrY +If822FaulZn8H5tz6jV7 +=mgIn +-----END PGP SIGNATURE----- diff --git a/users/history/version_1_61_0.html b/users/history/version_1_61_0.html index c73f35c5..eb07576b 100644 --- a/users/history/version_1_61_0.html +++ b/users/history/version_1_61_0.html @@ -45,6 +45,9 @@

In Progress

Documentation + + +
Downloads
PlatformFileSHA256 Hash
unixboost_1_61_0_b1.tar.bz2866941f0038b27fcc69ced1490b2dc5fa8d20f505d66b939a92a68ef194d1a6c
boost_1_61_0_b1.tar.gz0b92c5fb5b91641409b9675b2fd11d3b3fa5f71dd986d3b5fb03da201bf55474
windowsboost_1_61_0_b1.7z3f8888099ee6f62b412a13be916dead2bacbdd6d69e5afd5b6fea4bb738e5df4
boost_1_61_0_b1.zip9dffe5ee7f5f7bf7695f5738c686e44bd266933e3ca68732b0de5520c3c82615

PGP signed list of checksums.