From 1e567387b989e3c265f02a7c1cb115762a42f618 Mon Sep 17 00:00:00 2001
From: Kai Knoblich <kai@FreeBSD.org>
Date: Fri, 1 Feb 2019 18:32:17 +0000
Subject: [PATCH] Add myself (kai) as a ports committer, add my key and update
 news.

Reviewed by: miwi (mentor)
Approved by: miwi (mentor)
Differential Revision: https://reviews.freebsd.org/D19049
---
 .../contributors/contrib.additional.xml       |  5 --
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/kai.key                         | 65 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 +
 share/xml/news.xml                            | 20 ++++++
 7 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/kai.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 5e2dd304a4..dd6385f776 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -5642,11 +5642,6 @@
       <email>kunishi@c.oka-pu.ac.jp</email></para>
   </listitem>
 
-  <listitem>
-    <para>Kai Knoblich
-      <email>freebsd_ports@k-worx.org</email></para>
-  </listitem>
-
   <listitem>
     <para>Kai Vorma
       <email>vode@snakemail.hut.fi</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index bf5a7d20d6..a0bd3f0093 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -661,6 +661,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.jceel.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.kai.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.wulf.email;</para>
   </listitem>
diff --git a/share/pgpkeys/kai.key b/share/pgpkeys/kai.key
new file mode 100644
index 0000000000..e52e1bfc60
--- /dev/null
+++ b/share/pgpkeys/kai.key
@@ -0,0 +1,65 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh kai F4B376E08A3D37EC ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/F4B376E08A3D37EC 2019-01-30 [SC] [expires: 2022-01-29]
+      Key fingerprint = 24B1 7A6D 0CF2 4E04 7BF5  FD9A F4B3 76E0 8A3D 37EC
+uid                            Kai Knoblich (kai@FreeBSD.org) <kai@FreeBSD.org>
+sub   rsa4096/83AB0542BC2F64BC 2019-01-30 [E] [expires: 2022-01-29]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+6asDOIuMHEelhQpiH1l11+ZnKalkCQu2
+=4XTU
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index d3496c319c..e5b5b754a4 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -1141,6 +1141,11 @@
       &pgpkey.andreas;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-kai">
+      <title>&a.kai.email;</title>
+      &pgpkey.kai;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-jkois">
       <title>&a.jkois.email;</title>
       &pgpkey.jkois;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 200f1aedc9..0c5072ad35 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -264,6 +264,7 @@
 <!ENTITY pgpkey.jwb SYSTEM "jwb.key">
 <!ENTITY pgpkey.jylefort SYSTEM "jylefort.key">
 <!ENTITY pgpkey.kadesai SYSTEM "kadesai.key">
+<!ENTITY pgpkey.kai SYSTEM "kai.key">
 <!ENTITY pgpkey.kaiw SYSTEM "kaiw.key">
 <!ENTITY pgpkey.kami SYSTEM "kami.key">
 <!ENTITY pgpkey.kan SYSTEM "kan.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 2cd14531d1..edd9e2b6a8 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -1248,6 +1248,9 @@
 <!ENTITY a.jylefort "Jean-Yves Lefort">
 <!ENTITY a.jylefort.email "&a.jylefort; <email xmlns='http://docbook.org/ns/docbook'>jylefort@FreeBSD.org</email>">
 
+<!ENTITY a.kai "Kai Knoblich">
+<!ENTITY a.kai.email "&a.kai; <email xmlns='http://docbook.org/ns/docbook'>kai@FreeBSD.org</email>">
+
 <!ENTITY a.kaiw "Kai Wang">
 <!ENTITY a.kaiw.email "&a.kaiw; <email xmlns='http://docbook.org/ns/docbook'>kaiw@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 9d51a41b47..7be3bf29c5 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -28,6 +28,26 @@
     $FreeBSD$
   </cvs:keyword>
 
+  <year>
+    <name>2019</name>
+
+    <month>
+      <name>2</name>
+
+      <day>
+        <name>1</name>
+
+        <event>
+          <p>New committer:
+            <a href="mailto:kai@FreeBSD.org">Kai Knoblich</a>
+            (ports)</p>
+        </event>
+
+      </day>
+
+    </month>
+  </year>
+
   <year>
     <name>2018</name>