diff -Nru debian-keyring-2018.07.24/cheatsheets/infrastructure/adding-new-member.txt debian-keyring-2018.09.30/cheatsheets/infrastructure/adding-new-member.txt --- debian-keyring-2018.07.24/cheatsheets/infrastructure/adding-new-member.txt 1970-01-01 00:00:00.000000000 +0000 +++ debian-keyring-2018.09.30/cheatsheets/infrastructure/adding-new-member.txt 2018-09-30 13:39:50.000000000 +0000 @@ -0,0 +1,23 @@ +When adding a new member to the keyring-maint team there are various +steps which need to be performed. + + * Signed email to DSA (admin@rt.debian.org, remember to add Debian RT + in the subject). This should include the name + Debian username of + the new team member and ask for the following: + + * User addition to keyring group (which will allow access to + kaufmann) + * Addition to "Keyring Maintainers" LDAP object to enable editing of + fingerprint objects + * User account on rt.debian.org with access to the 2 keyring queues + * Addition to keyring-maint@debian.org email alias + * Import new member's Debian key into debian-trustedkeys.gpg + * Potential modification of dsa-misc/scripts/sync-keyring to include + new member's fingerprint + + * Inform the NM Front Desk team with username, email address + + fingerprint details so keyring/git_ops.py and keyring/housekeeping.py + can be updated with the additional details + + * Inform FTP master of the new member + fingerprint so they can be + added to DM-Admin / AdminFingerprints in dak.conf diff -Nru debian-keyring-2018.07.24/cheatsheets/infrastructure/kaufmann.txt debian-keyring-2018.09.30/cheatsheets/infrastructure/kaufmann.txt --- debian-keyring-2018.07.24/cheatsheets/infrastructure/kaufmann.txt 2018-06-04 15:06:55.000000000 +0000 +++ debian-keyring-2018.09.30/cheatsheets/infrastructure/kaufmann.txt 2018-09-30 13:39:50.000000000 +0000 @@ -1,48 +1,23 @@ -kaufmann.debian.org layout -========================== +Pushing the changes to kaufmann.debian.org +========================================== + +'mosca$' means the commands should be run on your own computer (it's +gwolf's desktop name); of course, 'kaufmann$' means said steps are to +be run from kaufmann. mosca$ make +mosca$ make test + +This will complain about expired keys and other common +mistakes. Double check its output - Sometimes weak subkeys are added, +they will be reported here! + mosca$ gpg --clearsign output/sha512sums.txt mosca$ mv output/sha512sums.txt.asc output/sha512sums.txt -mosca$ scp output/sha512sums.txt kaufmann.debian.org:/srv/keyring.debian.org/pub -mosca$ scp output/keyrings/* kaufmann.debian.org:/srv/keyring.debian.org/pub/keyrings +mosca$ scp scripts/update-keyrings kaufmann.debian.org: +mosca$ scp -r output/ kaufmann.debian.org: mosca$ git push git@salsa.debian.org:debian-keyring/keyring.git master - -kaufmann$ cat /home/noodles/update-keyrings -#!/bin/bash - -SRCKEYRINGDIR=/srv/keyring.debian.org/master-keyring/output -OUTPUTDIR=/srv/keyring.debian.org/pub -HKPDIR=/srv/keyring.debian.org/keyrings-new -PENDINGDIR=/srv/keyring.debian.org/pending-updates - -if ! gpg --batch --quiet --verify ${SRCKEYRINGDIR}/sha512sums.txt 2> /dev/null; \ - then - echo sha512sums for update is not signed. - exit 1 -fi - -cd ${SRCKEYRINGDIR} -if ! sha512sum -c sha512sums.txt; then - echo sha512sums for update does not match files. - exit 1 -fi - -if [ -e ${PENDINGDIR}/debian-keyring.gpg -o \ - -e ${PENDINGDIR}/debian-maintainers.gpg -o \ - -e ${PENDINGDIR}/debian-nonupload.gpg ]; then - echo Unhandled pending updates. - exit 1 -fi - -cp ${HKPDIR}/debian-keyring.gpg ${PENDINGDIR} -cp ${HKPDIR}/debian-maintainers.gpg ${PENDINGDIR} -cp ${HKPDIR}/debian-nonupload.gpg ${PENDINGDIR} - -echo Updating active keyrings. -cp -r ${SRCKEYRINGDIR}/* ${OUTPUTDIR}/ -echo Updating HKP keyrings. -cp -r ${SRCKEYRINGDIR}/keyrings/debian-keyring.gpg \ - ${SRCKEYRINGDIR}/keyrings/debian-maintainers.gpg \ - ${SRCKEYRINGDIR}/keyrings/debian-nonupload.gpg \ - ${HKPDIR}/ +mosca$ ssh kaufmann +kaufmann$ cp output/sha512sums.txt /srv/keyring.debian.org/pub +kaufmann$ cp output/keyrings/* /srv/keyring.debian.org/pub/keyrings +kaufmann$ ./update-keyrings ./output/keyrings diff -Nru debian-keyring-2018.07.24/debian/changelog debian-keyring-2018.09.30/debian/changelog --- debian-keyring-2018.07.24/debian/changelog 2018-07-24 10:24:18.000000000 +0000 +++ debian-keyring-2018.09.30/debian/changelog 2018-09-30 13:39:50.000000000 +0000 @@ -1,3 +1,179 @@ +debian-keyring (2018.09.30) unstable; urgency=medium + + [ Jonathan McDowell ] + * Add new DM key 0x2948210746DF73C0 (Kurt Kremitzki) (RT #7449) + * Add new DM key 0xFD49D0BC6FEAECDA (Sagar Ippalpalli) (RT #7450) + * Add new DM key 0x4A0CF639427884E3 (Michal Arbet) (RT #7463) + * Add new DM key 0x6C6580E77BD756C4 (Daniel Pocock) (RT #7485) + * Import changes sent to keyring.debian.org HKP interface: + * 0x054BBB9F7D806442 Niels Thykier sig:1 + * 0x06EAA066E397832F Luca Capello sig:24 + * 0x07FC4891042BA65A Thomas Koch sig:2 + * 0x0C48EA2A7A8FFD7B Peter Michael Green sig:9 + * 0x0CB18E521B24F3FF Ralf Jung [DM] sig:2 + * 0x0F56D0553B6D411B Sean Whitton sig:7 + * 0x11362600A747ECD9 Christos Trochalakis sig:4 + * 0x17B1CA7D64089528 Chris Boyle sig:5 + * 0x2064C53641C25E5D Kurt Roeckx sig:1 + * 0x30550F7871EF0BA8 Yves-Alexis Perez sub:1 sig:5 + * 0x3116BA5E9FFA69A3 Paul Wise sig:7 + * 0x348A778D6885EF8F Jose M Calhariz sig:5 + * 0x357312559D1E064B Ondřej Nový sig:3 + * 0x3631D4FB7FF2B8B8 Christopher Stuart Hoskin uid:1 sub:3 sig:12 + * 0x36C361440C9BC971 Sunil Mohan Adapa [DM] uid:1 sig:6 + * 0x3C4107E6826C40E4 Valentin Vidic uid:1 sig:5 + * 0x427E381D05190E55 Kyle John Robbertze uid:1 sig:3 + * 0x4664E07DBDA485C5 Benjamin Barenblat sig:6 + * 0x479EC24F95C71D61 Brett Parker [DM] sub:1 sig:3 + * 0x4DE8FF2A63C7CC90 Simon McVittie sig:23 + * 0x5394479DD3524C51 Jonathan Wiltshire sub:1 sig:1 + * 0x5759F35001AA4A64 Steve Langasek sig:5 + * 0x587979573442684E Steve McIntyre <93sam> sig:6 + * 0x5ACE8D6E0C14A470 Luke Faraone sig:3 + * 0x5AD75B414EA41667 Georg Faerber sig:2 + * 0x61F3442674DE6624 Andreas Moog [DM] sig:3 + * 0x664F1238AA8F138A Daniel Lange sig:1 + * 0x673A03E4C1DB921F Gunnar Wolf sig:6 + * 0x6ACEDAAE40DD2B46 Xavier Guimard uid:1 sig:2 + * 0x6C6ACD6417B3ACB1 Roger Shimizu sig:2 + * 0x72CF8E5E25B4C293 Matthias Ulrichs sig:7 + * 0x7CFCD8CD257721E9 Vagrant Cascadian uid:1 sig:5 + * 0x7EAE264181E773D5 Christoph Ulrich Scholler [DM] sig:6 + * 0x7F55BB12A40F862E Neil McGovern sig:1 + * 0x8EFD9702F888B2AE Yanhao Mo sub:1 sig:1 + * 0x9688FFC1C78102DF Allison Randal uid:1 sig:26 + * 0x97BA9CE761A0963B John Sullivan sig:4 + * 0x9D0470BDA6CDC457 Neutron Soutmun sig:5 + * 0x9EC002FE1C9CA517 Michael C. Schultheiss uid:1 sig:1 + * 0x9FB9262724B17D29 Tomasz Buchert sub:1 sig:2 + * 0xA04AB3BADBE263EE Bertrand Marc sig:2 + * 0xA8822153B391646D Eric Heintzmann [DM] sig:4 + * 0xAB98288E36D33D07 Ognyan Kulev sig:5 + * 0xAEED6158020EAFFF James Cowgill sig:3 + * 0xB06662EC9C0C1404 NOKUBI Takatsugu sig:8 + * 0xB5754A69B6BE608C Luca Filipozzi uid:1 sig:41 + * 0xBB41D45770EF06F7 Andy Simpkins sig:17 + * 0xBBF68F03E8F37941 Jan Luebbe sub:1 sig:6 + * 0xBC1256AA6AA6EC5E Stein Magnus Jodal sig:5 + * 0xC3F436CA30F5D8EB Mark Brown sub:1 sig:9 + * 0xCF0E265B7DFBB2F2 Shengjing Zhu sub:1 sig:27 + * 0xD15D313882004173 Russ Allbery sig:7 + * 0xDECF849AA6357FB7 Tobias Frost sub:1 sig:1 + * 0xDF6D76C44D696F6B Sven Bartscher sig:2 + * 0xE352D5C51C5041D4 Iain Lane uid:1 sub:1 sig:2 + * 0xE5AB5F161CDD0D98 Diane Trout sig:8 + * 0xE69822C7E02958CD Ruben Undheim uid:2 sub:2 sig:5 + * 0xF505691E3867FB84 David Rabel sig:5 + * 0xFA0C410738C9D903 Colin Tuckley sig:8 + + [ Gunnar Wolf ] + * Minor documentation updates + * Replace 0x55AD141521E764DF with 0xCD3CEA34F42AA45D (Balint Reczey) + (RT #7464) + * Add new DD key 0xEC9D370872BC7A8C (Nicolas Braud-Santoni) (RT #7484) + * Add new DD key 0x0D442664194974E2 (Pierre-Elliott Bécue) (RT #7483) + * Add new DD key 0x7541CFAAFC35EACF (Stephen Gelman) (RT #7482) + * Add new DD key 0x52FC8E7BEDB7FCA2 (Kunal Mehta) (RT #7481) + * Add new DD key 0x71A7E533F291A324 (Aurélien COUDERC) (RT #7480) + * Add new DD key 0x63F7800A23D7B252 (Joseph Herlant) (RT #7479) + * Add new DD key 0x612EF1613E050F54 (Dylan Aïssi) (RT #7478) + * Add new DN key 0xCFBBFCE0B74F1B14 (Ming-ting Yao Wei) (RT #7477) + + -- Jonathan McDowell Sun, 30 Sep 2018 14:39:50 +0100 + +debian-keyring (2018.08.25) unstable; urgency=medium + + [ Gunnar Wolf ] + * Add new DM key 0xB3C2C7B73BA3CD7F (Brian T. Smith) (RT #7367) + + [ Jonathan McDowell ] + * Fix process-rt to only require a single signature for DM keys + * Updated process-rt to deal with nm.debian.org request breakage + + [ John Sullivan ] + * Remove 0xC39E74E049E3ACD3 (Chris Butler) (RT #7384) + * Add new DD key 0x55CF1BF986ABB9C7 (Daniel Baumann) (RT #7380) + * Remove 0xDFF738C2D16CFBA2 (Simon Paillard) (RT #7385) + * Add new DD key 0xE69822C7E02958CD (Ruben Undheim) (RT #7388) + * Add new DD key 0x62645EB35F686A8A (Mo Zhou) (RT #7392) + * Add new DD key 0x3C4107E6826C40E4 (Valentin Vidic) (RT #7393) + * Add new DD key 0x6ACEDAAE40DD2B46 (Xavier Guimard) (RT #7394) + * Add new DD key 0x07FC4891042BA65A (Thomas Koch) (RT #7395) + * Add new DD key 0xC293E7B461825ACE (Boyuan Yang) (RT #7370) + * Add new DM key 0xE7BC91544F3A531B (Iñaki Martin Malerba) (RT #7403) + * Add new DD key 0xCF0E265B7DFBB2F2 (Shengjing Zhu) (RT #7434) + * Add new DM key 0xC0831D1F15E0DA64 (Arnaud Rebillout) (RT #7435) + * Add new DM key 0xD22C1A883455D448 (HAYASHI Kentaro) (RT #7437) + * Move 0x7F36CF55AA87AA77 (Soeren Sonnenburg) to emeritus (RT #7438) + * Import changes sent to keyring.debian.org HKP interface: + * 0x054BBB9F7D806442 Niels Thykier sub:3 sig:5 + * 0x0664A76954265E8C Simon Josefsson sig:5 + * 0x0F56D0553B6D411B Sean Whitton sub:1 sig:15 + * 0x1762E0227034CF84 William Blough uid:1 sig:1 + * 0x2064C53641C25E5D Kurt Roeckx sig:6 + * 0x283681BA6FE7F41D Sam Hartman sub:1 sig:4 + * 0x28FA801A43BDD637 Mike Miller sig:7 + * 0x2930100100003344 Gergely Riskó sub:1 sig:3 + * 0x2C7C3146C1A00121 Jonas Smedegaard sig:12 + * 0x3116BA5E9FFA69A3 Paul Wise sig:2 + * 0x348A778D6885EF8F Jose M Calhariz uid:1 sig:20 + * 0x4B043FCDB9444540 Mattia Rizzolo sig:15 + * 0x5299B4990437AC41 Jan Niehusmann sig:2 + * 0x56034877E1F87C35 Ximin Luo sub:1 sig:19 + * 0x587979573442684E Steve McIntyre <93sam> sig:14 + * 0x5ACE8D6E0C14A470 Luke Faraone sig:10 + * 0x5C13D6DB93052E03 Christian Hofstaedtler sig:5 + * 0x5D328D082AAAB140 Hideki Yamane sub:2 sig:11 + * 0x664F1238AA8F138A Daniel Lange sig:6 + * 0x673A03E4C1DB921F Gunnar Wolf sub:3 sig:33 + * 0x6C6ACD6417B3ACB1 Roger Shimizu sig:28 + * 0x6CACA448860CDC13 Norbert Preining sig:32 + * 0x7127E5ABEEF946C8 Mirco Bauer sub:3 sig:3 + * 0x762B57BB784206AD David Bremner sig:5 + * 0x76D58093F540ABCD Iain R. Learmonth sig:9 + * 0x7CFCD8CD257721E9 Vagrant Cascadian sub:2 sig:13 + * 0x83016014251D1DB0 Carsten Schoenert sig:8 + * 0x8C82169D8ECECD2A Tobias Hansen sig:4 + * 0x97BA9CE761A0963B John Sullivan sig:12 + * 0x9AFB7B8C9A5F5BBC Heiko Stübner sub:1 sig:1 + * 0xAB645F406286A7D0 Lisandro Damián Nicanor Pérez Meyer sig:6 + * 0xAEED6158020EAFFF James Cowgill sig:18 + * 0xB01FEA84617B586D Andreas B. Mundt sig:1 + * 0xB06662EC9C0C1404 NOKUBI Takatsugu sig:16 + * 0xBBC17EBB1396F2F7 Stuart Prescott sig:17 + * 0xC61A64DCF1393998 Pierre Chifflier sig:6 + * 0xCC65B0CDEC275D5B ChangZhuo Chen sig:39 + * 0xCE1F9C674512C22A Praveen Arimbrathodiyil sub:1 sig:3 + * 0xD84747ACE4B6813D Tiago Bortoletto Vaz sub:3 sig:4 + * 0xDF6D76C44D696F6B Sven Bartscher sig:3 + * 0xE352D5C51C5041D4 Iain Lane sig:4 + * 0xE63716F4E069949E Karl Ramm sig:2 + * 0xECB73E37E887AA8C Tomasz Rybak sig:4 + * 0xF5C83C05D9CEEEEE Chris Boot sig:3 + * 0xF6D3495BB0AE9A02 Clint Adams sig:9 + * 0x5AD75B414EA41667 Georg Faerber sig:2 + * 0xC617869F1478504E Keng-Yu Lin [DM] sig:5 + * 0xC89D5712DF945F6F Philippe Thierry (philou) [DM] sig:4 + * 0xE27F2CF8458C2FA4 Simon Quigley [DM] sig:4 + * 0x0F56D0553B6D411B Sean Whitton sig:6 + * 0x2064C53641C25E5D Kurt Roeckx sig:1 + * 0x283681BA6FE7F41D Sam Hartman sub:1 sig:1 + * 0x2930100100003344 Gergely Riskó sub:2 sig:2 + * 0x2C7C3146C1A00121 Jonas Smedegaard sub:1 sig:4 + * 0x283681BA6FE7F41D Sam Hartman sub:1 sig:1 + * 0x2930100100003344 Gergely Riskó sub:2 sig:2 + * 0x2C7C3146C1A00121 Jonas Smedegaard sub:1 sig:1 + * 0x5299B4990437AC41 Jan Niehusmann sub:1 sig:1 + * 0x56034877E1F87C35 Ximin Luo sub:6 sig:6 + * 0x664F1238AA8F138A Daniel Lange sig:2 + * 0x673A03E4C1DB921F Gunnar Wolf sub:1 sig:4 + * 0x762B57BB784206AD David Bremner sub:1 sig:1 + * 0x7CFCD8CD257721E9 Vagrant Cascadian sig:3 + * 0xCC65B0CDEC275D5B ChangZhuo Chen sig:6 + * 0xF6D3495BB0AE9A02 Clint Adams sig:18 + + -- John Sullivan Sun, 25 Aug 2018 01:44:00 -0400 + debian-keyring (2018.07.24) unstable; urgency=medium [ Jonathan McDowell ] Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x054BBB9F7D806442 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x054BBB9F7D806442 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x0664A76954265E8C and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x0664A76954265E8C differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x06EAA066E397832F and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x06EAA066E397832F differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x07FC4891042BA65A and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x07FC4891042BA65A differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x0C48EA2A7A8FFD7B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x0C48EA2A7A8FFD7B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x0D442664194974E2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x0D442664194974E2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x0F56D0553B6D411B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x0F56D0553B6D411B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x11362600A747ECD9 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x11362600A747ECD9 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x1762E0227034CF84 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x1762E0227034CF84 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x17B1CA7D64089528 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x17B1CA7D64089528 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x2064C53641C25E5D and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x2064C53641C25E5D differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x283681BA6FE7F41D and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x283681BA6FE7F41D differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x28FA801A43BDD637 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x28FA801A43BDD637 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x2930100100003344 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x2930100100003344 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x2C7C3146C1A00121 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x2C7C3146C1A00121 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x30550F7871EF0BA8 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x30550F7871EF0BA8 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x3116BA5E9FFA69A3 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x3116BA5E9FFA69A3 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x348A778D6885EF8F and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x348A778D6885EF8F differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x357312559D1E064B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x357312559D1E064B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x3631D4FB7FF2B8B8 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x3631D4FB7FF2B8B8 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x3C4107E6826C40E4 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x3C4107E6826C40E4 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x4664E07DBDA485C5 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x4664E07DBDA485C5 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x4B043FCDB9444540 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x4B043FCDB9444540 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x4DE8FF2A63C7CC90 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x4DE8FF2A63C7CC90 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x5299B4990437AC41 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x5299B4990437AC41 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x52FC8E7BEDB7FCA2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x52FC8E7BEDB7FCA2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x5394479DD3524C51 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x5394479DD3524C51 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x55AD141521E764DF and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x55AD141521E764DF differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x55CF1BF986ABB9C7 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x55CF1BF986ABB9C7 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x56034877E1F87C35 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x56034877E1F87C35 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x5759F35001AA4A64 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x5759F35001AA4A64 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x587979573442684E and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x587979573442684E differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x5ACE8D6E0C14A470 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x5ACE8D6E0C14A470 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x5C13D6DB93052E03 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x5C13D6DB93052E03 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x5D328D082AAAB140 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x5D328D082AAAB140 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x612EF1613E050F54 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x612EF1613E050F54 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x62645EB35F686A8A and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x62645EB35F686A8A differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x63F7800A23D7B252 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x63F7800A23D7B252 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x664F1238AA8F138A and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x664F1238AA8F138A differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x673A03E4C1DB921F and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x673A03E4C1DB921F differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x6ACEDAAE40DD2B46 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x6ACEDAAE40DD2B46 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x6C6580E77BD756C4 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x6C6580E77BD756C4 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x6C6ACD6417B3ACB1 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x6C6ACD6417B3ACB1 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x6CACA448860CDC13 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x6CACA448860CDC13 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x7127E5ABEEF946C8 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x7127E5ABEEF946C8 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x71A7E533F291A324 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x71A7E533F291A324 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x72CF8E5E25B4C293 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x72CF8E5E25B4C293 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x7541CFAAFC35EACF and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x7541CFAAFC35EACF differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x762B57BB784206AD and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x762B57BB784206AD differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x76D58093F540ABCD and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x76D58093F540ABCD differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x7CFCD8CD257721E9 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x7CFCD8CD257721E9 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x7F36CF55AA87AA77 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x7F36CF55AA87AA77 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x83016014251D1DB0 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x83016014251D1DB0 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x8C82169D8ECECD2A and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x8C82169D8ECECD2A differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x9688FFC1C78102DF and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x9688FFC1C78102DF differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x97BA9CE761A0963B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x97BA9CE761A0963B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x9D0470BDA6CDC457 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x9D0470BDA6CDC457 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x9EC002FE1C9CA517 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x9EC002FE1C9CA517 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0x9FB9262724B17D29 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0x9FB9262724B17D29 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xA04AB3BADBE263EE and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xA04AB3BADBE263EE differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xAB645F406286A7D0 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xAB645F406286A7D0 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xAB98288E36D33D07 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xAB98288E36D33D07 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xAEED6158020EAFFF and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xAEED6158020EAFFF differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xB01FEA84617B586D and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xB01FEA84617B586D differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xB06662EC9C0C1404 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xB06662EC9C0C1404 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xB5754A69B6BE608C and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xB5754A69B6BE608C differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xBBC17EBB1396F2F7 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xBBC17EBB1396F2F7 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xBBF68F03E8F37941 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xBBF68F03E8F37941 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xBC1256AA6AA6EC5E and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xBC1256AA6AA6EC5E differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xC293E7B461825ACE and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xC293E7B461825ACE differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xC39E74E049E3ACD3 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xC39E74E049E3ACD3 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xC3F436CA30F5D8EB and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xC3F436CA30F5D8EB differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xC61A64DCF1393998 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xC61A64DCF1393998 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xCC65B0CDEC275D5B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xCC65B0CDEC275D5B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xCD3CEA34F42AA45D and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xCD3CEA34F42AA45D differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xCE1F9C674512C22A and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xCE1F9C674512C22A differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xCF0E265B7DFBB2F2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xCF0E265B7DFBB2F2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xD15D313882004173 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xD15D313882004173 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xD84747ACE4B6813D and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xD84747ACE4B6813D differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xDECF849AA6357FB7 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xDECF849AA6357FB7 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xDF6D76C44D696F6B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xDF6D76C44D696F6B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xDFF738C2D16CFBA2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xDFF738C2D16CFBA2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xE352D5C51C5041D4 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xE352D5C51C5041D4 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xE5AB5F161CDD0D98 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xE5AB5F161CDD0D98 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xE63716F4E069949E and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xE63716F4E069949E differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xE69822C7E02958CD and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xE69822C7E02958CD differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xEC9D370872BC7A8C and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xEC9D370872BC7A8C differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xECB73E37E887AA8C and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xECB73E37E887AA8C differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xF5C83C05D9CEEEEE and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xF5C83C05D9CEEEEE differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xF6D3495BB0AE9A02 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xF6D3495BB0AE9A02 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-keyring-gpg/0xFA0C410738C9D903 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-keyring-gpg/0xFA0C410738C9D903 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x0CB18E521B24F3FF and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x0CB18E521B24F3FF differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x0D442664194974E2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x0D442664194974E2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x2948210746DF73C0 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x2948210746DF73C0 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x36C361440C9BC971 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x36C361440C9BC971 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x3C4107E6826C40E4 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x3C4107E6826C40E4 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x427E381D05190E55 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x427E381D05190E55 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x479EC24F95C71D61 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x479EC24F95C71D61 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x4A0CF639427884E3 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x4A0CF639427884E3 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x52FC8E7BEDB7FCA2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x52FC8E7BEDB7FCA2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x55CF1BF986ABB9C7 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x55CF1BF986ABB9C7 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x5AD75B414EA41667 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x5AD75B414EA41667 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x612EF1613E050F54 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x612EF1613E050F54 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x61F3442674DE6624 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x61F3442674DE6624 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x62645EB35F686A8A and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x62645EB35F686A8A differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x6ACEDAAE40DD2B46 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x6ACEDAAE40DD2B46 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x6C6580E77BD756C4 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x6C6580E77BD756C4 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x71A7E533F291A324 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x71A7E533F291A324 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x7541CFAAFC35EACF and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x7541CFAAFC35EACF differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x7EAE264181E773D5 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x7EAE264181E773D5 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0x8EFD9702F888B2AE and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0x8EFD9702F888B2AE differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xA8822153B391646D and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xA8822153B391646D differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xB3C2C7B73BA3CD7F and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xB3C2C7B73BA3CD7F differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xC0831D1F15E0DA64 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xC0831D1F15E0DA64 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xC293E7B461825ACE and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xC293E7B461825ACE differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xC617869F1478504E and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xC617869F1478504E differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xC89D5712DF945F6F and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xC89D5712DF945F6F differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xCF0E265B7DFBB2F2 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xCF0E265B7DFBB2F2 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xCFBBFCE0B74F1B14 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xCFBBFCE0B74F1B14 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xD22C1A883455D448 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xD22C1A883455D448 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xE27F2CF8458C2FA4 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xE27F2CF8458C2FA4 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xE69822C7E02958CD and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xE69822C7E02958CD differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xE7BC91544F3A531B and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xE7BC91544F3A531B differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xF505691E3867FB84 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xF505691E3867FB84 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-maintainers-gpg/0xFD49D0BC6FEAECDA and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-maintainers-gpg/0xFD49D0BC6FEAECDA differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-nonupload-gpg/0x7F55BB12A40F862E and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-nonupload-gpg/0x7F55BB12A40F862E differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-nonupload-gpg/0xBB41D45770EF06F7 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-nonupload-gpg/0xBB41D45770EF06F7 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/debian-nonupload-gpg/0xCFBBFCE0B74F1B14 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/debian-nonupload-gpg/0xCFBBFCE0B74F1B14 differ Binary files /tmp/tmpnDTHkA/JmHOPPskH7/debian-keyring-2018.07.24/emeritus-keyring-gpg/0x7F36CF55AA87AA77 and /tmp/tmpnDTHkA/cmfjFFDGkA/debian-keyring-2018.09.30/emeritus-keyring-gpg/0x7F36CF55AA87AA77 differ diff -Nru debian-keyring-2018.07.24/keyids debian-keyring-2018.09.30/keyids --- debian-keyring-2018.07.24/keyids 2018-07-24 10:24:18.000000000 +0000 +++ debian-keyring-2018.09.30/keyids 2018-09-30 13:39:50.000000000 +0000 @@ -94,6 +94,7 @@ 0x07B3C8BC4083E800 Roger Leigh 0x07B48452768D3824 Javi Merino 0x07DC563D1F41B907 Christian Marillat +0x07FC4891042BA65A Thomas Koch 0x081419C30B437A89 Fabio M. Di Nitto 0x083781A2D2ACE48B Adriano Rafael Gomes 0x085D4F8691CA52E5 Susan Kleinmann @@ -432,6 +433,7 @@ 0x292003B8AA15EA21 Richard Tibbetts 0x292A35920034C733 Dennis L. Clark 0x2930100100003344 Gergely Riskó +0x2948210746DF73C0 Kurt Kremitzki 0x295CAA946CE5FB54 David Frey 0x296A6F97E15ED335 Fredrik Steen 0x298E9A19AAC0E286 Robert Collins @@ -613,6 +615,7 @@ 0x3BBF839336ECA931 Michael Tautschnig 0x3BBFCF77BD8B050D Roland Rosenfeld 0x3BF609C68BAFCDBD Neal H. Walfield +0x3C4107E6826C40E4 Valentin Vidic 0x3C415250CC453197 Varun Hiremath 0x3C7B87531EB2DE66 Søren Boll Overgaard 0x3C81158E72D2E007 Teófilo Ruiz Suárez @@ -741,6 +744,7 @@ 0x49C5192819D03486 Francois Marier 0x49DDA59BA2EC1A7F Raphael Geissert 0x49DEF96B0B5AB4E7 Kumar Appaiah +0x4A0CF639427884E3 Michal Arbet 0x4A27770E165A9742 Frederico Munoz 0x4A536AE65B74BD29 Tyson Dowd 0x4A55C497F744F705 Toke Høiland-Jørgensen @@ -823,6 +827,7 @@ 0x526F01E8564EE4B6 Adam C. Powell, IV 0x5299B4990437AC41 Jan Niehusmann 0x52B6BBD953968D1B Dmitry Smirnov +0x52FC8E7BEDB7FCA2 Kunal Mehta 0x530CB002D761B16C Albert H. Stone, III 0x534520A787755E5D Ole J. Tetlie 0x536D57489C2001D0 Teemu Hukkanen @@ -985,6 +990,7 @@ 0x60F2D4C6B9841E08 Nathan Sandver 0x60F960A19A540E39 Philipp Matthias Hahn 0x611BA9508B78A5C2 Julien Danjou +0x612EF1613E050F54 Dylan Aïssi 0x613A2251EE445F91 Dale Martin 0x614D4C343E1D0C1C Oliver Elphick 0x6168726DB8D33CF1 Steven Baker @@ -994,6 +1000,7 @@ 0x61E98ECF16D970C6 Eric Dorland 0x62038A4BDD9B9910 Philip Hands 0x623E49E0876B252F Peter van Rossum +0x62645EB35F686A8A Mo Zhou 0x62AF4031C82E0039 Peter Palfrader 0x62B54B8C11404EC3 Noah Meyerhans 0x62EF1CB4D2F9ADD1 Dima Barsky @@ -1008,6 +1015,7 @@ 0x63C511C3D1B5859D Federico Di Gregorio 0x63CE20BAC49C4148 Tim Cutts 0x63D2D5D907F89BB8 Ludovico Gardenghi +0x63F7800A23D7B252 Joseph Herlant 0x640602273516D372 Carlos Laviola 0x640E642E2F2F0CDE Jean-Michel Kelbert 0x6436436109F34024 Danai Sae-Han @@ -1064,6 +1072,7 @@ 0x6A08D37C0B4D63D8 Eloy A. Paris 0x6A49B19728ABDD92 Paul Brossier 0x6AB79ED6C8FDF9C1 Mauro Lizaur +0x6ACEDAAE40DD2B46 Xavier Guimard 0x6AE1DF0D608F22DC Michael Biebl 0x6AEBD35661014F99 Jochen Röhrig 0x6B0E322836129171 Jim Westveer @@ -1116,6 +1125,7 @@ 0x715ED6A07E7B8AC9 Joerg Jaspert 0x7174A18FAAA7A078 Asias He 0x71A1FF601BF8DE0F Roland Stigge +0x71A7E533F291A324 Aurélien COUDERC 0x71A802D0BCD1BC92 Yukiharu YABUKI 0x71A9C91A57159E59 Free Ekanayaka 0x72043670BDE5F1EE Andreas Henriksson @@ -1148,6 +1158,7 @@ 0x751AB5DDA79679CC Jimmy Kaplowitz 0x7537F7664950EAA6 Adam Kessel 0x754191EE8F8135F6 Alexander Sack +0x7541CFAAFC35EACF Stephen Gelman 0x75612741E25A7BC9 Roman Hodek 0x756BEB4B70D8FB2A Josue Abarca 0x75897592BAFEC7F2 Charles Plessy @@ -1929,6 +1940,7 @@ 0xC039F0824441E9FD Ben Darnell 0xC04974CFDF6807BE Simon Kelley 0xC073D2287FFB9E9B Michael Hanke +0xC0831D1F15E0DA64 Arnaud Rebillout 0xC09D3F5D2B302452 Steve Kowalik 0xC09E1D8995930EDE Axel Beckert 0xC09EE9AB965544A9 Peter Teichman @@ -1956,6 +1968,7 @@ 0xC26D30347C714C78 René van Bevern 0xC274DB64C2300F7B Sjoerd Simons 0xC28B28695F24E015 Fredrik Juhlin +0xC293E7B461825ACE Boyuan Yang 0xC2AEDB1447EDD321 Giuseppe Sacco 0xC2B079FCF5C75256 Russell Coker 0xC2BD1D3FD87C6781 Jonathan Walther @@ -2061,6 +2074,7 @@ 0xCCEC38F5A3679C16 Lars Steinke 0xCCF0D5379F223683 Rene Weber 0xCCFBC09569A8D866 Dan Helfman +0xCD3CEA34F42AA45D Balint Reczey 0xCD4B2AF3A0A0AAAA Nico Golde 0xCD58A1B17ED033FA Khalid Aziz 0xCD603B5A2ECF984B Alexei Nikolov @@ -2079,6 +2093,7 @@ 0xCEB14A7A1DDC990D Claire Connelly 0xCEF15C1FF2597E04 Samuele Tonon 0xCEF563662B555AEE Abraham van der Merwe +0xCF0E265B7DFBB2F2 Shengjing Zhu 0xCF153232C24B6010 Matthew Danish 0xCF489438C5779A1C Manoj Srivastava 0xCF62D79438E68E0E Thomas Girard @@ -2087,6 +2102,7 @@ 0xCF7E8E241ADD95A3 Pekka Aleksi Knuutila 0xCF953E76C24B9018 Niv Sardi-Altivanik 0xCF9A6F914193A197 Jacob Appelbaum +0xCFBBFCE0B74F1B14 Ming-ting Yao Wei 0xCFDA9D8206A7376E Patrick Ouellette 0xD0015BD128F39278 Boris Pek 0xD003852FBD52529E Thomas Preud'homme @@ -2112,6 +2128,7 @@ 0xD200EB30A0FB5DA6 Gustavo Noronha 0xD203CCA5FDA6B6A9 Igor Stroh 0xD2277E455D3983A0 Arjan Oosting +0xD22C1A883455D448 HAYASHI Kentaro 0xD22D9B3D21DB31C5 Steven Michael Robbins 0xD24A8237E8074ECF Hugo Espuny 0xD265C08531ED8AEF Rémi Vanicat @@ -2340,6 +2357,7 @@ 0xE66C775AEBFE6C7D Jeremy Bicha 0xE66D2EEBAB963370 Clint Adams 0xE676B867F8D54259 Martin Buck +0xE69822C7E02958CD Ruben Undheim 0xE6AA90171392B174 David Paleino 0xE6DE464B62C345FE Arnd Bergmann 0xE6EF68372CFD1C38 Jamie Wilkinson @@ -2348,6 +2366,7 @@ 0xE76004C5CEF0C94C Christian Kastner 0xE78F751770E81554 Josselin Mouette 0xE7A48877D686C505 Kevin M. Rosenberg +0xE7BC91544F3A531B Iñaki Martin Malerba 0xE7BFC8EC95861109 Ben Hutchings 0xE7CBE152AC17F973 李健秋 Andrew Lee 0xE7D0B098E07586B4 Philip Charles @@ -2407,6 +2426,7 @@ 0xEC792FF25D58893B Matthew Garrett 0xEC79A96131761AFD Joop Stakenborg 0xEC8E0CB00EFAAD81 Guido Witmond +0xEC9D370872BC7A8C Nicolas Braud-Santoni 0xECB73E37E887AA8C Tomasz Rybak 0xECC1D5F5A1FC6CFA Stephen Leake 0xECD401CADFC6E889 Graydon Hoare @@ -2573,6 +2593,7 @@ 0xFCB0BB5C5F1FBF70 Giovanni Mascellani 0xFCD14DDFBC5D2B2D Jonathan K. Rabone 0xFCF6DD4539CCF0C7 Akira TAGOH +0xFD49D0BC6FEAECDA Sagar Ippalpalli 0xFDD2DEACD333CBA1 Jim Meyering 0xFDD63BAF588A553F stevenk 0xFDDAB37AD935CEBA Alexander Kotelnikov diff -Nru debian-keyring-2018.07.24/scripts/process-rt debian-keyring-2018.09.30/scripts/process-rt --- debian-keyring-2018.07.24/scripts/process-rt 2018-03-25 11:46:36.000000000 +0000 +++ debian-keyring-2018.09.30/scripts/process-rt 2018-09-30 13:39:50.000000000 +0000 @@ -22,7 +22,7 @@ debug = False RT_BASE_URL = 'https://rt.debian.org/REST/1.0/' -KEYSERVER = 'the.earth.li:11371' +KEYSERVER = 'pool.sks-keyservers.net:11371' DAM = ['enrico', 'joerg', 'jmw', 'myon'] FD = DAM + ['noodles', 'mattia', 'santiago'] @@ -140,7 +140,7 @@ ctx.op_delete(k, True) -def get_keyinfo(ctx, fpr, checksigs=True): +def get_keyinfo(ctx, fpr, needsigs=2): ctx.set_keylist_mode(gpg.constants.keylist.mode.SIGS) key = ctx.get_key(fpr) for subkey in key.subkeys: @@ -167,7 +167,7 @@ # else: # print("Skipping unknown ID " + sig.keyid) - if checksigs and len(sigs) < 2: + if len(sigs) < needsigs: raise RuntimeError('Insufficent key signatures') certs = None @@ -321,6 +321,8 @@ state['keyid'] = line[20:] elif line.startswith(' Username: '): state['username'] = line[20:] + elif line.startswith(' uid: '): + state['username'] = line[20:] elif line.startswith(' Details: '): state['details'] = line[20:] elif line.startswith(' First name: '): @@ -372,14 +374,19 @@ with get_gpg_ctx() as c: if state['action'] in ('add', 'replace'): state['keydata'] = fetch_key(c, state['keyid']) - keyinfo = get_keyinfo(c, state['keyid']) + # We relax the number of signatures for a DM, otherwise we use + # the default. + if state['role'] == 'DM': + keyinfo = get_keyinfo(c, state['keyid'], 1) + else: + keyinfo = get_keyinfo(c, state['keyid']) state['keytype'] = keyinfo[0] state['certs'] = keyinfo[1] if 'oldkeyid' in state: with get_gpg_ctx() as c: fetch_key(c, state['oldkeyid']) - keyinfo = get_keyinfo(c, state['oldkeyid'], False) + keyinfo = get_keyinfo(c, state['oldkeyid'], 0) state['oldkeytype'] = keyinfo[0] return state diff -Nru debian-keyring-2018.07.24/scripts/update-key debian-keyring-2018.09.30/scripts/update-key --- debian-keyring-2018.07.24/scripts/update-key 2017-12-24 19:22:26.000000000 +0000 +++ debian-keyring-2018.09.30/scripts/update-key 2018-09-30 13:39:50.000000000 +0000 @@ -70,6 +70,11 @@ exit esac +if cmp -s $GNUPGHOME/0x$keyid $keydir/0x$keyid; then + echo "No changes to 0x$keyid" + exit +fi + echo "Running gpg-diff:" ( echo $summary diff -Nru debian-keyring-2018.07.24/scripts/update-keyrings debian-keyring-2018.09.30/scripts/update-keyrings --- debian-keyring-2018.07.24/scripts/update-keyrings 2017-11-24 23:17:07.000000000 +0000 +++ debian-keyring-2018.09.30/scripts/update-keyrings 2018-09-30 13:39:50.000000000 +0000 @@ -1,17 +1,37 @@ #!/bin/bash + SHOULD_RUN_ON=kaufmann.debian.org +OUTPUTDIR=/srv/keyring.debian.org/pub +HKPDIR=/srv/keyring.debian.org/keyrings-new +PENDINGDIR=/srv/keyring.debian.org/pending-updates if [ -z "$RUNANYWAY" -a $(hostname -f) != "$SHOULD_RUN_ON" ] ; then - echo This script is meant to be run in $SHOULD_RUN_ON - echo You can still run it if you are sure by setting - echo \$RUNANYWAY to a nonempty value. - exit 1 + echo This script is meant to be run in $SHOULD_RUN_ON + echo You can still run it if you are sure by setting + echo \$RUNANYWAY to a nonempty value. + exit 1 fi -SRCKEYRINGDIR=/srv/keyring.debian.org/master-keyring/output -OUTPUTDIR=/srv/keyring.debian.org/pub -HKPDIR=/srv/keyring.debian.org/keyrings-new -PENDINGDIR=/srv/keyring.debian.org/pending-updates +if [ $# -ne 1 ]; then + echo "Must provide directory containing new keyrings." + exit 1 +fi + +if [ ! -d $1 ]; then + echo "$1 is not a directory." + exit 1 +fi + +SRCKEYRINGDIR=$1 + +if [ ! -e ${SRCKEYRINGDIR}/sha512sums.txt ]; then + echo "sha512sums.txt not found in ${SRCKEYRINGDIR}" + exit 1 +fi + +if [ -e ${SRCKEYRINGDIR}/keyrings/.placeholder ]; then + rm ${SRCKEYRINGDIR}/keyrings/.placeholder +fi if ! gpg --batch --quiet --verify ${SRCKEYRINGDIR}/sha512sums.txt 2> /dev/null; \ then @@ -25,20 +45,22 @@ exit 1 fi -if [ -e ${PENDINGDIR}/debian-keyring.pgp -o \ - -e ${PENDINGDIR}/debian-keyring.gpg -o \ - -e ${PENDINGDIR}/debian-maintainers.gpg ]; then +if [ -e ${PENDINGDIR}/debian-keyring.gpg -o \ + -e ${PENDINGDIR}/debian-maintainers.gpg -o \ + -e ${PENDINGDIR}/debian-nonupload.gpg ]; then echo Unhandled pending updates. + echo Keyrings in ${PENDINGDIR} should be dealt with and removed. exit 1 fi -cp ${HKPDIR}/debian-keyring.pgp ${PENDINGDIR} -cp ${HKPDIR}/debian-keyring.gpg ${PENDINGDIR} -cp ${HKPDIR}/debian-maintainers.gpg ${PENDINGDIR} +cp -p ${HKPDIR}/debian-keyring.gpg ${PENDINGDIR} +cp -p ${HKPDIR}/debian-maintainers.gpg ${PENDINGDIR} +cp -p ${HKPDIR}/debian-nonupload.gpg ${PENDINGDIR} echo Updating active keyrings. cp -r ${SRCKEYRINGDIR}/* ${OUTPUTDIR}/ echo Updating HKP keyrings. -cp -r ${SRCKEYRINGDIR}/keyrings/debian-keyring.{gpg,pgp} \ +cp -r ${SRCKEYRINGDIR}/keyrings/debian-keyring.gpg \ ${SRCKEYRINGDIR}/keyrings/debian-maintainers.gpg \ + ${SRCKEYRINGDIR}/keyrings/debian-nonupload.gpg \ ${HKPDIR}/