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 @@ -972,6 +972,9 @@ === `{jpaetzel}` include::{include-path}jpaetzel.key[] +=== `{zirias}` +include::{include-path}zirias.key[] + === `{hiren}` include::{include-path}hiren.key[] diff --git a/documentation/static/pgpkeys/zirias.key b/documentation/static/pgpkeys/zirias.key new file mode 100644 --- /dev/null +++ b/documentation/static/pgpkeys/zirias.key @@ -0,0 +1,32 @@ +// sh addkey.sh zirias 54ADE0069879F231 ; + +[.literal-block-margin] +.... +pub ed25519/54ADE0069879F231 2022-08-02 [SC] [expires: 2025-08-01] + Key fingerprint = 6936 13D5 5BBF 4837 B212 3ACC 54AD E006 9879 F231 +uid Felix Palmen +uid Felix Palmen +sub cv25519/706CBCB4E1AE67C8 2022-08-02 [E] [expires: 2025-08-01] + +.... + +[.literal-block-margin] +.... +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEYukWxhYJKwYBBAHaRw8BAQdA7sqVBDPo/CLhv2oWPApofgDyt/onalk1HNjt +Ank8x0O0IUZlbGl4IFBhbG1lbiA8ZmVsaXhAcGFsbWVuLWl0LmRlPoiWBBMWCgA+ +FiEEaTYT1Vu/SDeyEjrMVK3gBph58jEFAmLpFsYCGwMFCQWjmoAFCwkIBwMFFQoJ +CAsFFgMCAQACHgUCF4AACgkQVK3gBph58jEqRwEAgV9y/uzpGOsIPF02eN/lEeCJ +hXZBVCSbcRbKE6BEN5QA/3i7HLhG8mv7phOFYXDP8eBLB/IWiHQAlWDKXtNvodUD +tCFGZWxpeCBQYWxtZW4gPHppcmlhc0BGcmVlQlNELm9yZz6IlgQTFgoAPhYhBGk2 +E9Vbv0g3shI6zFSt4AaYefIxBQJi6RhVAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYD +AgEAAh4FAheAAAoJEFSt4AaYefIxqHcBAP6Hk2x914LsGipwzGg+EgHmbba+whfO +oBPd47VhNfMoAQD3fbwNGNMbk4xXi5iaKeY+Gi5avZxD6NIXxyaWnvpiDbg4BGLp +FsYSCisGAQQBl1UBBQEBB0Aj2cXIYlGWkh5zkltu5UArxjR89jaPETet3lGVbS6v +FQMBCAeIfgQYFgoAJhYhBGk2E9Vbv0g3shI6zFSt4AaYefIxBQJi6RbGAhsMBQkF +o5qAAAoJEFSt4AaYefIx/vwA/3TtyV3GyGDZ5mFiRkBV5n69U4ycciD4uhwOf8fJ +6AiUAPwP4Wa10mOLbnpx0/KI6vdUjjEdY8EbJ6k4r8Rkq8JeCw== +=+9un +-----END PGP PUBLIC KEY BLOCK----- +.... diff --git a/shared/authors.adoc b/shared/authors.adoc --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -3632,6 +3632,10 @@ :zi-email: zi@FreeBSD.org :zi: {zi-name} <{zi-email}> +:zirias-name: Felix Palmen +:zirias-email: zirias@FreeBSD.org +:zirias: {zirias-name} <{zirias-email}> + :zleslie-name: Zach Leslie :zleslie-email: zleslie@FreeBSD.org :zleslie: {zleslie-name} <{zleslie-email}> diff --git a/shared/contrib-additional.adoc b/shared/contrib-additional.adoc --- a/shared/contrib-additional.adoc +++ b/shared/contrib-additional.adoc @@ -676,7 +676,6 @@ * Fangrui Song mailto:i@maskray.me[i@maskray.me] * Fanying Jen mailto:fanying@fynet.com[fanying@fynet.com] * Faried Nawaz mailto:fn@Hungry.COM[fn@Hungry.COM] -* Felix Palmen mailto:felix@palmen-it.de[felix@palmen-it.de] * Fernan Aguero mailto:fernan@iib.unsam.edu.ar[fernan@iib.unsam.edu.ar] * Ferruccio Vitale mailto:vitale@cs.tin.it[vitale@cs.tin.it] * Filipe Rocha mailto:filiperocha@gmail.com[filiperocha@gmail.com] diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc --- a/shared/contrib-committers.adoc +++ b/shared/contrib-committers.adoc @@ -251,6 +251,7 @@ * {osa} * {rodrigo} * {philip} +* {zirias} * {hiren} * {yuripv} * {fluffy} 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,5 +1,9 @@ # Sort news by year, month and day +[[news]] +date= "2022-08-01" +description = "New committer: Felix Palmen (ports)" + [[news]] date= "2022-06-29" description = "New committer: Dmitry Salychev (src)"