diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml index 209ea6aeb9..7c1fc562eb 100644 --- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml @@ -1,1031 +1,50 @@ PGP Keys pgp keys In case you need to verify a signature or send encrypted email to one of the officers or developers a number of keys are provided here for your convenience. A complete keyring of FreeBSD.org users is available for download from http://www.FreeBSD.org/doc/pgpkeyring.txt. Officers - - &a.security-officer; - &pgpkey.security-officer; - - - - &a.core-secretary; - &pgpkey.core-secretary; - - - - &a.portmgr-secretary; - &pgpkey.portmgr-secretary; - - + §ion.pgpkeys-officers; Core Team Members - - &a.jhb; - &pgpkey.jhb; - - - - &a.kuriyama; - &pgpkey.kuriyama; - - - - &a.imp; - &pgpkey.imp; - - - - &a.wes; - &pgpkey.wes; - - - - &a.murray; - &pgpkey.murray; - - - - &a.peter; - &pgpkey.peter; - + §ion.pgpkeys-core; Developers - - &a.ariff; - &pgpkey.ariff; - - - - &a.will; - &pgpkey.will; - - - - &a.anholt; - &pgpkey.anholt; - - - - &a.mat; - &pgpkey.mat; - - - - &a.asami; - &pgpkey.asami; - - - - &a.barner; - &pgpkey.barner; - - - - &a.dougb; - &pgpkey.dougb; - - - - &a.bvs; - &pgpkey.bvs; - - - - &a.tobez; - &pgpkey.tobez; - - - - &a.damien; - &pgpkey.damien; - - - - &a.tdb; - &pgpkey.tdb; - - - - &a.mbr; - &pgpkey.mbr; - - - - &a.novel; - &pgpkey.novel; - - - - &a.harti; - &pgpkey.harti; - - - - &a.obraun; - &pgpkey.obraun; - - - - &a.jmb; - &pgpkey.jmb; - - - - &a.brueffer; - &pgpkey.brueffer; - - - - &a.markus; - &pgpkey.markus; - - - - &a.wilko; - &pgpkey.wilko; - - - - &a.oleg; - &pgpkey.oleg; - - - - &a.jcamou; - &pgpkey.jcamou; - - - - &a.perky; - &pgpkey.perky; - - - - &a.jon; - &pgpkey.jon; - - - - &a.luoqi; - &pgpkey.luoqi; - - - - &a.ache; - &pgpkey.ache; - - - - &a.seanc; - &pgpkey.seanc; - - - - &a.cjh; - &pgpkey.cjh; - - - - &a.cjc; - &pgpkey.cjc; - - - - &a.marcus; - &pgpkey.marcus; - - - - &a.nik; - &pgpkey.nik; - - - - &a.aaron; - &pgpkey.aaron; - - - - &a.ceri; - &pgpkey.ceri; - - - - &a.brd; - &pgpkey.brd; - - - - &a.brooks; - &pgpkey.brooks; - - - - &a.gnn; - &pgpkey.gnn; - - - - &a.pjd; - &pgpkey.pjd; - - - - &a.bsd; - &pgpkey.bsd; - - - - &a.danfe; - &pgpkey.danfe; - - - - &a.dd; - &pgpkey.dd; - - - - &a.bruno; - &pgpkey.bruno; - - - - &a.ale; - &pgpkey.ale; - - - - &a.peadar; - &pgpkey.peadar; - - - - &a.josef; - &pgpkey.josef; - - - - &a.ue; - &pgpkey.ue; - - - - &a.ru; - &pgpkey.ru; - - - - &a.le; - &pgpkey.le; - - - - &a.stefanf; - &pgpkey.stefanf; - - - - &a.jedgar; - &pgpkey.jedgar; - - - - &a.green; - &pgpkey.green; - - - - &a.lioux; - &pgpkey.lioux; - - - - &a.fanf; - &pgpkey.fanf; - - - - &a.blackend; - &pgpkey.blackend; - - - - &a.petef; - &pgpkey.petef; - - - - &a.billf; - &pgpkey.billf; - - - - &a.gioria; - &pgpkey.gioria; - - - - &a.mnag; - &pgpkey.mnag; - - - - &a.jmg; - &pgpkey.jmg; - - - - &a.dannyboy; - &pgpkey.dannyboy; - - - - &a.dhartmei; - &pgpkey.dhartmei; - - - - &a.jhay; - &pgpkey.jhay; - - - - &a.sheldonh; - &pgpkey.sheldonh; - - - - &a.mikeh; - &pgpkey.mikeh; - - - - &a.mheinen; - &pgpkey.mheinen; - - - - &a.niels; - &pgpkey.niels; - - - - &a.ghelmer; - &pgpkey.ghelmer; - - - - &a.mux; - &pgpkey.mux; - - - - &a.mich; - &pgpkey.mich; - - - - &a.foxfair; - &pgpkey.foxfair; - - - - &a.jkh; - &pgpkey.jkh; - - - - &a.ahze; - &pgpkey.ahze; - - - - &a.trevor; - &pgpkey.trevor; - - - - &a.phk; - &pgpkey.phk; - - - - &a.joe; - &pgpkey.joe; - - - - &a.vkashyap; - &pgpkey.vkashyap; - - - - &a.kris; - &pgpkey.kris; - - - - &a.keramida; - &pgpkey.keramida; - - - - &a.fjoe; - &pgpkey.fjoe; - - - - &a.jkim; - &pgpkey.jkim; - - - - &a.andreas; - &pgpkey.andreas; - - - - &a.jkois; - &pgpkey.jkois; - - - - &a.sergei; - &pgpkey.sergei; - - - - &a.maxim; - &pgpkey.maxim; - - - - &a.jkoshy; - &pgpkey.jkoshy; - - - - &a.rik; - &pgpkey.rik; - - - - &a.rushani; - &pgpkey.rushani; - - - - &a.clement; - &pgpkey.clement; - - - - &a.mlaier; - &pgpkey.mlaier; - - - - &a.erwin; - &pgpkey.erwin; - - - - &a.lawrance; - &pgpkey.lawrance; - - - - &a.leeym; - &pgpkey.leeym; - - - - &a.sam; - &pgpkey.sam; - - - - &a.jylefort; - &pgpkey.jylefort; - - - - &a.netchild; - &pgpkey.netchild; - - - - &a.lesi; - &pgpkey.lesi; - - - - &a.glewis; - &pgpkey.glewis; - - - - &a.delphij; - &pgpkey.delphij; - - - - &a.avatar; - &pgpkey.avatar; - - - - &a.ijliao; - &pgpkey.ijliao; - - - - &a.clive; - &pgpkey.clive; - - - - &a.clsung; - &pgpkey.clsung; - - - - &a.arved; - &pgpkey.arved; - - - - &a.remko; - &pgpkey.remko; - - - - &a.scottl; - &pgpkey.scottl; - - - - &a.pav; - &pgpkey.pav; - - - - &a.bmah; - &pgpkey.bmah; - - - - &a.mtm; - &pgpkey.mtm; - - - - &a.dwmalone; - &pgpkey.dwmalone; - - - - &a.sem; - &pgpkey.sem; - - - - &a.ehaupt; - &pgpkey.ehaupt; - - - - &a.kwm; - &pgpkey.kwm; - - - - &a.matusita; - &pgpkey.matusita; - - - - &a.tmclaugh; - &pgpkey.tmclaugh; - - - - &a.ken; - &pgpkey.ken; - - - - &a.dinoex; - &pgpkey.dinoex; - - - - &a.sanpei; - &pgpkey.sanpei; - - - - &a.marcel; - &pgpkey.marcel; - - - - &a.marck; - &pgpkey.marck; - - - - &a.tmm; - &pgpkey.tmm; - - - - &a.rich; - &pgpkey.rich; - - - - &a.knu; - &pgpkey.knu; - - - - &a.max; - &pgpkey.max; - - - - &a.yoichi; - &pgpkey.yoichi; - - - - &a.bland; - &pgpkey.bland; - - - - &a.simon; - &pgpkey.simon; - - - - &a.anders; - &pgpkey.anders; - - - - &a.obrien; - &pgpkey.obrien; - - - - &a.philip; - &pgpkey.philip; - - - - &a.hmp; - &pgpkey.hmp; - - - - &a.mp; - &pgpkey.mp; - - - - &a.roam; - &pgpkey.roam; - - - - &a.den; - &pgpkey.den; - - - - &a.gerald; - &pgpkey.gerald; - - - - &a.jdp; - &pgpkey.jdp; - - - - &a.krion; - &pgpkey.krion; - - - - &a.markp; - &pgpkey.markp; - - - - &a.thomas; - &pgpkey.thomas; - - - - &a.hq; - &pgpkey.hq; - - - - &a.dfr; - &pgpkey.dfr; - - - - &a.rees; - &pgpkey.rees; - - - - &a.trhodes; - &pgpkey.trhodes; - - - - &a.benno; - &pgpkey.benno; - - - - &a.roberto; - &pgpkey.roberto; - - - - &a.rodrigc; - &pgpkey.rodrigc; - - - - &a.guido; - &pgpkey.guido; - - - - &a.niklas; - &pgpkey.niklas; - - - - &a.marks; - &pgpkey.marks; - - - - &a.hrs; - &pgpkey.hrs; - - - - &a.wosch; - &pgpkey.wosch; - - - - &a.das; - &pgpkey.das; - - - - &a.schweikh; - &pgpkey.schweikh; - - - - &a.gshapiro; - &pgpkey.gshapiro; - - - - &a.arun; - &pgpkey.arun; - - - - &a.nork; - &pgpkey.nork; - - - - &a.vanilla; - &pgpkey.vanilla; - - - - &a.demon; - &pgpkey.demon; - - - - &a.jesper; - &pgpkey.jesper; - - - - &a.scop; - &pgpkey.scop; - - - - &a.anray; - &pgpkey.anray; - - - - &a.glebius; - &pgpkey.glebius; - - - - &a.kensmith; - &pgpkey.kensmith; - - - - &a.ben; - &pgpkey.ben; - - - - &a.des; - &pgpkey.des; - - - - &a.sobomax; - &pgpkey.sobomax; - - - - &a.brian; - &pgpkey.brian; - - - - &a.nsouch; - &pgpkey.nsouch; - - - - &a.ssouhlal; - &pgpkey.ssouhlal; - - - - &a.vsevolod; - &pgpkey.vsevolod; - - - - &a.vs; - &pgpkey.vs; - - - - &a.gsutter; - &pgpkey.gsutter; - - - - &a.metal; - &pgpkey.metal; - - - - &a.garys; - &pgpkey.garys; - - - - &a.nyan; - &pgpkey.nyan; - - - - &a.mi; - &pgpkey.mi; - - - - &a.gordon; - &pgpkey.gordon; - - - - &a.lth; - &pgpkey.lth; - - - - &a.thierry; - &pgpkey.thierry; - - - - &a.thompsa; - &pgpkey.thompsa; - - - - &a.flz; - &pgpkey.flz; - - - - &a.ume; - &pgpkey.ume; - - - - &a.ups; - &pgpkey.ups; - - - - &a.nectar; - &pgpkey.nectar; - - - - &a.adamw; - &pgpkey.adamw; - - - - &a.nate; - &pgpkey.nate; - - - - &a.wollman; - &pgpkey.wollman; - - - - &a.joerg; - &pgpkey.joerg; - - - - &a.emax; - &pgpkey.emax; - - - - &a.bz; - &pgpkey.bz; - - - - &a.phantom; - &pgpkey.phantom; - - + §ion.pgpkeys-developers; diff --git a/share/pgpkeys/README b/share/pgpkeys/README index 9e75144314..a2da36974c 100644 --- a/share/pgpkeys/README +++ b/share/pgpkeys/README @@ -1,103 +1,101 @@ How to add your key to the list =============================== The addkey.sh script will export your key and generate the correct SGML incantations to have your key listed in the "PGP Keys" chapter. It was written for GnuPG, but shouldn't be difficult to modify to use PGP if you absolutely won't use GnuPG. For addkey.sh to perform its magic, gpg must be in your path, and the key(s) you wish to export must be present in the default keyring or in a keyring listed in your ~/.gnupg/options file. The simplest case is when your login name (as reported by 'id -nu') is the same as your freefall login name, and all the keys you wish to add (and only those keys) have a UID that contains your FreeBSD.org email address. For instance, in my case: | % sh addkey.sh | Retrieving key... | pub 1024D/27848427 2000-10-13 Dag-Erling Smørgrav (low security key) | pub 1024D/0512E49A 2001-06-26 Dag-Erling Smørgrav (FreeBSD) | WARNING: Multiple keys; exporting all. If this is not what you want, | WARNING: you should specify a key ID on the command line. | Generating des.key... | Adding key to entity list... | | Unless you are already listed there, you should now add the -| following text to -| usr/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml in the -| appropriate position in -| the developer section (unless this is a role key or you are a -| core member.) Remember to keep the list sorted by last name! +| following text to pgpkeys-developers.sgml (unless this is a role key +| or you are a core member. In that case add to pgpkeys-officers.sgml +| or pgpkeys-core.sgml). Remember to keep the list sorted by last name! | | | &a.des; | &pgpkey.des; | | | Don't forget to 'cvs add des.key' if this is a new entry, | and check your diffs before committing! If your login name is different from your freefall login name, specify your freefall login name as the first argument to addkey.sh: | % sh addkey.sh des If you want to tune what keys are to be exported, specify the key IDs, or strings to look for in the UID, just like you would to gpg: | % sh addkey.sh des 0512E49A You can specify as few or as many IDs as you want, and addkey.sh will export all matching keys, and those only. If you didn't specify any key IDs on the command line, addkey.sh will look for a key that matches your FreeBSD.org email address. The script will generate a file named .key (des.key in my case) that with programlisting elements: one that contains the fingerprints of all the keys you exported, and one that contains an ASCII dump of those keys, as produced by 'gpg --armor --export'. It will also add a line to pgpkeys.ent defining an external entity named pgpkey. (pgpkey.des in my case) that refers to the key file. As you can see from the example above, addkey.sh will also tell you what keys it exported (check this carefully before committing!) and provide instructions for actually adding the key to the handbook. Beware that the keys are supposed to be ordered by surname; if you're unsure where to add your entry, use finger(1) to check the surnames of those around you. Once you've successfully run addkey.sh, 'cvs add' your key file, check the diffs, and commit. How to update your key ====================== There are two ways to update your key. The first is to follow the above instructions as if you were adding your key for the first time - except that you don't need to edit chapter.sgml, because you're already listed there. The addkey.sh script will snarf the RCS Id from the old key file and generate a new one with whatever keys you specified. The second method, which you can use if you're not adding or removing any keys, but just updating the ones that are already there (because you've had your key signed, or you've added or removed UIDs), is to execute the third line of your key file, which is a pre-cooked addkey.sh command line with your freefall login and the numeric key IDs of the keys contained in the file. Just do the equivalent of: | % eval $(grep addkey des.key) The exact command, of course, will depend on your shell, and on your freefall login name. -- des@freebsd.org $FreeBSD$ diff --git a/share/pgpkeys/addkey.sh b/share/pgpkeys/addkey.sh index 41bb48c3ee..a9b669110d 100644 --- a/share/pgpkeys/addkey.sh +++ b/share/pgpkeys/addkey.sh @@ -1,88 +1,88 @@ #!/bin/sh # # $FreeBSD$ # LANG=C; export LANG unset LC_ALL unset LC_MESSAGES me="$1" if [ -z "${me}" ]; then me=$(id -nu) else shift fi id="$@" if [ -z "${id}" ]; then id="${me}@freebsd.org" fi gpg=$(which gpg) if [ ! -x "${gpg}" ]; then echo "GnuPG does not seem to be installed" >/dev/stderr exit 1 fi echo "Retrieving key..." keylist=$(gpg --list-keys ${id}) echo "${keylist}" | grep '^pub' id=$(echo "${keylist}" | awk '/^pub/ { print $2 }' | sed 's%.*/%%' | sort -u) id=$(echo $id) if [ "${#id}" -lt 8 ]; then echo "Invalid key ID." >/dev/stderr exit 1 elif [ "${#id}" -gt 8 ]; then echo "WARNING: Multiple keys; exporting all. If this is not what you want," >/dev/stderr echo "WARNING: you should specify a key ID on the command line." >/dev/stderr fi fp=$(gpg --fingerprint ${id}) [ $? -eq 0 ] || exit 1 key=$(gpg --no-version --armor --export ${id}) [ $? -eq 0 ] || exit 1 keyfile="${me}.key" if [ -f "${keyfile}" ]; then rcsid=$(grep '^$' "${keyfile}") fi if [ -z "${rcsid}" ]; then rcsid='' fi echo "Generating ${keyfile}..." ( echo "${rcsid}" echo '' echo '' echo '' ) >"${keyfile}" echo "Adding key to entity list..." mv pgpkeys.ent pgpkeys.ent.orig || exit 1 ( cat pgpkeys.ent.orig printf '' 16 "${me}" "${keyfile}" ) | sort -u >pgpkeys.ent echo echo "Unless you are already listed there, you should now add the" -echo "following text to" -echo "doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml" -echo "in the appropriate position of the developer section (unless" -echo "this is a role key or you are a core member)." +echo "following text to pgpkeys-developers.sgml (unless this is a" +echo "role key or you are a core member. In that case add to" +echo "pgpkeys-officers.sgml or pgpkeys-core.sgml)." echo "Remember to keep the list sorted by last name!" echo echo " " echo " &a.${me};" echo " &pgpkey.${me};" echo " " echo echo "If this is a new entry, don't forget to 'cvs add ${keyfile}'," echo "and to commit each of ${keyfile}, pgpkeys.ent and" -echo "doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml." +echo "pgpkeys-developers.sgml, pgpkeys-officers.sgml, or" +echo "pgpkeys-core.sgml." diff --git a/share/pgpkeys/pgpkeys-core.sgml b/share/pgpkeys/pgpkeys-core.sgml new file mode 100644 index 0000000000..09a61d55bd --- /dev/null +++ b/share/pgpkeys/pgpkeys-core.sgml @@ -0,0 +1,35 @@ + + + + &a.jhb; + &pgpkey.jhb; + + + + &a.kuriyama; + &pgpkey.kuriyama; + + + + &a.imp; + &pgpkey.imp; + + + + &a.wes; + &pgpkey.wes; + + + + &a.murray; + &pgpkey.murray; + + + + &a.peter; + &pgpkey.peter; + diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/share/pgpkeys/pgpkeys-developers.sgml similarity index 89% copy from en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml copy to share/pgpkeys/pgpkeys-developers.sgml index 209ea6aeb9..7bf71bcbd7 100644 --- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml +++ b/share/pgpkeys/pgpkeys-developers.sgml @@ -1,1031 +1,945 @@ - - - PGP Keys - - pgp keys - In case you need to verify a signature or send encrypted email - to one of the officers or developers a number of keys are provided - here for your convenience. A complete keyring of FreeBSD.org - users is available for download from http://www.FreeBSD.org/doc/pgpkeyring.txt. - - - Officers - - - &a.security-officer; - &pgpkey.security-officer; - - - - &a.core-secretary; - &pgpkey.core-secretary; - - - - &a.portmgr-secretary; - &pgpkey.portmgr-secretary; - - - - - - Core Team Members - - - &a.jhb; - &pgpkey.jhb; - - - - &a.kuriyama; - &pgpkey.kuriyama; - - - - &a.imp; - &pgpkey.imp; - - - - &a.wes; - &pgpkey.wes; - - - - &a.murray; - &pgpkey.murray; - - - - &a.peter; - &pgpkey.peter; - - - - - Developers &a.ariff; &pgpkey.ariff; &a.will; &pgpkey.will; &a.anholt; &pgpkey.anholt; &a.mat; &pgpkey.mat; &a.asami; &pgpkey.asami; &a.barner; &pgpkey.barner; &a.dougb; &pgpkey.dougb; &a.bvs; &pgpkey.bvs; &a.tobez; &pgpkey.tobez; &a.damien; &pgpkey.damien; &a.tdb; &pgpkey.tdb; &a.mbr; &pgpkey.mbr; &a.novel; &pgpkey.novel; &a.harti; &pgpkey.harti; &a.obraun; &pgpkey.obraun; &a.jmb; &pgpkey.jmb; &a.brueffer; &pgpkey.brueffer; &a.markus; &pgpkey.markus; &a.wilko; &pgpkey.wilko; &a.oleg; &pgpkey.oleg; &a.jcamou; &pgpkey.jcamou; &a.perky; &pgpkey.perky; &a.jon; &pgpkey.jon; &a.luoqi; &pgpkey.luoqi; &a.ache; &pgpkey.ache; &a.seanc; &pgpkey.seanc; &a.cjh; &pgpkey.cjh; &a.cjc; &pgpkey.cjc; &a.marcus; &pgpkey.marcus; &a.nik; &pgpkey.nik; &a.aaron; &pgpkey.aaron; &a.ceri; &pgpkey.ceri; &a.brd; &pgpkey.brd; &a.brooks; &pgpkey.brooks; &a.gnn; &pgpkey.gnn; &a.pjd; &pgpkey.pjd; &a.bsd; &pgpkey.bsd; &a.danfe; &pgpkey.danfe; &a.dd; &pgpkey.dd; &a.bruno; &pgpkey.bruno; &a.ale; &pgpkey.ale; &a.peadar; &pgpkey.peadar; &a.josef; &pgpkey.josef; &a.ue; &pgpkey.ue; &a.ru; &pgpkey.ru; &a.le; &pgpkey.le; &a.stefanf; &pgpkey.stefanf; &a.jedgar; &pgpkey.jedgar; &a.green; &pgpkey.green; &a.lioux; &pgpkey.lioux; &a.fanf; &pgpkey.fanf; &a.blackend; &pgpkey.blackend; &a.petef; &pgpkey.petef; &a.billf; &pgpkey.billf; &a.gioria; &pgpkey.gioria; &a.mnag; &pgpkey.mnag; &a.jmg; &pgpkey.jmg; &a.dannyboy; &pgpkey.dannyboy; &a.dhartmei; &pgpkey.dhartmei; &a.jhay; &pgpkey.jhay; &a.sheldonh; &pgpkey.sheldonh; &a.mikeh; &pgpkey.mikeh; &a.mheinen; &pgpkey.mheinen; &a.niels; &pgpkey.niels; &a.ghelmer; &pgpkey.ghelmer; &a.mux; &pgpkey.mux; &a.mich; &pgpkey.mich; &a.foxfair; &pgpkey.foxfair; &a.jkh; &pgpkey.jkh; &a.ahze; &pgpkey.ahze; &a.trevor; &pgpkey.trevor; &a.phk; &pgpkey.phk; &a.joe; &pgpkey.joe; &a.vkashyap; &pgpkey.vkashyap; &a.kris; &pgpkey.kris; &a.keramida; &pgpkey.keramida; &a.fjoe; &pgpkey.fjoe; &a.jkim; &pgpkey.jkim; &a.andreas; &pgpkey.andreas; &a.jkois; &pgpkey.jkois; &a.sergei; &pgpkey.sergei; &a.maxim; &pgpkey.maxim; &a.jkoshy; &pgpkey.jkoshy; &a.rik; &pgpkey.rik; &a.rushani; &pgpkey.rushani; &a.clement; &pgpkey.clement; &a.mlaier; &pgpkey.mlaier; &a.erwin; &pgpkey.erwin; &a.lawrance; &pgpkey.lawrance; &a.leeym; &pgpkey.leeym; &a.sam; &pgpkey.sam; &a.jylefort; &pgpkey.jylefort; &a.netchild; &pgpkey.netchild; &a.lesi; &pgpkey.lesi; &a.glewis; &pgpkey.glewis; &a.delphij; &pgpkey.delphij; &a.avatar; &pgpkey.avatar; &a.ijliao; &pgpkey.ijliao; &a.clive; &pgpkey.clive; &a.clsung; &pgpkey.clsung; &a.arved; &pgpkey.arved; &a.remko; &pgpkey.remko; &a.scottl; &pgpkey.scottl; &a.pav; &pgpkey.pav; &a.bmah; &pgpkey.bmah; &a.mtm; &pgpkey.mtm; &a.dwmalone; &pgpkey.dwmalone; &a.sem; &pgpkey.sem; &a.ehaupt; &pgpkey.ehaupt; &a.kwm; &pgpkey.kwm; &a.matusita; &pgpkey.matusita; &a.tmclaugh; &pgpkey.tmclaugh; &a.ken; &pgpkey.ken; &a.dinoex; &pgpkey.dinoex; &a.sanpei; &pgpkey.sanpei; &a.marcel; &pgpkey.marcel; &a.marck; &pgpkey.marck; &a.tmm; &pgpkey.tmm; &a.rich; &pgpkey.rich; &a.knu; &pgpkey.knu; &a.max; &pgpkey.max; &a.yoichi; &pgpkey.yoichi; &a.bland; &pgpkey.bland; &a.simon; &pgpkey.simon; &a.anders; &pgpkey.anders; &a.obrien; &pgpkey.obrien; &a.philip; &pgpkey.philip; &a.hmp; &pgpkey.hmp; &a.mp; &pgpkey.mp; &a.roam; &pgpkey.roam; &a.den; &pgpkey.den; &a.gerald; &pgpkey.gerald; &a.jdp; &pgpkey.jdp; &a.krion; &pgpkey.krion; &a.markp; &pgpkey.markp; &a.thomas; &pgpkey.thomas; &a.hq; &pgpkey.hq; &a.dfr; &pgpkey.dfr; &a.rees; &pgpkey.rees; &a.trhodes; &pgpkey.trhodes; &a.benno; &pgpkey.benno; &a.roberto; &pgpkey.roberto; &a.rodrigc; &pgpkey.rodrigc; &a.guido; &pgpkey.guido; &a.niklas; &pgpkey.niklas; &a.marks; &pgpkey.marks; &a.hrs; &pgpkey.hrs; &a.wosch; &pgpkey.wosch; &a.das; &pgpkey.das; &a.schweikh; &pgpkey.schweikh; &a.gshapiro; &pgpkey.gshapiro; &a.arun; &pgpkey.arun; &a.nork; &pgpkey.nork; &a.vanilla; &pgpkey.vanilla; &a.demon; &pgpkey.demon; &a.jesper; &pgpkey.jesper; &a.scop; &pgpkey.scop; &a.anray; &pgpkey.anray; &a.glebius; &pgpkey.glebius; &a.kensmith; &pgpkey.kensmith; &a.ben; &pgpkey.ben; &a.des; &pgpkey.des; &a.sobomax; &pgpkey.sobomax; &a.brian; &pgpkey.brian; &a.nsouch; &pgpkey.nsouch; &a.ssouhlal; &pgpkey.ssouhlal; &a.vsevolod; &pgpkey.vsevolod; &a.vs; &pgpkey.vs; &a.gsutter; &pgpkey.gsutter; &a.metal; &pgpkey.metal; &a.garys; &pgpkey.garys; &a.nyan; &pgpkey.nyan; &a.mi; &pgpkey.mi; &a.gordon; &pgpkey.gordon; &a.lth; &pgpkey.lth; &a.thierry; &pgpkey.thierry; &a.thompsa; &pgpkey.thompsa; &a.flz; &pgpkey.flz; &a.ume; &pgpkey.ume; &a.ups; &pgpkey.ups; &a.nectar; &pgpkey.nectar; &a.adamw; &pgpkey.adamw; &a.nate; &pgpkey.nate; &a.wollman; &pgpkey.wollman; &a.joerg; &pgpkey.joerg; &a.emax; &pgpkey.emax; &a.bz; &pgpkey.bz; &a.phantom; &pgpkey.phantom; - - - - - diff --git a/share/pgpkeys/pgpkeys-officers.sgml b/share/pgpkeys/pgpkeys-officers.sgml new file mode 100644 index 0000000000..950945d725 --- /dev/null +++ b/share/pgpkeys/pgpkeys-officers.sgml @@ -0,0 +1,20 @@ + + + + &a.security-officer; + &pgpkey.security-officer; + + + + &a.core-secretary; + &pgpkey.core-secretary; + + + + &a.portmgr-secretary; + &pgpkey.portmgr-secretary; + diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index 9d6ae616a4..952f79bdbb 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -1,213 +1,218 @@ + + + + +