Correctly generate a usable PGP key, using wblock's excellent guide.

svn path=/head/; revision=43738

share/pgpkeys/adamw.key

@@ -1,55 +1,51 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh adamw C57CF3A8;
+sh addkey.sh adamw 1CCD0A5830E59D2B ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048D/C57CF3A8 2012-11-15
-      Key fingerprint = CCD9 F28A BD1D 50A1 8D08  18A7 F48B B195 C57C F3A8
-uid                  Adam Weinberger (FreeBSD) <adamw@FreeBSD.org>
-uid                  Adam Weinberger (adamw.org) <adamw@adamw.org>
-sub   2048g/9C6D0E30 2012-11-15
+pub   2048R/1CCD0A5830E59D2B 2014-02-03 [expires: 2017-02-02]
+      Key fingerprint = F95F 60DB 115C EA59 2FED  E1FB 1CCD 0A58 30E5 9D2B
+uid                          Adam Weinberger <adamw@FreeBSD.org>
+uid                          Adam Weinberger <adamw@adamw.org>
+sub   2048R/92C1C8A42BDE2CCE 2014-02-03 [expires: 2017-02-02]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-IpuNrKfM7zuBiw==
-=yHIG
+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
+sBubp36SuO2WuMa1ke1Ygw==
+=QzLu
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>