diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc --- a/documentation/content/en/articles/pgpkeys/_index.adoc +++ b/documentation/content/en/articles/pgpkeys/_index.adoc @@ -852,6 +852,9 @@ === `{dwmalone}` include::{include-path}dwmalone.key[] +=== `{christos}` +include::{include-path}christos.key[] + === `{marino}` include::{include-path}marino.key[] diff --git a/documentation/static/pgpkeys/christos.key b/documentation/static/pgpkeys/christos.key new file mode 100644 --- /dev/null +++ b/documentation/static/pgpkeys/christos.key @@ -0,0 +1,45 @@ +// sh addkey.sh christos CE4552A98F4F79CA ; + +[.literal-block-margin] +.... +pub rsa2048/CE4552A98F4F79CA 2023-05-22 [SC] [expires: 2026-05-21] + Key fingerprint = 1D3B 3830 BF40 202F F106 47A4 CE45 52A9 8F4F 79CA +uid Christos Margiolis +sub rsa2048/361C2255A11DEA46 2023-05-22 [E] [expires: 2026-05-21] + +.... + +[.literal-block-margin] +.... +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBGRro0IBCAC7oBMKKl1vqVDUBF4XjW1fF6CIvRoCEY2MCuY30jHBaYUJsEYy +VYI5r2ev7xEP8OXer8WviFo56a7Rtz+L0J6THd6r5KX9RHiuoOSAw1JMQlLyorjM +GDIJh1BCpqhZm4zQYEX37Kf7vU+uHqsXelqnGN4lqRzMioLnqfwYj9Mc+br6Mp0Z +9xfj3fZ/ptN4IXyxmJc39/Z7XCsEfmh5RRLXbCmBQfWnm/nG79iqsyE6ktwHVHre +KWXzbxfSD/MTGBvuu3FKdppI+LWjSvG1eaxQfoZzgdKlJMl7bgwBDu8qLAjIpSfD +HFn6Smdz7xKSjr1pdzkRpOBsIVhgHFJKDbTzABEBAAG0KUNocmlzdG9zIE1hcmdp +b2xpcyA8Y2hyaXN0b3NARnJlZUJTRC5vcmc+iQFUBBMBCgA+FiEEHTs4ML9AIC/x +BkekzkVSqY9PecoFAmRro0ICGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgMCAQACHgUC +F4AACgkQzkVSqY9PecqKcwf+L9FcmblH22cZlMqobcwMtR7vB+s8LfwWDwzAnmWQ +tf+gHZI2Imo2N482nVE4qHrKMTMz0wlffQ8pY23PI5wgzV7X/Nf6Qof0upK0Wl54 +vMl8pYn6/ns4GTi36LRN9X4lJEAZGAG38DLv1ah3iHLJt7OH+fzjeifJxOAbEZ0O +WRj9E/bKX42NaQqWAEf9kyWHtAru9Z4bSlAhY4AyviZiYthiFE8ujJI3GyJzv1qx +ndOzuu2crg20ubT0BcEuLZKF1eVlQrcwnySiDzFyPene4s/OORyGYXmN6mqGyiLp +16/nXW3eCnCiL5raMCLMFN/N68o1HKRkCUG0vVh/ihieGbkBDQRka6NCAQgAzpNy +Y8TJEn8UR66J8agk1KmEUNSk2U935MXQoXMrORqpyFdVyvtHmakDB/hqsvK26Das +zKZxuWKzbBaeO3j9GgrXXUajdKiLMsFLU2UgoOPehDPtfobNwl3wQFTF0nf+GCF2 +jyYhZkQ+m8nHYBSMjVwqkQ766s0ohSn/jiv1Vxx+zKtOaDatQqP63KHJ5z0/5qT/ +bOWgVA8vn4CAa/Hhg68I6+jM8ips3UuQsAASrsv3N3Gq2qDOUMLp4WRUf2aawyLj +m21nJ0e7OnT0hoYQALyFwGjz1EMzpMU0TSz9nUtImHLpLok5FO+xb5vBJCSlm2pX +XPuysCa0hKyXOJ1fwwARAQABiQE8BBgBCgAmFiEEHTs4ML9AIC/xBkekzkVSqY9P +ecoFAmRro0ICGwwFCQWjmoAACgkQzkVSqY9PecrQaQgAgYD8806S9+AKDYL8sJ4X +RkLpiDoAB49eXPg1QDU3xEonWL3tZhvTahIvSPLD4qW7AjTITWj/KRSBGT9cNWwl +wv3fuZgyLwF4nk+SJH1LOYt5EnroO8k6OgYHoqU+JNAeTVG0FbxbyPGhOpAWHtzT +VfkjJapP/77VGCZj2mz6nZ8Ze7AevC1bDtNz1+kzle38q1g2s/Fj4NPGJDESv5zF +C2Ev1KrT5//RC4DtjnirUx+E2oLkuk+mxu5dY5h37Vn+ttSrHFayc+6sN96Qh829 +Wvz53MK09DN/gFTszvvDGptmDlk4xbmzaoPH5OnKJ37benrTntwID/XS7WkmQlti +Zw== +=iXaL +-----END PGP PUBLIC KEY BLOCK----- +.... diff --git a/shared/authors.adoc b/shared/authors.adoc --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -588,6 +588,10 @@ :chris-email: chris@FreeBSD.org :chris: {chris-name} <{chris-email}> +:christos-name: Christos Margiolis +:christos-email: christos@FreeBSD.org +:christos: {christos-name} <{christos-email}> + :chs-name: Chuck Silvers :chs-email: chs@FreeBSD.org :chs: {chs-name} <{chs-email}> diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc --- a/shared/contrib-committers.adoc +++ b/shared/contrib-committers.adoc @@ -391,3 +391,4 @@ * {tz} * {dsl} * {ronald} +* {christos} diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml --- a/website/data/en/news/news.toml +++ b/website/data/en/news/news.toml @@ -1,4 +1,8 @@ # Sort news by year, month and day +[[news]] +date = "2023-05-22" +description = "New committer: Christos Margiolis (src)" + [[news]] date= "2023-04-19" title = "January-March 2023 Status Report"