From 3694a4dad20c5b1011920694fca056a7d771b087 Mon Sep 17 00:00:00 2001
From: Dave Cottlehuber <dch@FreeBSD.org>
Date: Wed, 13 Sep 2017 21:51:31 +0000
Subject: [PATCH] Introduce information about new committer (dch@FreeBSD.org)

- Add myself as a committer
- Add my PGP public key
- Add my author entity
- Add a news entry

Reviewed by:	swills, jrm (mentor)
Approved by:	jrm (mentor)
Differential Revision:	https://reviews.freebsd.org/D12356
---
 .../contributors/contrib.additional.xml       |  5 --
 .../contributors/contrib.committers.xml       |  4 +
 share/pgpkeys/dch.key                         | 89 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 +
 share/xml/news.xml                            |  6 ++
 7 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/dch.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 1ee137975b..0071294c71 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -2293,11 +2293,6 @@
       <email>dave@dogwood.com</email></para>
   </listitem>
 
-  <listitem>
-    <para>Dave Cottlehuber
-      <email>dch@skunkwerks.at</email></para>
-  </listitem>
-
   <listitem>
     <para>Dave Edmondson
       <email>davided@sco.com</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 2db728684f..21138a9be2 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -228,6 +228,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.rakuco.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.dch.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.alc.email;</para>
   </listitem>
diff --git a/share/pgpkeys/dch.key b/share/pgpkeys/dch.key
new file mode 100644
index 0000000000..3848efe283
--- /dev/null
+++ b/share/pgpkeys/dch.key
@@ -0,0 +1,89 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh dch 7B6D7CF1E659C86A ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/7B6D7CF1E659C86A 2017-09-13 [SC] [expires: 2020-09-12]
+      Key fingerprint = 9537 F38F EAFE 4059 D422  DBE9 7B6D 7CF1 E659 C86A
+uid                            Dave Cottlehuber <dch@FreeBSD.org>
+sub   rsa4096/EDE33CA88915DC09 2017-09-13 [E] [expires: 2020-09-12]
+      Key fingerprint = E617 B852 6DFE D644 5A65  5698 EDE3 3CA8 8915 DC09
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+eyTolg==
+=w2Ni
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index be2319e723..2ca0cfc34c 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -406,6 +406,11 @@
       &pgpkey.rakuco;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-dch">
+      <title>&a.dch.email;</title>
+      &pgpkey.dch;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-alc">
       <title>&a.alc.email;</title>
       &pgpkey.alc;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 74c29611e4..6316964cae 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -408,6 +408,7 @@
 <!ENTITY pgpkey.qingli SYSTEM "qingli.key">
 <!ENTITY pgpkey.rafan SYSTEM "rafan.key">
 <!ENTITY pgpkey.rakuco SYSTEM "rakuco.key">
+<!ENTITY pgpkey.dch SYSTEM "dch.key">
 <!ENTITY pgpkey.ray SYSTEM "ray.key">
 <!ENTITY pgpkey.rcyu SYSTEM "rcyu.key">
 <!ENTITY pgpkey.rdivacky SYSTEM "rdivacky.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 26041ffed5..5ac6c20e13 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -549,6 +549,9 @@
 <!ENTITY a.dburr "Donald Burr">
 <!ENTITY a.dburr.email "&a.dburr; <email xmlns='http://docbook.org/ns/docbook'>dburr@FreeBSD.org</email>">
 
+<!ENTITY a.dch "Dave Cottlehuber">
+<!ENTITY a.dch.email "&a.dch; <email xmlns='http://docbook.org/ns/docbook'>dch@FreeBSD.org</email>">
+
 <!ENTITY a.dchagin "Dmitry Chagin">
 <!ENTITY a.dchagin.email "&a.dchagin; <email xmlns='http://docbook.org/ns/docbook'>dchagin@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 2f0adde3f3..4afcec87f5 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -47,6 +47,12 @@
       <day>
 	<name>9</name>
 
+	<event>
+	  <p>New committer:
+	  <a href="mailto:dch@FreeBSD.org">Dave Cottlehuber</a>
+	  (ports)</p>
+	</event>
+
 	<event>
 	  <title>&os;&nbsp;10.4-BETA4 Available</title>