From 1cf66a7338fc55ddc8ca625e4f1872f90b500741 Mon Sep 17 00:00:00 2001
From: Olivier Cochard <olivier@FreeBSD.org>
Date: Tue, 16 Feb 2016 09:15:48 +0000
Subject: [PATCH] Add: - myself as a ports committer - my PGP key - news entry

Approved by:	jadawin
Differential Revision:	https://reviews.freebsd.org/D5287
---
 .../contributors/contrib.additional.xml       |  5 --
 .../contributors/contrib.committers.xml       |  4 +
 share/pgpkeys/olivier.key                     | 77 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 +
 share/xml/news.xml                            | 10 ++-
 7 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 share/pgpkeys/olivier.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 34df5b686b..a1ca51d4fe 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -8009,11 +8009,6 @@
       <email>obld@r14.freenix.org</email></para>
   </listitem>
 
-  <listitem>
-    <para>Olivier Cochard-Labb&eacute;
-      <email>olivier@cochard.me</email></para>
-  </listitem>
-
   <listitem>
     <para>Olivier Tharan
       <email>olive@oban.frmug.org</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 4000601ea3..e73ce70513 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -244,6 +244,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.alc.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.olivier.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.cracauer.email;</para>
   </listitem>
diff --git a/share/pgpkeys/olivier.key b/share/pgpkeys/olivier.key
new file mode 100644
index 0000000000..b35ff22e6e
--- /dev/null
+++ b/share/pgpkeys/olivier.key
@@ -0,0 +1,77 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh olivier 89A5246DC4C57722 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/89A5246DC4C57722 2016-02-15
+      Key fingerprint = 18D2 A78C 6BBA 0A5B 3A1A  4C7C 89A5 246D C4C5 7722
+uid                            Olivier Cochard <olivier@cochard.me>
+uid                            Olivier Cochard-Labbé <olivier@FreeBSD.org>
+sub   rsa4096/BC44032DC2707BE0 2016-02-15
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=HpEo
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 8e34465341..f59dd2c279 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -396,6 +396,11 @@
       &pgpkey.brucec;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-olivier">
+      <title>&a.olivier.email;</title>
+      &pgpkey.olivier;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-culot">
       <title>&a.culot.email;</title>
       &pgpkey.culot;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 2ec8cb1a1f..98517fa6bc 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -344,6 +344,7 @@
 <!ENTITY pgpkey.ohauer SYSTEM "ohauer.key">
 <!ENTITY pgpkey.oleg SYSTEM "oleg.key">
 <!ENTITY pgpkey.olgeni SYSTEM "olgeni.key">
+<!ENTITY pgpkey.olivier SYSTEM "olivier.key">
 <!ENTITY pgpkey.olivierd SYSTEM "olivierd.key">
 <!ENTITY pgpkey.oshogbo SYSTEM "oshogbo.key">
 <!ENTITY pgpkey.patrick SYSTEM "patrick.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 598095cf84..abedd5a7de 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -1641,6 +1641,9 @@
 <!ENTITY a.oliver "Oliver Lehmann">
 <!ENTITY a.oliver.email "&a.oliver; <email xmlns='http://docbook.org/ns/docbook'>oliver@FreeBSD.org</email>">
 
+<!ENTITY a.olivier "Olivier Cochard-Labb&eacute">
+<!ENTITY a.olivier.email "&a.olivier; <email xmlns='http://docbook.org/ns/docbook'>olivier@FreeBSD.org</email>">
+
 <!ENTITY a.olivierd "Olivier Duchateau">
 <!ENTITY a.olivierd.email "&a.olivierd; <email xmlns='http://docbook.org/ns/docbook'>olivierd@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 66dafd3f2b..5e7634dc06 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -51,8 +51,16 @@
       </day>
 
       <day>
-	<name>1</name>
+	<name>2</name>
 
+	<event>
+		<p>New committer:
+		<a href="mailto:olivier@FreeBSD.org">Olivier Cochard-Labb&eacute</a> (ports)</p>
+	</event>
+	  </day>
+
+	<day>	
+	<name>1</name>
 	<event>
 	  <title>October&ndash;December Status Report</title>