com web/php: Only show GPG keys for active branches on the downloads page.: downloads.php gpg-keys.php include/gpg-keys.inc

Commit: c342a3e87eca5021c53da5fbaa6a70b8f843e961 Author: Adam Harvey <aharvey@php.net> Fri, 14 Nov 2014 15:34:35 -0800 Parents: 9059c17fbdbbdb271708a197fdd299642f43c9a3 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=c342a3e87eca5021c53da5fbaa6a70b8f843e961 Log: Only show GPG keys for active branches on the downloads page. GPG keys have been moved into a new include file, and a new page has been added to access GPG keys for older branches. Changed paths: M downloads.php A gpg-keys.php A include/gpg-keys.inc Diff: diff --git a/downloads.php b/downloads.php index 0dfd6cb..9114269 100644 --- a/downloads.php +++ b/downloads.php @@ -2,6 +2,7 @@ // $Id$ $_SERVER['BASE_PAGE'] = 'downloads.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; +include_once $_SERVER['DOCUMENT_ROOT'] . '/include/gpg-keys.inc'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/version.inc'; // Try to make this page non-cached @@ -12,48 +13,6 @@ $MAJOR = 5; $releases = array_slice($RELEASES[$MAJOR], 0, $SHOW_COUNT); -$gpg = array( - "5.6" => <<< GPG -pub 2048R/33CFC8B3 2014-01-14 [expires: 2020-01-13] - Key fingerprint = 6E4F 6AB3 21FD C07F 2C33 2E3A C2BF 0BC4 33CF C8B3 -uid Ferenc Kovacs &lt;tyrael@php.net&gt; - -pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17] - Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1 -uid Julien Pauli &lt;jpauli@php.net&gt; - -GPG -, - "5.5" => <<< GPG -pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17] - Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1 -uid Julien Pauli &lt;jpauli@php.net&gt; - -pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19] - Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D -uid David Soria Parra &lt;dsp@php.net&gt; - -GPG -, - "5.4" => <<< GPG -pub 2048D/5DA04B5D 2012-03-19 - Key fingerprint = F382 5282 6ACD 957E F380 D39F 2F79 56BC 5DA0 4B5D -uid Stanislav Malyshev (PHP key) &lt;smalyshev@gmail.com&gt; -uid Stanislav Malyshev (PHP key) &lt;stas@php.net&gt; -uid Stanislav Malyshev (PHP key) &lt;smalyshev@sugarcrm.com&gt; -GPG -, - "5.3" => <<< GPG -pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19] - Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D -uid David Soria Parra &lt;dsp@php.net&gt; -pub 2048R/FC9C83D7 2012-03-18 [expires: 2017-03-17] - Key fingerprint = 0A95 E9A0 2654 2D53 835E 3F3A 7DEC 4E69 FC9C 83D7 -uid Johannes Schlüter &lt;johannes@schlueters.de&gt; -uid Johannes Schlüter &lt;johannes@php.net&gt; -GPG -); - $SIDEBAR_DATA = ' <div class="panel"> <a href="/supported-versions.php">Supported Versions</a> @@ -124,14 +83,23 @@ The releases are tagged and signed in the <a href='git.php'>PHP Git Repository</ The following official GnuPG keys of the current PHP Release Manager can be used to verify the tags: </p> -<?php foreach ($gpg as $branch => $data): ?> - <h3 id="gpg-<?php echo $branch; ?>" class="content-header">PHP <?php echo $branch; ?></h3> - <div class="content-box"> - <pre> -<?php echo $data; ?> - </pre> -</div> -<?php endforeach; ?> +<?php foreach ($RELEASES[$MAJOR] as $v => $_): ?> + <?php $branch = implode('.', array_slice(explode('.', $v), 0, 2)); ?> + <?php if (isset($GPG_KEYS[$branch])): ?> + <h3 id="gpg-<?php echo $branch; ?>" class="content-header">PHP <?php echo $branch; ?></h3> + <div class="content-box"> + <pre> +<?php echo $GPG_KEYS[$branch]; ?> + </pre> + </div> + <?php endif ?> +<?php endforeach ?> +<p> + <a href="gpg-keys.php"> + A full list of GPG keys used for current and older releases is also + available. + </a> +</p> <?php site_footer(array('sidebar' => $SIDEBAR_DATA)); diff --git a/gpg-keys.php b/gpg-keys.php new file mode 100644 index 0000000..ea84673 --- /dev/null +++ b/gpg-keys.php @@ -0,0 +1,29 @@ +<?php // vim: et +$_SERVER['BASE_PAGE'] = 'gpg-keys.php'; +include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; +include_once $_SERVER['DOCUMENT_ROOT'] . '/include/gpg-keys.inc'; +include_once $_SERVER['DOCUMENT_ROOT'] . '/include/version.inc'; + +site_header('GPG Keys'); +?> + +<h1>GPG Keys</h1> + +<p> + Starting in April 2012, PHP release tags have been signed in Git by the + release managers for each branch. The following GnuPG keys can be used to + verify these tags: +</p> + +<?php foreach ($GPG_KEYS as $branch => $data): ?> + <h3 id="gpg-<?php echo $branch; ?>" class="content-header">PHP <?php echo $branch; ?></h3> + + <div class="content-box"> + <pre> +<?php echo $data; ?> + </pre> + </div> +<?php endforeach ?> + +<?php +site_footer(); diff --git a/include/gpg-keys.inc b/include/gpg-keys.inc new file mode 100644 index 0000000..e4346ab --- /dev/null +++ b/include/gpg-keys.inc @@ -0,0 +1,43 @@ +<?php +// GPG keys used for signing releases. +$GPG_KEYS = array( + "5.6" => <<< GPG +pub 2048R/33CFC8B3 2014-01-14 [expires: 2020-01-13] + Key fingerprint = 6E4F 6AB3 21FD C07F 2C33 2E3A C2BF 0BC4 33CF C8B3 +uid Ferenc Kovacs &lt;tyrael@php.net&gt; + +pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17] + Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1 +uid Julien Pauli &lt;jpauli@php.net&gt; + +GPG +, + "5.5" => <<< GPG +pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17] + Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1 +uid Julien Pauli &lt;jpauli@php.net&gt; + +pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19] + Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D +uid David Soria Parra &lt;dsp@php.net&gt; + +GPG +, + "5.4" => <<< GPG +pub 2048D/5DA04B5D 2012-03-19 + Key fingerprint = F382 5282 6ACD 957E F380 D39F 2F79 56BC 5DA0 4B5D +uid Stanislav Malyshev (PHP key) &lt;smalyshev@gmail.com&gt; +uid Stanislav Malyshev (PHP key) &lt;stas@php.net&gt; +uid Stanislav Malyshev (PHP key) &lt;smalyshev@sugarcrm.com&gt; +GPG +, + "5.3" => <<< GPG +pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19] + Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D +uid David Soria Parra &lt;dsp@php.net&gt; +pub 2048R/FC9C83D7 2012-03-18 [expires: 2017-03-17] + Key fingerprint = 0A95 E9A0 2654 2D53 835E 3F3A 7DEC 4E69 FC9C 83D7 +uid Johannes Schlüter &lt;johannes@schlueters.de&gt; +uid Johannes Schlüter &lt;johannes@php.net&gt; +GPG +);