git: 4b68449a34 - main - Commit bit out of safekeeping (ports): Michael Johnson (ahze)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Michael Johnson <ahze_at_FreeBSD.org>
Date: Tue, 13 Oct 2026 19:34:34 UTC
The branch main has been updated by ahze:

URL: https://cgit.FreeBSD.org/doc/commit/?id=4b68449a34c426404ecdedb384bd0b4a2bb9816d

commit 4b68449a34c426404ecdedb384bd0b4a2bb9816d
Author:     Michael Johnson <ahze@FreeBSD.org>
AuthorDate: 2026-10-12 14:30:38 +0000
Commit:     Michael Johnson <ahze@FreeBSD.org>
CommitDate: 2026-10-13 19:33:57 +0000

    Commit bit out of safekeeping (ports): Michael Johnson (ahze)
    
    Move ahze back from the developer alumni, add a news item and replace
    the 2004 DSA key with a current one.
    
    Approved by:    dtxdf (mentor), doceng (implicit)
    Differential Revision:  https://reviews.freebsd.org/D60647
---
 documentation/static/pgpkeys/ahze.key | 65 ++++++++++++++++-------------------
 shared/contrib-committers.adoc        |  1 +
 shared/contrib-develalumni.adoc       |  1 -
 website/data/en/news/news.toml        |  4 +++
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/documentation/static/pgpkeys/ahze.key b/documentation/static/pgpkeys/ahze.key
index 9f35f6572c..a98ebbc724 100644
--- a/documentation/static/pgpkeys/ahze.key
+++ b/documentation/static/pgpkeys/ahze.key
@@ -1,46 +1,41 @@
-// sh addkey.sh ahze 3C046FD6;
+// sh addkey.sh ahze AFE70A3FF8F396CC ;
 
 [.literal-block-margin]
 ....
-pub  1024D/3C046FD6 2004-10-29 Michael Johnson (FreeBSD key) <ahze@FreeBSD.org>
-     Key fingerprint = 363C 6ABA ED24 C23B 5F0C  3AB4 9F8B AA7D 3C04 6FD6
-uid                            Michael Johnson (pgp key) <ahze@ahze.net>
-sub  2048g/FA334AE3 2004-10-29
+pub   ed25519/AFE70A3FF8F396CC 2026-10-10 [SC] [expires: 2028-10-09]
+      Key fingerprint = 40D3 AAED 4498 F62B 2E18  455E AFE7 0A3F F8F3 96CC
+uid                            Michael Johnson <ahze@FreeBSD.org>
+uid                            Michael Johnson <buhnux@gmail.com>
+uid                            Michael Johnson <michaeljohnson@ahze.net>
+sub   cv25519/D47956BCAA9C236E 2026-10-10 [E]
+      Key fingerprint = 0EBD 108E 8770 E9C6 EF57  E5E8 D479 56BC AA9C 236E
+
 ....
 
 [.literal-block-margin]
 ....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEGCy1ARBAD/K2SbL6XiTJ3Rn/weuN/L78ROUltIoRGOkZE4971fLcAbtIsf
-nANWDrpDqbhLgEbZLeCn/EIWOPqrYyKpCGu/IoZ6kx7UPtUH4eooJBarrrQPJVV1
-mfW5ktDry3AoiaUH+jL47AxFCb/bh7Rc11vrhLKdnc74wI+nu2cyk2llkwCgwX78
-nlN2qTrbXxOEAPpJjMontfsEAL+4sS9DOay7NkZq2B2p9AZnSsXQg6/r8Epqznqj
-yPQBm489UcIZy2FiBwaUR7w0fMh5xNX0FE3xFiTd4VUTgUJUSqpYtdfI7IHvJXml
-P/VK14CtgRY2B24wpDPMae32hGBFUwSE9Frb5NiKlxMC4+fR71wZS7MtxTnwJ1v/
-MoVaA/9FyoKCAw3Dqnf5W89dj5W5x35jLKSLobEhhUB2S2LPiwBa5A79euMvgtk0
-gKeh6IslXKOmCO148ws7HSaErBIBVBDpfOsqcQJTcd5lvEbslp+z2oCKeQK3pgQ5
-aEHp8IJ3YgQEHz+YityOF0jCMGNJTFAz18U4RzVxSe55iyT/17QpTWljaGFlbCBK
-b2huc29uIChwZ3Aga2V5KSA8YWh6ZUBhaHplLm5ldD6IWwQTEQIAGwUCQYLLUAYL
-CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCfi6p9PARv1oW2AKC0xjNgjhL1EHPtFOXH
-kGz24lF4QQCfQxkoJBq0CkLQrYvdA3MLP+IJ6ba0ME1pY2hhZWwgSm9obnNvbiAo
-RnJlZUJTRCBrZXkpIDxhaHplQEZyZWVCU0Qub3JnPoheBBMRAgAeBQJBgtexAhsD
-BgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEJ+Lqn08BG/W4JwAoJaU6MbisTlg4EMF
-jfE+wNptwO4kAJ46A0W6SiLWbK09gu7YlgfLgdYAmbkCDQRBgstcEAgAvD4PzCsh
-muLtNkPVKSlk2eZbqlIuyapbuIo6rHk8fo7fkfqVOOrnGOrAT5/sflmnG3H0BLvF
-4pkk7tyRtg3hz8qGACCA4SRf48TxRERpIUoW5R2cVBsMBTnpspRaFu8OdBL0dwXs
-LmH797gxDXCGXzSU5xKBSQN4LfoEuLr1qQmPbuPW+Rdi3hrdk1eGsJ03rU5RExzQ
-ck+J7a5VWsyghNCSj1Rzuw+0OVGBijJW51FD9QU+Eqb3seL7E19mWC3FMU34RFwn
-5lbxolY43iPV0jc0MFcV4POHUSZ8ot9xbQpcAClTyXZh21QEIFzYjJe9ZeVWKOqH
-UZS1naB4k98G6wADBggAnRlPolzcjJvqvv5Hfv7oDeDARNxqeKTj+fPXIHR0Gh34
-8HMfmxsFzS6nsrrVc43Q6Iaso5hbdP4UvE0/HzhPALzCTeZGpZF54pffg9Pqb84U
-p+D59I+b88RDBvvfwF0OBg6du08Rdkv9JfG3R+QZembK+IhUa5yxhtfbQmI6Y01r
-phtx4FAKZw4Xp2eb7IBoZWktfcOE99UJcl9hUmBHJXRznQoCHz5OwAKA6a/0b7j7
-B3bPxj+tLlQksdmRbEJKVBa3LQm09PkxfZj8iahvQbp23p5VSJDKzNDrgmsqaCpV
-CFNgMvYLvtxC2xA0uNtaRpdZRLS/11NUj3oJIULv8IhGBBgRAgAGBQJBgstcAAoJ
-EJ+Lqn08BG/WFK0AnjdWWBxG7slwI8u1W+7uRsuh6NXMAJ9r+6Br6mlEtsoWrMel
-IlhG1mVq6A==
-=I7wA
+mDMEasqYdBYJKwYBBAHaRw8BAQdAdFXrGMJY0GMLMsrZgZoiZ0O9w/ojhDp4J0Du
+ExnsWqm0Ik1pY2hhZWwgSm9obnNvbiA8YnVobnV4QGdtYWlsLmNvbT6ItQQTFgoA
+XRYhBEDTqu1EmPYrLhhFXq/nCj/485bMBQJqyph0GxSAAAAAAAQADm1hbnUyLDIu
+NSsxLjEyLDIsMwIbAwUJA8JnAAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAK
+CRCv5wo/+POWzNzWAQCRrfF9ipfz2JHd/k69/q3o4v5EoTSJhniNTGmcqmLuDQEA
+jSJRj7jceOvXIRqiSTpeNmcbp5U8THguA/FzmYixoAu0Ik1pY2hhZWwgSm9obnNv
+biA8YWh6ZUBGcmVlQlNELm9yZz6IuAQTFgoAYBsUgAAAAAAEAA5tYW51MiwyLjUr
+MS4xMiwyLDMCGwMFCQPCZwAFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AWIQRA
+06rtRJj2Ky4YRV6v5wo/+POWzAUCaszpsAIZAQAKCRCv5wo/+POWzPlBAQDidrwI
+GcMzdvXIt0EdZpUnUZc+BVN6Kn7XpOj1GSwulgD9HKkwXOZJdqkf7Opv+fohQRKD
+qFv3IgptYU8kgCkhtgG0KU1pY2hhZWwgSm9obnNvbiA8bWljaGFlbGpvaG5zb25A
+YWh6ZS5uZXQ+iLUEExYKAF0WIQRA06rtRJj2Ky4YRV6v5wo/+POWzAUCaszuqRsU
+gAAAAAAEAA5tYW51MiwyLjUrMS4xMiwyLDMCGwMFCQPCZwAFCwkIBwICIgIGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQr+cKP/jzlsycywD8D4qVPvO9nkjJda/cvulzNGMD
+fMO+KvkO7uMsWUxDeJUA+gNgEdHArALdbx3vg0Ngrr4Ao/4w2rCT76u/jm5Jw1kM
+uDgEasqYdBIKKwYBBAGXVQEFAQEHQHfshwu8avAyMLOpTrkUcYDuFLheeI/HPeke
+fqSW0JcnAwEIB4iUBBgWCgA8FiEEQNOq7USY9isuGEVer+cKP/jzlswFAmrKmHQb
+FIAAAAAABAAObWFudTIsMi41KzEuMTIsMiwzAhsMAAoJEK/nCj/485bMD2sBAPdD
+Z7Ubhm2MugjnIUWqfrVrQq7eNyMT7v3gAJy93RjNAQD2HrDR4mE8qvsUwG1jAGmj
+BEd35R0MNjzhrR5ydcucAw==
+=gJ6S
 -----END PGP PUBLIC KEY BLOCK-----
 ....
-
diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc
index b45f3007d9..efed86a04c 100644
--- a/shared/contrib-committers.adoc
+++ b/shared/contrib-committers.adoc
@@ -150,6 +150,7 @@
 * {pi}
 * {debdrup}
 * {peterj}
+* {ahze}
 * {markj}
 * {thj}
 * {mjoras}
diff --git a/shared/contrib-develalumni.adoc b/shared/contrib-develalumni.adoc
index 952d8e4529..3f5e033bfa 100644
--- a/shared/contrib-develalumni.adoc
+++ b/shared/contrib-develalumni.adoc
@@ -201,7 +201,6 @@
 * {sumikawa} (2003 - 2014)
 * {tmseck} (2013 - 2014)
 * {carl} (2013 - 2014)
-* {ahze} (2004 - 2013)
 * {avl} (2009 - 2013)
 * {chinsan} (2007 - 2013)
 * {clement} (2003 - 2013)
diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml
index e8cccc1ee5..883c618a49 100644
--- a/website/data/en/news/news.toml
+++ b/website/data/en/news/news.toml
@@ -5,6 +5,10 @@ date = "2026-10-07"
 title = "Tribute to Margaret Hamilton"
 description = "FreeBSD would like to pay our respects to Margaret Hamilton, whose work allowed coding to become both the scientific discipline it is today, and the art form that drew each of us to it. She embodied both the engineering rigor and the rebelliousness that have come to define what it is to be a hacker today. We owe her a spiritual debt and are proud to be members of this discipline that she was pivotal in creating."
 
+[[news]]
+date = "2026-10-06"
+description = "Returning committer: <a href=\"mailto:ahze@FreeBSD.org\">Michael Johnson</a> (ports)"
+
 [[news]]
 date = "2026-10-06"
 description = "New committer: <a href=\"mailto:longros@FreeBSD.org\">Christos Longros</a> (ports)"