From ce457dd952691bd54194d470ded317a9d8f5919f Mon Sep 17 00:00:00 2001
From: Jesper Schmitz Mouridsen <jsm@FreeBSD.org>
Date: Wed, 4 Jul 2018 16:22:27 +0000
Subject: [PATCH] Add myself (jsm) as a ports committer, add my key, update
 news.

Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D16112
---
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/jsm.key                         | 44 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 +++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 ++
 share/xml/news.xml                            | 10 +++++
 6 files changed, 67 insertions(+)
 create mode 100644 share/pgpkeys/jsm.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 13135869ab..6d3e6420e7 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -933,6 +933,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.mav.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.jsm.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.markm.email;</para>
   </listitem>
diff --git a/share/pgpkeys/jsm.key b/share/pgpkeys/jsm.key
new file mode 100644
index 0000000000..d0e3407c29
--- /dev/null
+++ b/share/pgpkeys/jsm.key
@@ -0,0 +1,44 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh jsm FF27311BCAAD5E73 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/FF27311BCAAD5E73 2018-07-02 [SC] [expires: 2021-07-01]
+      Key fingerprint = FEBD 6AF9 E18A C936 7CBC  C28E FF27 311B CAAD 5E73
+uid                            Jesper Schmitz Mouridsen <jsm@FreeBSD.org>
+sub   rsa2048/AD7A4081B64D9398 2018-07-02 [E] [expires: 2021-07-01]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFs6pWUBCADXKeYr9U76g6Jpgb4+/ezdJs8uRAxlzVrTOqFLFyl9zB3y6Ie3
+4xv1PvROBblsPvzpJuihWi1EVR13ySl/SGTzyvmiyxi3n6lj/dTcHMf1Hb2vtYdo
+Pqe4AHu9bCNUrSrzGdE8LYVp96M5jdrfzq/A1lgZGA070cSGe0e9xGIBKB1hz68B
+ZFxld/Ei7WVeDOpcNowihV22AVUMw1Z4E0A89WSR0DSxXiUcCqRQbbxtpFDvKbbA
+wSF9WIbgsjxvV8DJ0i3E8tDMwHAjTaMusjpya1y+jsoj0B1bxtoCEd4uIASl854e
+xMSnoBkMeipCzdbV/iju4rn/vwgSGKR74x2dABEBAAG0Kkplc3BlciBTY2htaXR6
+IE1vdXJpZHNlbiA8anNtQEZyZWVCU0Qub3JnPokBVAQTAQoAPhYhBP69avnhisk2
+fLzCjv8nMRvKrV5zBQJbOqVlAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4B
+AheAAAoJEP8nMRvKrV5zGy8IAMtFbiYzhYCB4yI8kjpq9gOxE/CWyi2uFfA3mRpM
+7CAjuwNUiX2bd4PJTlGR7zRz9fBPx6Wv5JmXztDqHjv/QWXom1ZMbrKd12aoy3Kd
+nh7ETYZUSsi37C6sM+X252VFgIjaFxY+6jmwLOxj3R3Qt2SEZ+6wG4cdVbsLNOM6
+GkCkPakoOUu6WIHsTpw2kzLHH+s4sTrBFchcUfVkpkZ1FxnwfSoBZ3ZfPpB1VjQx
+GgtBflyn8vaWR9n5G5aIR5AvwIemvbeD9TDQWxInkPHlOzvCJIwqIaTKw0V/0Yth
+a7KJOJ42EmMlxvzRo/alOm377v7Sn96jIz4xQgBBdbNCG0G5AQ0EWzqlZQEIAMFP
+CjcDNoAl4g3qJUjZx+BfYYd0TDqaj7T0X90tPq4AzVlMJwwAEO/OgQasuEp6HbVF
+vGInrnJI3jjQi9DhjrOp8+adFbgtsoTMqQYLeynJ3bSJ//6wF9E9s1CBkqjtBwf3
+Okgn7s+mn0AbDi+54ovkyBWQ2wdWCJs8DfuD4RF736PNxKoI4/D0nEKHxyblJ3a6
+lJ6iqdXAvafw8EMtZgf2bubQ/pLx6yfP4lRK/VbEH1vv16QQuSgHPHdiQ4r6Etlg
+QfI6aSMEai+fKU/kZtR7s78oj8RJrbJXcK4LN/Rpit03UlDLBJiZRTeXec6E9Dj9
+dgXhctPpD7uLuVRKNbMAEQEAAYkBPAQYAQoAJhYhBP69avnhisk2fLzCjv8nMRvK
+rV5zBQJbOqVlAhsMBQkFo5qAAAoJEP8nMRvKrV5zTY0H/irygVZKjsCel63PCz7z
+9HTH8FhvZ9QVQuRb6LlGYDrbf8ofCsuKKL4KlF4fkqCBUv80Yjn0jHlG9Ea8PGWG
+CxB/Y/HWM68bzpDMx8zynLCTie12cIVXe71XHmvno8xTARrBZ4H2u5TSZADKZ/ke
+rxeJ1/CB2UnjdrOkIiLdo2b7fgQq1Ws4ikgaqbSvxE8RN/fwjZvITfmAm6r2DnNa
+fs4HqJQvrtJ4rZ+t1Av2PbvuY0gSVbh3Bt35JV0rAVqvumnfJI5tF2vFxoc0D03U
+0/dtxvg0BMI/aDzwZ5IHR51ham7m3sTiA7TPPvJjAeX2aydgZDnFzl3q7LTYUJ02
+1gQ=
+=UZDe
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index fed607631b..a8cd84b9cc 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -1676,6 +1676,11 @@
       &pgpkey.tmm;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-jsm">
+      <title>&a.jsm.email;</title>
+      &pgpkey.jsm;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-max">
       <title>&a.max.email;</title>
       &pgpkey.max;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 4501b12108..244df9a71e 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -252,6 +252,7 @@
 <!ENTITY pgpkey.jpaetzel SYSTEM "jpaetzel.key">
 <!ENTITY pgpkey.jrm SYSTEM "jrm.key">
 <!ENTITY pgpkey.jsa SYSTEM "jsa.key">
+<!ENTITY pgpkey.jsm SYSTEM "jsm.key">
 <!ENTITY pgpkey.jtl SYSTEM "jtl.key">
 <!ENTITY pgpkey.junovitch SYSTEM "junovitch.key">
 <!ENTITY pgpkey.jwb SYSTEM "jwb.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 5ddd1c3ebb..4f1bd977e9 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -1200,6 +1200,9 @@
 <!ENTITY a.jseger "Justin Seger">
 <!ENTITY a.jseger.email "&a.jseger; <email xmlns='http://docbook.org/ns/docbook'>jseger@FreeBSD.org</email>">
 
+<!ENTITY a.jsm "Jesper Schmitz Mouridsen">
+<!ENTITY a.jsm.email "&a.jsm; <email xmlns='http://docbook.org/ns/docbook'>jsm@FreeBSD.org</email>">
+
 <!ENTITY a.jtc "J.T. Conklin">
 <!ENTITY a.jtc.email "&a.jtc; <email xmlns='http://docbook.org/ns/docbook'>jtc@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index e9d3964671..ba8e774d77 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -33,6 +33,16 @@
 
     <month>
       <name>6</name>
+	
+      <day>
+	<name>30</name>
+
+	<event>
+	   <p>New committer:
+             <a href="mailto:jsm@FreeBSD.org">Jesper Schmitz Mouridsen</a>
+	    (ports)</p>
+	</event>
+      </day>
 
       <day>
 	<name>27</name>