- MFH

svn path=/projects/db5/; revision=42250
2013-07-11 17:27:09 +00:00 · 2013-07-11 17:27:09 +00:00 · 888db9ae19 · 2020-12-08 03:00:23 +00:00
commit 888db9ae19
parent 0b76ab9d14 f21cda71b5
120 changed files with 5286 additions and 3959 deletions
--- a/share/pgpkeys/README
+++ b/share/pgpkeys/README
@ -31,7 +31,7 @@ address.  For instance, in my case:
 | or pgpkeys-core.xml). Remember to keep the list sorted by last name!
 | 
 |     <sect2 id="pgpkey-des">
-|       <title>&a.des;</title>
+|       <title>&a.des.email;</title>
 |       &pgpkey.des;
 |     </sect2>
 | 
--- a/share/pgpkeys/addkey.sh
+++ b/share/pgpkeys/addkey.sh
@ -78,7 +78,7 @@ echo "pgpkeys-officers.xml or pgpkeys-core.xml)."
 echo "Remember to keep the list sorted by last name!"
 echo
 echo "    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id=\"pgpkey-${me}\">"
-echo "      <title>&a.${me};</title>"
+echo "      <title>&a.${me}.email;</title>"
 echo "      &pgpkey.${me};"
 echo "    </sect2>"
 echo
--- a/share/pgpkeys/marino.key
+++ b/share/pgpkeys/marino.key
@ -0,0 +1,76 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh marino A0AE6229;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/A0AE6229 2011-07-19
+      Key fingerprint = EE48 4F90 C861 3A5F E39E  AB9E 33CF 4190 A0AE 6229
+uid                  John Marino (DragonFly) <draco@marino.st>
+uid                  John R. Marino <john.secure@marino.st>
+uid                  John Marino (NetBSD) <marino@netbsd.org>
+sub   2048R/71D9FB68 2011-07-19
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE4lqeQBCADCjJjZRgrwytnQ42fHt8yCRSRu/4Qd3OXx9ZKNOhpqzXwWGw/Q
+P41zJj+gQiCcpMa1mqoAUJQLaq/+H+Gy4oYHGQZiRa6rOIyxJaFqJP1UBfankNv3
+Gj9saoVJnnay2m62BKyHE9kclgJ2ujg0cOmUDB/RuPVUyyCOQnB7MU4iPpydrw+N
+9xY4fks+cTvzT1/dJqYx8/phMHDrRBie81O5rkz6uP9jDJhCsObVZbr3zvBulzzb
+GlxdlskIZAPYdqoHrY2oQZ2iY4QSP9MYAbLJV0dMaIj43vlthsFLBH4bn42WlDkA
+aDux9+kFOHtoE9p2PxkLRcnC9Atqq66rxDc7ABEBAAG0KUpvaG4gTWFyaW5vIChE
+cmFnb25GbHkpIDxkcmFjb0BtYXJpbm8uc3Q+iQE4BBMBAgAiBQJOJbG4AhsDBgsJ
+CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAzz0GQoK5iKXlzCACOKoqsG4z5G7u3
+DyfPNSNZlExgjNjnF2PTSPuT6fP2VV8U0sJfXT7aWWQ57XIeB35ApgN7a9X0okJ9
+Pfm2+yTHY/OGJfidVIoEpq8JsCsIq2SYUFT3qAYoHr2dEnZ10KRagbfxYgQVYAB+
+tbBociJfHYgfPI6+LTa72nHe6W9v522kLRQ1BWHf4ELrsVTySOIOd0ecAhFW5hsP
+6nBIh0+zRqSHl2qoMl1tukNEcCPuaZLSuLlyFPiC3/H03XD7CIDjTSucuRfxXJfs
+ggq5iNz07qTraTZee7UtDXzilfZ+ybUdavzIC3eER/H+YLX3Lh4OFr8SBXODD4VR
+jnDWuPPSiQEcBBABAgAGBQJOKT8LAAoJEAeVGKMo0YKet5gIAJVsQUUDQKeuVXIm
+Ji6/zaP2whlCwewtNsf3uGWpQb+Ede0XZ+fb9O9uKHqkDaawgCv9JT0DHFD0H/LC
+PlFSax0CoGgjFLIjuUZtVUoIYrooPYDWHSMsjKQIJWq83ZxSjJcPDczc0E55XYd0
+wn4wlXRQ8EzyROi3o6ewEWb3OTH7ivQY/erKXV004BabkzxP3ta9HRLzZljNKrU/
+V1e7MiwZ7efaWZaa7KL2b6V+T49RnWISVfPvyWHXNN/rw3fPFRW0yHVZANic/jXO
+6lXEz9uzfbofT/Gc5Hoj7BQFkA0eDtZ+PhsgjiI3IH12PXmDmwpxgl7p0Db/LTXp
+lMbNjg+0JkpvaG4gUi4gTWFyaW5vIDxqb2huLnNlY3VyZUBtYXJpbm8uc3Q+iQE4
+BBMBAgAiBQJOJankAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAzz0GQ
+oK5iKcnOB/wNzXabOslWeJyJpktWsrGEkwvLco3MTI9U7g6ywmUfBSsF7VNwQT7t
+4sXp3xIxxPOwa9EZUc3rs9tnjqgzzFOtkFxvxHCnfwUqxDFAXQXTgFeaZUQkWs1e
+tFA9PnITl/CjGH/Bzl8ACfGJ057r246uiuyEmYux/zQTIteysZ5E/2rH7PJUJWji
+yL9Fdv8EEXvSD/fn8XEbhFgY0iN47YnGbWyDw+kA4ufHyLFHYx96SN3s1Cfr79+f
+cU4oU/s3P5u+U8aFLxsjtu+UxEDxLUOr0U0oKF6dmVxv6N1pkJojTLRoOEieW01R
+9k/ee/aXWNTiR0G2s0TxwoqDwG0F/E54iQEcBBABAgAGBQJOKT8LAAoJEAeVGKMo
+0YKej3cH/2RPTukUaTJ2MpRAltPgLM1eQDFDAw52lLvHd7fI1c5DYOjQJVASaGTS
+phyw8/6gc8RBhkun0zHi+O6WX4PlZrMToeXtmUbtBQ3iildjfcE5+EGXBTgZNuea
+7aLA5pUQ20k9cRhUx2imxM9U+z9+DYeXb30ah2dXSlOTVebkGPvEw2VVdn9cHK5m
+741S+UalpHmRhFKB52PaQjuJcGGDbcMt6gEIG/VaA7McFqm/0y/n78Tcvc6o5+pA
+vp8Bg+y98FD3+4Gl7mKa5OjRNRz2XDsAcOaXeBElYyVzsCgMExNhhPLmcbuYN8ZV
+ST3aQ9ukKTSW4ZDp3UvTPKa7VHMkZA20KEpvaG4gTWFyaW5vIChOZXRCU0QpIDxt
+YXJpbm9AbmV0YnNkLm9yZz6JATgEEwECACIFAk4lsR0CGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEDPPQZCgrmIpHnUH/j6qMNlpMdn0zd41bJQLwamCDwSO
+kN97v5WfzKhwhxhRjgoN/K81sU2JXdibmwYtFVTgdD9cucK+7jdOSC5AQJQuCrcS
+UzeONPnXZv+hq9qP4UZKxNfvYT2u6TDSEeYDWpSm4UiQXLJdxlf7w0y50yHTq8jF
+9FmcF+XWCcj53YaEFG6cHzFC0UZWltRzl5nK6DlropS0DJWcGO+x+WhrKyeSZ0+E
+v8N48x2E0OM5nDNZmG5NttnLUgNIAN2xyGHutmRSdVN650e8A3LociwfDdY6M/SD
+j6jKa2MJoWQ2rYVVNR5xGj0Ghn/+2GURZwxaDPWriMvTb0cSzccvDLS7XgiJARwE
+EAECAAYFAk4pPwsACgkQB5UYoyjRgp46rwf/XQTFn3kM80mFf2J5Y301SlOC2RwK
+K84rL3IskFRT1GEUhxhmOdZDzvwC1dyqHiRj517IeiSbmjP+KTw3lUEmErjsnD2X
+5fn2rM5DVrlF6R/dCjJ12GgqBJG4quuFPva/Fve+h9bHW84bYgjcX9J5jCzp0Otd
+0uqZMg2OPxaQIJknho0a/aDtDh3FepH79mQUjybGrASACOt5HMgzoUpchm1bE2mL
+CVw/Ge2n83mTNJWAMT0Ya1QCMtZofa0PSGAW15h4TqjIYQ6mocJ0/7Ugggb2PMME
+JilASJdwBEa1RqsLCzI3RTH5hhhCuLJwI9uPRrXc6mNZ6JWBD/7KfIArobkBDQRO
+JarKAQgAt5aULAv8fBdhniQGT1hfSHgj2lFFA0AkJj3wifUOun23u6dcXCrk/9PR
+SZQcf5tPhp3egCm0JaL63MQdSNL/JUuG3zOBE+OnYAfhUTNWLfWnZkKdyjqw9Edr
+ztsiLTTlkMowrZUM4gmH9EP/rnf2WvDuZuTTG/gB4gQX5nCADKmoK4pphE+3ka44
+4GiIMcEAQY8GALBCpz5oi/hC2AMbN5+1jchqx+yDUnoOaRTFxmHo1yWonbrya315
+lIWI7YLXycnK9QDLCJsKwMRZWoJ3XnY+/3jwi7dnZ2LW6yf05hfPcPsxy/kVpIS9
+qLtr8v4Tl7Iz/2pooJQtUu8raPki9wARAQABiQEfBBgBAgAJBQJOJarKAhsMAAoJ
+EDPPQZCgrmIp5eoH/1WmNDoPvSBZDkLwjEPhb1uFDvmttGAeHsrcyzvan/C+vo5q
+VW05AD0P/pdz4qjmvH9ohG5DAqOkoORbOysFd+8cCCYScCmG7avqhfg2sAezXdpv
+5LGtTTrQIBNayERkCm0pLaIypE/ExWKUv+cnZtsqONzADLBwgkGO1DcpUnmXaQ9P
+MHPu8AHPVTttFHrSOgPSHc7X1B6j/z2AHzR/l3LG39w3K+v4WQbNHg279eyDQCQj
+HS7PvfnPkKP7ujgmLA4ccjZnuPzpDkGetLs/CKWhEoKd/bqle+dP7D198YGrdGky
+Tm94E0oHtw3FC7U6Z1pZtMs8W7h6lru1dCauFP4=
+=g1mW
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
--- a/share/pgpkeys/pgpkeys-core.xml
+++ b/share/pgpkeys/pgpkeys-core.xml
@ -5,41 +5,41 @@
 -->

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-tabthorpe">
-      <title>&a.tabthorpe;</title>
+      <title>&a.tabthorpe.email;</title>
      &pgpkey.tabthorpe;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-gavin">
-      <title>&a.gavin;</title>
+      <title>&a.gavin.email;</title>
      &pgpkey.gavin;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jhb">
-      <title>&a.jhb;</title>
+      <title>&a.jhb.email;</title>
      &pgpkey.jhb;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-kib">
-      <title>&a.kib;</title>
+      <title>&a.kib.email;</title>
      &pgpkey.kib;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-theraven">
-      <title>&a.theraven;</title>
+      <title>&a.theraven.email;</title>
      &pgpkey.theraven;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-hrs">
-      <title>&a.hrs;</title>
+      <title>&a.hrs.email;</title>
      &pgpkey.hrs;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-peter">
-      <title>&a.peter;</title>
+      <title>&a.peter.email;</title>
      &pgpkey.peter;
    </sect2>

    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-miwi">
-      <title>&a.miwi;</title>
+      <title>&a.miwi.email;</title>
      &pgpkey.miwi;
    </sect2>
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@ -241,6 +241,7 @@
 <!ENTITY pgpkey.marcel SYSTEM "marcel.key">
 <!ENTITY pgpkey.marck SYSTEM "marck.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.key">
+<!ENTITY pgpkey.marino SYSTEM "marino.key">
 <!ENTITY pgpkey.marius SYSTEM "marius.key">
 <!ENTITY pgpkey.markj SYSTEM "markj.key">
 <!ENTITY pgpkey.markp SYSTEM "markp.key">