Author: Pierrick Charron (adoy) Committer: GitHub (web-flow) Pusher: adoy Date: 2025-06-10T12:41:31-04:00
Commit: https://github.com/php/web-php/commit/9de9a81b8d06dc5d14f3b4cd356f52cff26832e6 Raw diff: https://github.com/php/web-php/commit/9de9a81b8d06dc5d14f3b4cd356f52cff26832e6.diff Add new PHP 8.5 rms gpg keys (#1274) Changed paths: M distributions M include/gpg-keys.inc Diff: diff --git a/distributions b/distributions index 267ce3a109..814d2e37cb 160000 --- a/distributions +++ b/distributions @@ -1 +1 @@ -Subproject commit 267ce3a109f04ee1e68b9b18fa5557c3d9f16958 +Subproject commit 814d2e37cb6a2e06211d5179a4dc817d2b1a83a5 diff --git a/include/gpg-keys.inc b/include/gpg-keys.inc index b3aaeae389..861981e44b 100644 --- a/include/gpg-keys.inc +++ b/include/gpg-keys.inc @@ -47,6 +47,12 @@ function gpg_key_get(string $rm): ?string { " Key fingerprint = CBAF 69F1 73A0 FEA4 B537 F470 D66C 9593 118B CCB6\n" . "uid Christoph M. Becker <c...@php.net>"; + case 'daniels': + return + "pub rsa4096 2025-06-08 [SCEA]\n" . + " D95C 03BC 702B E951 5344 AE33 74E4 4BC9 0677 01A5\n" . + "uid [ultimate] Daniel Scherzer (for PHP) <dani...@php.net>"; + case 'davey': return "pub 4096R/7BD5DCD0 2016-05-07\n" . @@ -69,6 +75,13 @@ function gpg_key_get(string $rm): ?string { " Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D\n" . "uid David Soria Parra <d...@php.net>"; + case 'edorian': + return + "pub ed25519 2025-06-08 [SC]\n" . + " 49D9 AF6B C72A 80D6 6917 19C8 AA23 F5BE 9C70 97D4\n" . + "uid [ultimate] Volker Dusch <edor...@php.net>\n" . + "sub cv25519 2025-06-08 [E]"; + case 'ericmann': return "pub rsa4096 2016-11-25 [SC]\n" . @@ -177,6 +190,7 @@ function gpg_key_get(string $rm): ?string { function gpg_key_get_branches(bool $activeOnly): array { $branches = [ + '8.5' => ['pierrick', 'edorian', 'daniels'], '8.4' => ['ericmann', 'calvinb', 'saki'], '8.3' => ['pierrick', 'ericmann', 'bukka'], '8.2' => ['pierrick', 'ramsey', 'sergey'],