summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-11-25 17:58:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-11-25 17:58:11 +0000
commit526b043b4df8865a330781ccb19f1ba1da9eaae6 (patch)
treeebb29f60799db7ab6438f8245e8b6fc9fb5d8942
parentReleasing progress-linux version 2017.08.28-0+dschinn1. (diff)
downloaddebian-keyring-526b043b4df8865a330781ccb19f1ba1da9eaae6.zip
debian-keyring-526b043b4df8865a330781ccb19f1ba1da9eaae6.tar.xz
Merging upstream version 2017.11.24.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--Makefile1
-rw-r--r--cheatsheets/infrastructure/kaufmann.txt4
-rw-r--r--debian-keyring-gpg/0x00806F2BD729A457bin215344 -> 235790 bytes
-rw-r--r--debian-keyring-gpg/0x009B33756B9AAA55bin39995 -> 40538 bytes
-rw-r--r--debian-keyring-gpg/0x00B45EBD4CA7BABEbin80432 -> 94456 bytes
-rw-r--r--debian-keyring-gpg/0x04EE131AE6D621BEbin44822 -> 48755 bytes
-rw-r--r--debian-keyring-gpg/0x054BBB9F7D806442bin5489 -> 6032 bytes
-rw-r--r--debian-keyring-gpg/0x0664A76954265E8Cbin12031 -> 12652 bytes
-rw-r--r--debian-keyring-gpg/0x06EAA066E397832Fbin363606 -> 364692 bytes
-rw-r--r--debian-keyring-gpg/0x070202585B812EC1bin4959 -> 6709 bytes
-rw-r--r--debian-keyring-gpg/0x07B48452768D3824bin37887 -> 38430 bytes
-rw-r--r--debian-keyring-gpg/0x09DA9408B4E14499bin38233 -> 41560 bytes
-rw-r--r--debian-keyring-gpg/0x0AA04571D03E3E70bin101324 -> 102953 bytes
-rw-r--r--debian-keyring-gpg/0x0B00FB6CEBE2D002bin35894 -> 41065 bytes
-rw-r--r--debian-keyring-gpg/0x0C99B70EF4FCBB07bin73902 -> 52288 bytes
-rw-r--r--debian-keyring-gpg/0x0F56D0553B6D411Bbin62725 -> 71215 bytes
-rw-r--r--debian-keyring-gpg/0x11362600A747ECD9bin5669 -> 8044 bytes
-rw-r--r--debian-keyring-gpg/0x13C0B5667A38B0B0bin60008 -> 62180 bytes
-rw-r--r--debian-keyring-gpg/0x1988BAC881E23B3Cbin0 -> 4284 bytes
-rw-r--r--debian-keyring-gpg/0x1ABFA401CCAA707Abin10503 -> 12329 bytes
-rw-r--r--debian-keyring-gpg/0x1B132E01CEC6AD46bin65197 -> 67912 bytes
-rw-r--r--debian-keyring-gpg/0x1C7C41EDEBDDBB60bin9264 -> 9807 bytes
-rw-r--r--debian-keyring-gpg/0x1CD8D854FE4252C1bin17788 -> 19457 bytes
-rw-r--r--debian-keyring-gpg/0x1E1356881DD8D791bin16161 -> 16727 bytes
-rw-r--r--debian-keyring-gpg/0x1E7091B1F14A64A2bin96151 -> 101012 bytes
-rw-r--r--debian-keyring-gpg/0x1E953E27D4311E58bin31311 -> 38103 bytes
-rw-r--r--debian-keyring-gpg/0x1EFEB1801A49C0D2bin20373 -> 20916 bytes
-rw-r--r--debian-keyring-gpg/0x2064C53641C25E5Dbin67436 -> 69134 bytes
-rw-r--r--debian-keyring-gpg/0x21D20589974B3E96bin30806 -> 31349 bytes
-rw-r--r--debian-keyring-gpg/0x223AE055BD94E154bin218723 -> 219809 bytes
-rw-r--r--debian-keyring-gpg/0x26E3C875A74420EFbin46821 -> 47907 bytes
-rw-r--r--debian-keyring-gpg/0x27438BAA634770E9bin9210 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0x2AE901E5C70218D2bin16934 -> 17477 bytes
-rw-r--r--debian-keyring-gpg/0x2BF8D9FE074BCDE4bin61061 -> 65023 bytes
-rw-r--r--debian-keyring-gpg/0x2C3B436FEAC68101bin23862 -> 27512 bytes
-rw-r--r--debian-keyring-gpg/0x2C7C3146C1A00121bin161360 -> 164178 bytes
-rw-r--r--debian-keyring-gpg/0x2DE1AD437A9DBF6Ebin8316 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0x2DFC519954181296bin36033 -> 51315 bytes
-rw-r--r--debian-keyring-gpg/0x30550F7871EF0BA8bin30949 -> 32096 bytes
-rw-r--r--debian-keyring-gpg/0x310180050905E40Cbin59280 -> 69453 bytes
-rw-r--r--debian-keyring-gpg/0x3116BA5E9FFA69A3bin37843 -> 37811 bytes
-rw-r--r--debian-keyring-gpg/0x32247FBB40AD1FA6bin277073 -> 279245 bytes
-rw-r--r--debian-keyring-gpg/0x34CD816DE6FCD33Ebin18112 -> 19781 bytes
-rw-r--r--debian-keyring-gpg/0x357312559D1E064Bbin55666 -> 62389 bytes
-rw-r--r--debian-keyring-gpg/0x35A3939FFC78776Dbin5066 -> 6764 bytes
-rw-r--r--debian-keyring-gpg/0x3938F96BDF50FEA5bin13364 -> 14993 bytes
-rw-r--r--debian-keyring-gpg/0x3A936196C095D941bin106446 -> 107532 bytes
-rw-r--r--debian-keyring-gpg/0x3AC8F716477EDB23bin37314 -> 37857 bytes
-rw-r--r--debian-keyring-gpg/0x3B56E2BBD53FDCB1bin35371 -> 37000 bytes
-rw-r--r--debian-keyring-gpg/0x3CCEBABE206C3B69bin77042 -> 77585 bytes
-rw-r--r--debian-keyring-gpg/0x3FB9C78A53C854DFbin10189 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0x40D716CFE909CDEEbin76003 -> 78175 bytes
-rw-r--r--debian-keyring-gpg/0x4330169952D556DB (renamed from emeritus-keyring-gpg/0x4330169952D556DB)bin19535 -> 19535 bytes
-rw-r--r--debian-keyring-gpg/0x44BB1BA79F6C6333bin25300 -> 29600 bytes
-rw-r--r--debian-keyring-gpg/0x44E17740B8611E9Cbin30591 -> 39081 bytes
-rw-r--r--debian-keyring-gpg/0x4664E07DBDA485C5bin0 -> 17908 bytes
-rw-r--r--debian-keyring-gpg/0x4B043FCDB9444540bin88674 -> 89305 bytes
-rw-r--r--debian-keyring-gpg/0x4BC80A69432387E8bin0 -> 7988 bytes
-rw-r--r--debian-keyring-gpg/0x4F9F6D550ED6122Abin67970 -> 69056 bytes
-rw-r--r--debian-keyring-gpg/0x5041F1891F44E090bin12207 -> 12750 bytes
-rw-r--r--debian-keyring-gpg/0x50C3634D3A291CF9bin114067 -> 117637 bytes
-rw-r--r--debian-keyring-gpg/0x51106DF5CD92D072bin175617 -> 177246 bytes
-rw-r--r--debian-keyring-gpg/0x51A09B18CF5A5068bin8268 -> 8314 bytes
-rw-r--r--debian-keyring-gpg/0x536D57489C2001D0bin15781 -> 16324 bytes
-rw-r--r--debian-keyring-gpg/0x5394479DD3524C51bin155377 -> 155359 bytes
-rw-r--r--debian-keyring-gpg/0x53FE7BBDA68910FCbin38380 -> 37940 bytes
-rw-r--r--debian-keyring-gpg/0x5556A34E04A3610Bbin81263 -> 94755 bytes
-rw-r--r--debian-keyring-gpg/0x55AD141521E764DFbin40240 -> 54827 bytes
-rw-r--r--debian-keyring-gpg/0x5632906F4696E015bin5560 -> 8320 bytes
-rw-r--r--debian-keyring-gpg/0x573EF1E4BD5A01FAbin5554 -> 7327 bytes
-rw-r--r--debian-keyring-gpg/0x5759F35001AA4A64bin93812 -> 95984 bytes
-rw-r--r--debian-keyring-gpg/0x578A0494D1C646D1bin112083 -> 113712 bytes
-rw-r--r--debian-keyring-gpg/0x57930DAB0B86B067bin486489 -> 489204 bytes
-rw-r--r--debian-keyring-gpg/0x587979573442684Ebin215542 -> 217171 bytes
-rw-r--r--debian-keyring-gpg/0x5A8728BE7BDA8506bin4567 -> 8424 bytes
-rw-r--r--debian-keyring-gpg/0x5ACE8D6E0C14A470bin35766 -> 46977 bytes
-rw-r--r--debian-keyring-gpg/0x5D328D082AAAB140bin130890 -> 144902 bytes
-rw-r--r--debian-keyring-gpg/0x5E62533F19765111bin100987 -> 109224 bytes
-rw-r--r--debian-keyring-gpg/0x5EE76EE20216D2A5bin32014 -> 34186 bytes
-rw-r--r--debian-keyring-gpg/0x634F4BD1E7AD5568bin264492 -> 266664 bytes
-rw-r--r--debian-keyring-gpg/0x64959FE9838DF19Cbin73533 -> 74619 bytes
-rw-r--r--debian-keyring-gpg/0x673A03E4C1DB921Fbin196946 -> 207065 bytes
-rw-r--r--debian-keyring-gpg/0x68E713981D1515F8bin9014 -> 12068 bytes
-rw-r--r--debian-keyring-gpg/0x6B720BE9C5CF6D9Ebin19717 -> 25345 bytes
-rw-r--r--debian-keyring-gpg/0x6B7498FCB9B358AC (renamed from debian-maintainers-gpg/0x6B7498FCB9B358AC)bin4417 -> 4417 bytes
-rw-r--r--debian-keyring-gpg/0x6C6580E77BD756C4bin55738 -> 55720 bytes
-rw-r--r--debian-keyring-gpg/0x6C6ACD6417B3ACB1bin48257 -> 51144 bytes
-rw-r--r--debian-keyring-gpg/0x6EA4D2311A2D268Dbin163679 -> 180430 bytes
-rw-r--r--debian-keyring-gpg/0x7115AFD07710DCF7bin8250 -> 9913 bytes
-rw-r--r--debian-keyring-gpg/0x7403062689664EDEbin8354 -> 12017 bytes
-rw-r--r--debian-keyring-gpg/0x745C4766D4CACDFFbin45862 -> 46405 bytes
-rw-r--r--debian-keyring-gpg/0x751AB5DDA79679CCbin132188 -> 135446 bytes
-rw-r--r--debian-keyring-gpg/0x7731FCCC63E4E277bin67160 -> 65504 bytes
-rw-r--r--debian-keyring-gpg/0x789D6F057FD863FEbin386902 -> 394099 bytes
-rw-r--r--debian-keyring-gpg/0x792152527B75921Ebin23258 -> 38635 bytes
-rw-r--r--debian-keyring-gpg/0x7C56ACFE947897D8bin237419 -> 237962 bytes
-rw-r--r--debian-keyring-gpg/0x7DBA958C1C055538bin9359 -> 9925 bytes
-rw-r--r--debian-keyring-gpg/0x7EA7A51C29C2BDB6bin11573 -> 13304 bytes
-rw-r--r--debian-keyring-gpg/0x7F55BB12A40F862Ebin46593 -> 47679 bytes
-rw-r--r--debian-keyring-gpg/0x80E627A0AB757E23bin6792 -> 11295 bytes
-rw-r--r--debian-keyring-gpg/0x82B5B40868C097BCbin11582 -> 12188 bytes
-rw-r--r--debian-keyring-gpg/0x8382C95C29023DF9bin59045 -> 61352 bytes
-rw-r--r--debian-keyring-gpg/0x83E33BD7D4DD4CA1 (renamed from debian-maintainers-gpg/0x83E33BD7D4DD4CA1)bin12720 -> 16760 bytes
-rw-r--r--debian-keyring-gpg/0x86561F452180FCFE (renamed from debian-maintainers-gpg/0x86561F452180FCFE)bin25917 -> 25917 bytes
-rw-r--r--debian-keyring-gpg/0x872F702C4D6E25A8bin388816 -> 390988 bytes
-rw-r--r--debian-keyring-gpg/0x887B60618B3C16AEbin50140 -> 61612 bytes
-rw-r--r--debian-keyring-gpg/0x8A0A48874687AF4Fbin97146 -> 99976 bytes
-rw-r--r--debian-keyring-gpg/0x8A3171EF366150CEbin15668 -> 17932 bytes
-rw-r--r--debian-keyring-gpg/0x8D83379110000DEBbin6620 -> 7752 bytes
-rw-r--r--debian-keyring-gpg/0x8FF1CB6E8D89059Fbin6708 -> 7274 bytes
-rw-r--r--debian-keyring-gpg/0x94FA372B2DA8B985bin49883 -> 50426 bytes
-rw-r--r--debian-keyring-gpg/0x9688FFC1C78102DFbin62228 -> 64400 bytes
-rw-r--r--debian-keyring-gpg/0x96EDAB9B2E6B7171bin4784 -> 5513 bytes
-rw-r--r--debian-keyring-gpg/0x97BA9CE761A0963Bbin74823 -> 77219 bytes
-rw-r--r--debian-keyring-gpg/0x98CABB3ABD4CA59Ebin43727 -> 45899 bytes
-rw-r--r--debian-keyring-gpg/0x9C27B31342B7511Dbin60952 -> 76242 bytes
-rw-r--r--debian-keyring-gpg/0x9C31503C6D866396bin306028 -> 306571 bytes
-rw-r--r--debian-keyring-gpg/0x9D0B5E5B1EEC8F0Ebin34710 -> 35253 bytes
-rw-r--r--debian-keyring-gpg/0x9EA33414F5852F4Ebin41529 -> 40750 bytes
-rw-r--r--debian-keyring-gpg/0x9EC002FE1C9CA517bin102686 -> 104315 bytes
-rw-r--r--debian-keyring-gpg/0x9EDCC991D9AB457Ebin208832 -> 212199 bytes
-rw-r--r--debian-keyring-gpg/0xA1B986143704397Bbin0 -> 8492 bytes
-rw-r--r--debian-keyring-gpg/0xA2D13001D98C0FBAbin23779 -> 25962 bytes
-rw-r--r--debian-keyring-gpg/0xA3BABAE2408DD6CFbin10559 -> 11197 bytes
-rw-r--r--debian-keyring-gpg/0xA81CEA22BC8C7E2Ebin17056 -> 18769 bytes
-rw-r--r--debian-keyring-gpg/0xA97A7702BAF91EF5bin241868 -> 251334 bytes
-rw-r--r--debian-keyring-gpg/0xAC1E90BAC433F68Fbin26754 -> 25584 bytes
-rw-r--r--debian-keyring-gpg/0xAEED6158020EAFFFbin54776 -> 63337 bytes
-rw-r--r--debian-keyring-gpg/0xAEF6F1A2A7457645bin98835 -> 107875 bytes
-rw-r--r--debian-keyring-gpg/0xB01D1A72AC8DC9A1bin74783 -> 75326 bytes
-rw-r--r--debian-keyring-gpg/0xB01FEA84617B586Dbin77285 -> 78371 bytes
-rw-r--r--debian-keyring-gpg/0xB3118CEF8AEA8FEEbin39171 -> 39714 bytes
-rw-r--r--debian-keyring-gpg/0xB3464F896AA15948bin116242 -> 117328 bytes
-rw-r--r--debian-keyring-gpg/0xB3F25D6B00A80662bin90823 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0xB5754A69B6BE608Cbin202598 -> 205428 bytes
-rw-r--r--debian-keyring-gpg/0xB59EB72202D1BC65bin51185 -> 52814 bytes
-rw-r--r--debian-keyring-gpg/0xB6F6F753E15B47E9bin5001 -> 6087 bytes
-rw-r--r--debian-keyring-gpg/0xB82A217AFDFE09F2bin156121 -> 166964 bytes
-rw-r--r--debian-keyring-gpg/0xB8688CA3D876D5A3bin8280 -> 9366 bytes
-rw-r--r--debian-keyring-gpg/0xB8E5087766475AAFbin169963 -> 170631 bytes
-rw-r--r--debian-keyring-gpg/0xB999CDB58C8DDBD2bin40678 -> 42307 bytes
-rw-r--r--debian-keyring-gpg/0xBA9C78061DDD8C9Bbin90438 -> 92101 bytes
-rw-r--r--debian-keyring-gpg/0xBB3A68018649AA06bin270827 -> 275263 bytes
-rw-r--r--debian-keyring-gpg/0xBC10BD0F7B8BF08Bbin8084 -> 8627 bytes
-rw-r--r--debian-keyring-gpg/0xBC1256AA6AA6EC5Ebin9939 -> 13293 bytes
-rw-r--r--debian-keyring-gpg/0xBC372252CA1CF964bin121316 -> 121298 bytes
-rw-r--r--debian-keyring-gpg/0xC0F039E9ED1B597Abin9244 -> 9787 bytes
-rw-r--r--debian-keyring-gpg/0xC256FBD500221E93bin45406 -> 46492 bytes
-rw-r--r--debian-keyring-gpg/0xC3F436CA30F5D8EBbin33875 -> 35328 bytes
-rw-r--r--debian-keyring-gpg/0xC61A64DCF1393998bin16591 -> 19465 bytes
-rw-r--r--debian-keyring-gpg/0xC6875F3541CEFDE0bin84926 -> 87250 bytes
-rw-r--r--debian-keyring-gpg/0xC6B8598485522E2Dbin55124 -> 56210 bytes
-rw-r--r--debian-keyring-gpg/0xCC65B0CDEC275D5Bbin34380 -> 60644 bytes
-rw-r--r--debian-keyring-gpg/0xCCD2ED94D21739E9bin254870 -> 256499 bytes
-rw-r--r--debian-keyring-gpg/0xCEAE6AD3AFE826FBbin9599 -> 23094 bytes
-rw-r--r--debian-keyring-gpg/0xD0178C767D069EE6bin108179 -> 112014 bytes
-rw-r--r--debian-keyring-gpg/0xD15D313882004173bin105218 -> 107709 bytes
-rw-r--r--debian-keyring-gpg/0xD4F219BFEC998489bin89546 -> 91175 bytes
-rw-r--r--debian-keyring-gpg/0xD5FDFC156168BF60bin26471 -> 27014 bytes
-rw-r--r--debian-keyring-gpg/0xD7884C4718E18F44bin48026 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0xD929F2992BEF0A33bin360730 -> 367973 bytes
-rw-r--r--debian-keyring-gpg/0xD9817E8FDF69C32Ebin28670 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0xDA82830E3CCC3A3Abin73064 -> 76460 bytes
-rw-r--r--debian-keyring-gpg/0xDD29F88442839ED3bin16640 -> 17269 bytes
-rw-r--r--debian-keyring-gpg/0xDECA0C9D30ED9FE3bin0 -> 9024 bytes
-rw-r--r--debian-keyring-gpg/0xDECF849AA6357FB7bin80449 -> 91308 bytes
-rw-r--r--debian-keyring-gpg/0xDF6D76C44D696F6Bbin19232 -> 20439 bytes
-rw-r--r--debian-keyring-gpg/0xDFC671EEB333FA25bin13433 -> 13976 bytes
-rw-r--r--debian-keyring-gpg/0xE523F220AC8DFBD0bin28983 -> 31874 bytes
-rw-r--r--debian-keyring-gpg/0xE63716F4E069949Ebin12854 -> 13940 bytes
-rw-r--r--debian-keyring-gpg/0xE6FFF1E38DC968B0bin16523 -> 17655 bytes
-rw-r--r--debian-keyring-gpg/0xEBB31A62C85D8F71bin10891 -> 12554 bytes
-rw-r--r--debian-keyring-gpg/0xEBF67A846AABE354bin38058 -> 39687 bytes
-rw-r--r--debian-keyring-gpg/0xEC63699779074FA8bin64447 -> 65533 bytes
-rw-r--r--debian-keyring-gpg/0xED0DD3368DE40924bin8688 -> 9820 bytes
-rw-r--r--debian-keyring-gpg/0xF1A69BE429C0FFEEbin142772 -> 146030 bytes
-rw-r--r--debian-keyring-gpg/0xF53E93AF3DED42EBbin10063 -> 12893 bytes
-rw-r--r--debian-keyring-gpg/0xF5C83C05D9CEEEEEbin131986 -> 151283 bytes
-rw-r--r--debian-keyring-gpg/0xF6D3495BB0AE9A02bin196840 -> 214216 bytes
-rw-r--r--debian-keyring-gpg/0xF823A2729883C97Cbin42876 -> 45706 bytes
-rw-r--r--debian-keyring-gpg/0xFA643BA61D227AFBbin22186 -> 23318 bytes
-rw-r--r--debian-keyring-gpg/0xFC0DB1BBCD460BDEbin115121 -> 117951 bytes
-rw-r--r--debian-keyring-gpg/0xFFCE1C9A4FADF197bin19614 -> 18412 bytes
-rw-r--r--debian-maintainers-gpg/0x015F4DD4A70FB705bin8832 -> 10255 bytes
-rw-r--r--debian-maintainers-gpg/0x03A1FB7A1904771Bbin2577 -> 2950 bytes
-rw-r--r--debian-maintainers-gpg/0x04C53BD7FE030551bin3332 -> 3898 bytes
-rw-r--r--debian-maintainers-gpg/0x0CB18E521B24F3FFbin4925 -> 6098 bytes
-rw-r--r--debian-maintainers-gpg/0x0D442664194974E2bin0 -> 31778 bytes
-rw-r--r--debian-maintainers-gpg/0x1762E0227034CF84bin24481 -> 27311 bytes
-rw-r--r--debian-maintainers-gpg/0x1C01F443C9C93C5Abin31357 -> 32443 bytes
-rw-r--r--debian-maintainers-gpg/0x1E759A726A9FDD74bin84438 -> 84981 bytes
-rw-r--r--debian-maintainers-gpg/0x1EEF53D38A3A9C67bin7645 -> 10452 bytes
-rw-r--r--debian-maintainers-gpg/0x28D9A6F364EB7512bin4821 -> 4844 bytes
-rw-r--r--debian-maintainers-gpg/0x3798AF15A1565658bin23785 -> 26557 bytes
-rw-r--r--debian-maintainers-gpg/0x40BFEE868B055D9Abin49754 -> 50296 bytes
-rw-r--r--debian-maintainers-gpg/0x48D19F46BC99C9B7bin0 -> 25428 bytes
-rw-r--r--debian-maintainers-gpg/0x500398DF5AB387D3bin4554 -> 7491 bytes
-rw-r--r--debian-maintainers-gpg/0x554297EDF9CCA585bin39064 -> 39607 bytes
-rw-r--r--debian-maintainers-gpg/0x5A8830475F7D1061bin12631 -> 14872 bytes
-rw-r--r--debian-maintainers-gpg/0x5B019455E2B84FA5bin2756 -> 5233 bytes
-rw-r--r--debian-maintainers-gpg/0x5C5245265C413520bin10993 -> 12091 bytes
-rw-r--r--debian-maintainers-gpg/0x612EF1613E050F54bin5103 -> 6235 bytes
-rw-r--r--debian-maintainers-gpg/0x689A04020D7EA9A1bin0 -> 38223 bytes
-rw-r--r--debian-maintainers-gpg/0x7541CFAAFC35EACFbin0 -> 4951 bytes
-rw-r--r--debian-maintainers-gpg/0x77C0C75E7B650808bin7760 -> 29796 bytes
-rw-r--r--debian-maintainers-gpg/0x79C43E620B039B35bin56715 -> 107429 bytes
-rw-r--r--debian-maintainers-gpg/0x8B3D867C823E7A61bin23164 -> 25867 bytes
-rw-r--r--debian-maintainers-gpg/0x8F32B4422F52107Fbin12946 -> 13489 bytes
-rw-r--r--debian-maintainers-gpg/0x94842BC86E511C31bin10311 -> 11463 bytes
-rw-r--r--debian-maintainers-gpg/0x9866E4A9EC1663E5bin4485 -> 5709 bytes
-rw-r--r--debian-maintainers-gpg/0x9B2E6B82752DB03Bbin8351 -> 11123 bytes
-rw-r--r--debian-maintainers-gpg/0xAEC2DF8E23BE7E38bin0 -> 14619 bytes
-rw-r--r--debian-maintainers-gpg/0xB195E1C4779BA9B2bin0 -> 5085 bytes
-rw-r--r--debian-maintainers-gpg/0xC6079EAD0F1F7C52bin2286 -> 2601 bytes
-rw-r--r--debian-maintainers-gpg/0xC654FB332AD59860bin53391 -> 57215 bytes
-rw-r--r--debian-maintainers-gpg/0xC89D5712DF945F6Fbin0 -> 5663 bytes
-rw-r--r--debian-maintainers-gpg/0xC9B0AC74C72B5836bin8878 -> 7767 bytes
-rw-r--r--debian-maintainers-gpg/0xCA8D40019EBD4E93bin0 -> 4045 bytes
-rw-r--r--debian-maintainers-gpg/0xCF0E265B7DFBB2F2bin6180 -> 7878 bytes
-rw-r--r--debian-maintainers-gpg/0xD25D611C8E192076bin4536 -> 5546 bytes
-rw-r--r--debian-maintainers-gpg/0xED34CEABE27BAABCbin55476 -> 57630 bytes
-rw-r--r--debian-maintainers-gpg/0xF095F7BB018FE2B3bin3876 -> 6120 bytes
-rw-r--r--debian-nonupload-gpg/0x7A749064D38F11A3bin52998 -> 28347 bytes
-rw-r--r--debian-nonupload-gpg/0x7FD9FCCB000BEEEE (renamed from debian-keyring-gpg/0x7FD9FCCB000BEEEE)bin15953 -> 15953 bytes
-rw-r--r--debian-nonupload-gpg/0xDB686C92D9D59F61bin67678 -> 68764 bytes
-rw-r--r--debian-nonupload-gpg/0xE5EC4AC9BD627B05bin10519 -> 12251 bytes
-rw-r--r--debian-nonupload-gpg/0xF22674467E4AF4A3bin24941 -> 24941 bytes
-rw-r--r--emeritus-keyring-gpg/0x12D34B8B656AE027 (renamed from debian-keyring-gpg/0x12D34B8B656AE027)bin7712 -> 7712 bytes
-rw-r--r--emeritus-keyring-gpg/0x1885AD387D42F16E (renamed from debian-keyring-gpg/0x1885AD387D42F16E)bin3989 -> 3989 bytes
-rw-r--r--emeritus-keyring-gpg/0x296A6F97E15ED335 (renamed from debian-keyring-gpg/0x296A6F97E15ED335)bin7301 -> 7301 bytes
-rw-r--r--emeritus-keyring-gpg/0x72AF46E6E541A5A2 (renamed from debian-keyring-gpg/0x72AF46E6E541A5A2)bin18274 -> 18274 bytes
-rw-r--r--emeritus-keyring-gpg/0x8E16B90AD6A6121C (renamed from debian-keyring-gpg/0x8E16B90AD6A6121C)bin7328 -> 7328 bytes
-rw-r--r--emeritus-keyring-gpg/0xAFCA65A20657A610 (renamed from debian-keyring-gpg/0xAFCA65A20657A610)bin10147 -> 10147 bytes
-rw-r--r--emeritus-keyring-gpg/0xB11BD919079A3B98 (renamed from debian-keyring-gpg/0xB11BD919079A3B98)bin6630 -> 6630 bytes
-rw-r--r--emeritus-keyring-gpg/0xBE5CF687DC5AB7C2 (renamed from debian-keyring-gpg/0xBE5CF687DC5AB7C2)bin23722 -> 23722 bytes
-rw-r--r--emeritus-keyring-gpg/0xEB70FEF3CDFC6E4F (renamed from debian-keyring-gpg/0xEB70FEF3CDFC6E4F)bin16399 -> 16399 bytes
-rw-r--r--emeritus-keyring-gpg/0xF3AC49989AD13245 (renamed from debian-keyring-gpg/0xF3AC49989AD13245)bin22446 -> 22446 bytes
-rw-r--r--keyids16
-rwxr-xr-xscripts/process-rt522
239 files changed, 536 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0fc17c0..83f7106 100644
--- a/Makefile
+++ b/Makefile
@@ -29,3 +29,4 @@ test: all
clean:
rm -f output/keyrings/*.gpg output/sha512sums.txt output/README output/changelog output/keyrings/*~
+ rm -rf gpghome
diff --git a/cheatsheets/infrastructure/kaufmann.txt b/cheatsheets/infrastructure/kaufmann.txt
index 82d9d51..bb6f53f 100644
--- a/cheatsheets/infrastructure/kaufmann.txt
+++ b/cheatsheets/infrastructure/kaufmann.txt
@@ -4,8 +4,8 @@ kaufmann.debian.org layout
mosca$ make
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/master-keyring/output
-mosca$ scp output/keyrings/* kaufmann.debian.org:/srv/keyring.debian.org/master-keyring/output/keyrings
+mosca$ scp output/sha512sums.txt kaufmann.debian.org:/srv/keyring.debian.org/pub/output
+mosca$ scp output/keyrings/* kaufmann.debian.org:/srv/keyring.debian.org/pub/output/keyrings
mosca$ git push ssh://git.debian.org/git/keyring/keyring.git master
kaufmann$ cat /home/noodles/update-keyrings
diff --git a/debian-keyring-gpg/0x00806F2BD729A457 b/debian-keyring-gpg/0x00806F2BD729A457
index 64ba772..925f371 100644
--- a/debian-keyring-gpg/0x00806F2BD729A457
+++ b/debian-keyring-gpg/0x00806F2BD729A457
Binary files differ
diff --git a/debian-keyring-gpg/0x009B33756B9AAA55 b/debian-keyring-gpg/0x009B33756B9AAA55
index 209facb..0536f90 100644
--- a/debian-keyring-gpg/0x009B33756B9AAA55
+++ b/debian-keyring-gpg/0x009B33756B9AAA55
Binary files differ
diff --git a/debian-keyring-gpg/0x00B45EBD4CA7BABE b/debian-keyring-gpg/0x00B45EBD4CA7BABE
index d10f818..d7faf03 100644
--- a/debian-keyring-gpg/0x00B45EBD4CA7BABE
+++ b/debian-keyring-gpg/0x00B45EBD4CA7BABE
Binary files differ
diff --git a/debian-keyring-gpg/0x04EE131AE6D621BE b/debian-keyring-gpg/0x04EE131AE6D621BE
index b4b2494..a59ed6b 100644
--- a/debian-keyring-gpg/0x04EE131AE6D621BE
+++ b/debian-keyring-gpg/0x04EE131AE6D621BE
Binary files differ
diff --git a/debian-keyring-gpg/0x054BBB9F7D806442 b/debian-keyring-gpg/0x054BBB9F7D806442
index b130d7d..3f7549f 100644
--- a/debian-keyring-gpg/0x054BBB9F7D806442
+++ b/debian-keyring-gpg/0x054BBB9F7D806442
Binary files differ
diff --git a/debian-keyring-gpg/0x0664A76954265E8C b/debian-keyring-gpg/0x0664A76954265E8C
index 8d03774..10a8ed0 100644
--- a/debian-keyring-gpg/0x0664A76954265E8C
+++ b/debian-keyring-gpg/0x0664A76954265E8C
Binary files differ
diff --git a/debian-keyring-gpg/0x06EAA066E397832F b/debian-keyring-gpg/0x06EAA066E397832F
index 369fef1..0d4fb2e 100644
--- a/debian-keyring-gpg/0x06EAA066E397832F
+++ b/debian-keyring-gpg/0x06EAA066E397832F
Binary files differ
diff --git a/debian-keyring-gpg/0x070202585B812EC1 b/debian-keyring-gpg/0x070202585B812EC1
index 41805d2..6411b12 100644
--- a/debian-keyring-gpg/0x070202585B812EC1
+++ b/debian-keyring-gpg/0x070202585B812EC1
Binary files differ
diff --git a/debian-keyring-gpg/0x07B48452768D3824 b/debian-keyring-gpg/0x07B48452768D3824
index 9908d4c..80f7595 100644
--- a/debian-keyring-gpg/0x07B48452768D3824
+++ b/debian-keyring-gpg/0x07B48452768D3824
Binary files differ
diff --git a/debian-keyring-gpg/0x09DA9408B4E14499 b/debian-keyring-gpg/0x09DA9408B4E14499
index cadd340..ab6f327 100644
--- a/debian-keyring-gpg/0x09DA9408B4E14499
+++ b/debian-keyring-gpg/0x09DA9408B4E14499
Binary files differ
diff --git a/debian-keyring-gpg/0x0AA04571D03E3E70 b/debian-keyring-gpg/0x0AA04571D03E3E70
index 87471fc..0786c0a 100644
--- a/debian-keyring-gpg/0x0AA04571D03E3E70
+++ b/debian-keyring-gpg/0x0AA04571D03E3E70
Binary files differ
diff --git a/debian-keyring-gpg/0x0B00FB6CEBE2D002 b/debian-keyring-gpg/0x0B00FB6CEBE2D002
index 08f611b..23cdb99 100644
--- a/debian-keyring-gpg/0x0B00FB6CEBE2D002
+++ b/debian-keyring-gpg/0x0B00FB6CEBE2D002
Binary files differ
diff --git a/debian-keyring-gpg/0x0C99B70EF4FCBB07 b/debian-keyring-gpg/0x0C99B70EF4FCBB07
index 76af119..29f027d 100644
--- a/debian-keyring-gpg/0x0C99B70EF4FCBB07
+++ b/debian-keyring-gpg/0x0C99B70EF4FCBB07
Binary files differ
diff --git a/debian-keyring-gpg/0x0F56D0553B6D411B b/debian-keyring-gpg/0x0F56D0553B6D411B
index d9d88e9..4691b38 100644
--- a/debian-keyring-gpg/0x0F56D0553B6D411B
+++ b/debian-keyring-gpg/0x0F56D0553B6D411B
Binary files differ
diff --git a/debian-keyring-gpg/0x11362600A747ECD9 b/debian-keyring-gpg/0x11362600A747ECD9
index ebf2b5c..43821d0 100644
--- a/debian-keyring-gpg/0x11362600A747ECD9
+++ b/debian-keyring-gpg/0x11362600A747ECD9
Binary files differ
diff --git a/debian-keyring-gpg/0x13C0B5667A38B0B0 b/debian-keyring-gpg/0x13C0B5667A38B0B0
index 1678523..0d76134 100644
--- a/debian-keyring-gpg/0x13C0B5667A38B0B0
+++ b/debian-keyring-gpg/0x13C0B5667A38B0B0
Binary files differ
diff --git a/debian-keyring-gpg/0x1988BAC881E23B3C b/debian-keyring-gpg/0x1988BAC881E23B3C
new file mode 100644
index 0000000..472578d
--- /dev/null
+++ b/debian-keyring-gpg/0x1988BAC881E23B3C
Binary files differ
diff --git a/debian-keyring-gpg/0x1ABFA401CCAA707A b/debian-keyring-gpg/0x1ABFA401CCAA707A
index 0ee380d..db898d8 100644
--- a/debian-keyring-gpg/0x1ABFA401CCAA707A
+++ b/debian-keyring-gpg/0x1ABFA401CCAA707A
Binary files differ
diff --git a/debian-keyring-gpg/0x1B132E01CEC6AD46 b/debian-keyring-gpg/0x1B132E01CEC6AD46
index 33f9a7e..3936304 100644
--- a/debian-keyring-gpg/0x1B132E01CEC6AD46
+++ b/debian-keyring-gpg/0x1B132E01CEC6AD46
Binary files differ
diff --git a/debian-keyring-gpg/0x1C7C41EDEBDDBB60 b/debian-keyring-gpg/0x1C7C41EDEBDDBB60
index a51252e..362aaa9 100644
--- a/debian-keyring-gpg/0x1C7C41EDEBDDBB60
+++ b/debian-keyring-gpg/0x1C7C41EDEBDDBB60
Binary files differ
diff --git a/debian-keyring-gpg/0x1CD8D854FE4252C1 b/debian-keyring-gpg/0x1CD8D854FE4252C1
index 67ac408..7dd371c 100644
--- a/debian-keyring-gpg/0x1CD8D854FE4252C1
+++ b/debian-keyring-gpg/0x1CD8D854FE4252C1
Binary files differ
diff --git a/debian-keyring-gpg/0x1E1356881DD8D791 b/debian-keyring-gpg/0x1E1356881DD8D791
index 851f948..7261727 100644
--- a/debian-keyring-gpg/0x1E1356881DD8D791
+++ b/debian-keyring-gpg/0x1E1356881DD8D791
Binary files differ
diff --git a/debian-keyring-gpg/0x1E7091B1F14A64A2 b/debian-keyring-gpg/0x1E7091B1F14A64A2
index 0ea5b0e..941c77e 100644
--- a/debian-keyring-gpg/0x1E7091B1F14A64A2
+++ b/debian-keyring-gpg/0x1E7091B1F14A64A2
Binary files differ
diff --git a/debian-keyring-gpg/0x1E953E27D4311E58 b/debian-keyring-gpg/0x1E953E27D4311E58
index 7ff9c10..877e343 100644
--- a/debian-keyring-gpg/0x1E953E27D4311E58
+++ b/debian-keyring-gpg/0x1E953E27D4311E58
Binary files differ
diff --git a/debian-keyring-gpg/0x1EFEB1801A49C0D2 b/debian-keyring-gpg/0x1EFEB1801A49C0D2
index c828b5b..ca0183d 100644
--- a/debian-keyring-gpg/0x1EFEB1801A49C0D2
+++ b/debian-keyring-gpg/0x1EFEB1801A49C0D2
Binary files differ
diff --git a/debian-keyring-gpg/0x2064C53641C25E5D b/debian-keyring-gpg/0x2064C53641C25E5D
index dec1ee2..b8609ea 100644
--- a/debian-keyring-gpg/0x2064C53641C25E5D
+++ b/debian-keyring-gpg/0x2064C53641C25E5D
Binary files differ
diff --git a/debian-keyring-gpg/0x21D20589974B3E96 b/debian-keyring-gpg/0x21D20589974B3E96
index 8c422d2..18b122f 100644
--- a/debian-keyring-gpg/0x21D20589974B3E96
+++ b/debian-keyring-gpg/0x21D20589974B3E96
Binary files differ
diff --git a/debian-keyring-gpg/0x223AE055BD94E154 b/debian-keyring-gpg/0x223AE055BD94E154
index 94919a9..e2d693a 100644
--- a/debian-keyring-gpg/0x223AE055BD94E154
+++ b/debian-keyring-gpg/0x223AE055BD94E154
Binary files differ
diff --git a/debian-keyring-gpg/0x26E3C875A74420EF b/debian-keyring-gpg/0x26E3C875A74420EF
index a66b7a0..f327619 100644
--- a/debian-keyring-gpg/0x26E3C875A74420EF
+++ b/debian-keyring-gpg/0x26E3C875A74420EF
Binary files differ
diff --git a/debian-keyring-gpg/0x27438BAA634770E9 b/debian-keyring-gpg/0x27438BAA634770E9
deleted file mode 100644
index e931f07..0000000
--- a/debian-keyring-gpg/0x27438BAA634770E9
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0x2AE901E5C70218D2 b/debian-keyring-gpg/0x2AE901E5C70218D2
index e280d38..82ac09f 100644
--- a/debian-keyring-gpg/0x2AE901E5C70218D2
+++ b/debian-keyring-gpg/0x2AE901E5C70218D2
Binary files differ
diff --git a/debian-keyring-gpg/0x2BF8D9FE074BCDE4 b/debian-keyring-gpg/0x2BF8D9FE074BCDE4
index 1b1b614..c48cbcc 100644
--- a/debian-keyring-gpg/0x2BF8D9FE074BCDE4
+++ b/debian-keyring-gpg/0x2BF8D9FE074BCDE4
Binary files differ
diff --git a/debian-keyring-gpg/0x2C3B436FEAC68101 b/debian-keyring-gpg/0x2C3B436FEAC68101
index e31d1a6..2d19702 100644
--- a/debian-keyring-gpg/0x2C3B436FEAC68101
+++ b/debian-keyring-gpg/0x2C3B436FEAC68101
Binary files differ
diff --git a/debian-keyring-gpg/0x2C7C3146C1A00121 b/debian-keyring-gpg/0x2C7C3146C1A00121
index 8c5b323..df7afa1 100644
--- a/debian-keyring-gpg/0x2C7C3146C1A00121
+++ b/debian-keyring-gpg/0x2C7C3146C1A00121
Binary files differ
diff --git a/debian-keyring-gpg/0x2DE1AD437A9DBF6E b/debian-keyring-gpg/0x2DE1AD437A9DBF6E
deleted file mode 100644
index 592f40e..0000000
--- a/debian-keyring-gpg/0x2DE1AD437A9DBF6E
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0x2DFC519954181296 b/debian-keyring-gpg/0x2DFC519954181296
index 48b048a..bec6e20 100644
--- a/debian-keyring-gpg/0x2DFC519954181296
+++ b/debian-keyring-gpg/0x2DFC519954181296
Binary files differ
diff --git a/debian-keyring-gpg/0x30550F7871EF0BA8 b/debian-keyring-gpg/0x30550F7871EF0BA8
index 5ed661f..546cae9 100644
--- a/debian-keyring-gpg/0x30550F7871EF0BA8
+++ b/debian-keyring-gpg/0x30550F7871EF0BA8
Binary files differ
diff --git a/debian-keyring-gpg/0x310180050905E40C b/debian-keyring-gpg/0x310180050905E40C
index 7ea8bed..e8440fe 100644
--- a/debian-keyring-gpg/0x310180050905E40C
+++ b/debian-keyring-gpg/0x310180050905E40C
Binary files differ
diff --git a/debian-keyring-gpg/0x3116BA5E9FFA69A3 b/debian-keyring-gpg/0x3116BA5E9FFA69A3
index 7d89eed..38b6879 100644
--- a/debian-keyring-gpg/0x3116BA5E9FFA69A3
+++ b/debian-keyring-gpg/0x3116BA5E9FFA69A3
Binary files differ
diff --git a/debian-keyring-gpg/0x32247FBB40AD1FA6 b/debian-keyring-gpg/0x32247FBB40AD1FA6
index d54d104..30dfab5 100644
--- a/debian-keyring-gpg/0x32247FBB40AD1FA6
+++ b/debian-keyring-gpg/0x32247FBB40AD1FA6
Binary files differ
diff --git a/debian-keyring-gpg/0x34CD816DE6FCD33E b/debian-keyring-gpg/0x34CD816DE6FCD33E
index 7b29eea..27558b9 100644
--- a/debian-keyring-gpg/0x34CD816DE6FCD33E
+++ b/debian-keyring-gpg/0x34CD816DE6FCD33E
Binary files differ
diff --git a/debian-keyring-gpg/0x357312559D1E064B b/debian-keyring-gpg/0x357312559D1E064B
index 040e026..a3be6b2 100644
--- a/debian-keyring-gpg/0x357312559D1E064B
+++ b/debian-keyring-gpg/0x357312559D1E064B
Binary files differ
diff --git a/debian-keyring-gpg/0x35A3939FFC78776D b/debian-keyring-gpg/0x35A3939FFC78776D
index a2a4f92..ae9006b 100644
--- a/debian-keyring-gpg/0x35A3939FFC78776D
+++ b/debian-keyring-gpg/0x35A3939FFC78776D
Binary files differ
diff --git a/debian-keyring-gpg/0x3938F96BDF50FEA5 b/debian-keyring-gpg/0x3938F96BDF50FEA5
index fc91fe7..3936f58 100644
--- a/debian-keyring-gpg/0x3938F96BDF50FEA5
+++ b/debian-keyring-gpg/0x3938F96BDF50FEA5
Binary files differ
diff --git a/debian-keyring-gpg/0x3A936196C095D941 b/debian-keyring-gpg/0x3A936196C095D941
index a0270b7..0f42b57 100644
--- a/debian-keyring-gpg/0x3A936196C095D941
+++ b/debian-keyring-gpg/0x3A936196C095D941
Binary files differ
diff --git a/debian-keyring-gpg/0x3AC8F716477EDB23 b/debian-keyring-gpg/0x3AC8F716477EDB23
index 82abf76..c172478 100644
--- a/debian-keyring-gpg/0x3AC8F716477EDB23
+++ b/debian-keyring-gpg/0x3AC8F716477EDB23
Binary files differ
diff --git a/debian-keyring-gpg/0x3B56E2BBD53FDCB1 b/debian-keyring-gpg/0x3B56E2BBD53FDCB1
index 793e8ba..2f5cd15 100644
--- a/debian-keyring-gpg/0x3B56E2BBD53FDCB1
+++ b/debian-keyring-gpg/0x3B56E2BBD53FDCB1
Binary files differ
diff --git a/debian-keyring-gpg/0x3CCEBABE206C3B69 b/debian-keyring-gpg/0x3CCEBABE206C3B69
index a42a466..c369b14 100644
--- a/debian-keyring-gpg/0x3CCEBABE206C3B69
+++ b/debian-keyring-gpg/0x3CCEBABE206C3B69
Binary files differ
diff --git a/debian-keyring-gpg/0x3FB9C78A53C854DF b/debian-keyring-gpg/0x3FB9C78A53C854DF
deleted file mode 100644
index 3d8cbbe..0000000
--- a/debian-keyring-gpg/0x3FB9C78A53C854DF
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0x40D716CFE909CDEE b/debian-keyring-gpg/0x40D716CFE909CDEE
index 09fbf57..55940de 100644
--- a/debian-keyring-gpg/0x40D716CFE909CDEE
+++ b/debian-keyring-gpg/0x40D716CFE909CDEE
Binary files differ
diff --git a/emeritus-keyring-gpg/0x4330169952D556DB b/debian-keyring-gpg/0x4330169952D556DB
index dd9993b..dd9993b 100644
--- a/emeritus-keyring-gpg/0x4330169952D556DB
+++ b/debian-keyring-gpg/0x4330169952D556DB
Binary files differ
diff --git a/debian-keyring-gpg/0x44BB1BA79F6C6333 b/debian-keyring-gpg/0x44BB1BA79F6C6333
index edb8fc3..86b3073 100644
--- a/debian-keyring-gpg/0x44BB1BA79F6C6333
+++ b/debian-keyring-gpg/0x44BB1BA79F6C6333
Binary files differ
diff --git a/debian-keyring-gpg/0x44E17740B8611E9C b/debian-keyring-gpg/0x44E17740B8611E9C
index f16733f..61fe5b9 100644
--- a/debian-keyring-gpg/0x44E17740B8611E9C
+++ b/debian-keyring-gpg/0x44E17740B8611E9C
Binary files differ
diff --git a/debian-keyring-gpg/0x4664E07DBDA485C5 b/debian-keyring-gpg/0x4664E07DBDA485C5
new file mode 100644
index 0000000..f7392e4
--- /dev/null
+++ b/debian-keyring-gpg/0x4664E07DBDA485C5
Binary files differ
diff --git a/debian-keyring-gpg/0x4B043FCDB9444540 b/debian-keyring-gpg/0x4B043FCDB9444540
index f81d20b..f22c5f0 100644
--- a/debian-keyring-gpg/0x4B043FCDB9444540
+++ b/debian-keyring-gpg/0x4B043FCDB9444540
Binary files differ
diff --git a/debian-keyring-gpg/0x4BC80A69432387E8 b/debian-keyring-gpg/0x4BC80A69432387E8
new file mode 100644
index 0000000..8470ee5
--- /dev/null
+++ b/debian-keyring-gpg/0x4BC80A69432387E8
Binary files differ
diff --git a/debian-keyring-gpg/0x4F9F6D550ED6122A b/debian-keyring-gpg/0x4F9F6D550ED6122A
index fe64ea1..f7a458e 100644
--- a/debian-keyring-gpg/0x4F9F6D550ED6122A
+++ b/debian-keyring-gpg/0x4F9F6D550ED6122A
Binary files differ
diff --git a/debian-keyring-gpg/0x5041F1891F44E090 b/debian-keyring-gpg/0x5041F1891F44E090
index f922bba..1ce2b3a 100644
--- a/debian-keyring-gpg/0x5041F1891F44E090
+++ b/debian-keyring-gpg/0x5041F1891F44E090
Binary files differ
diff --git a/debian-keyring-gpg/0x50C3634D3A291CF9 b/debian-keyring-gpg/0x50C3634D3A291CF9
index 3714eef..51c87c8 100644
--- a/debian-keyring-gpg/0x50C3634D3A291CF9
+++ b/debian-keyring-gpg/0x50C3634D3A291CF9
Binary files differ
diff --git a/debian-keyring-gpg/0x51106DF5CD92D072 b/debian-keyring-gpg/0x51106DF5CD92D072
index 516f9f3..ba49506 100644
--- a/debian-keyring-gpg/0x51106DF5CD92D072
+++ b/debian-keyring-gpg/0x51106DF5CD92D072
Binary files differ
diff --git a/debian-keyring-gpg/0x51A09B18CF5A5068 b/debian-keyring-gpg/0x51A09B18CF5A5068
index aabe0a9..45f83a1 100644
--- a/debian-keyring-gpg/0x51A09B18CF5A5068
+++ b/debian-keyring-gpg/0x51A09B18CF5A5068
Binary files differ
diff --git a/debian-keyring-gpg/0x536D57489C2001D0 b/debian-keyring-gpg/0x536D57489C2001D0
index 8e5d669..7a10051 100644
--- a/debian-keyring-gpg/0x536D57489C2001D0
+++ b/debian-keyring-gpg/0x536D57489C2001D0
Binary files differ
diff --git a/debian-keyring-gpg/0x5394479DD3524C51 b/debian-keyring-gpg/0x5394479DD3524C51
index e913b40..129101f 100644
--- a/debian-keyring-gpg/0x5394479DD3524C51
+++ b/debian-keyring-gpg/0x5394479DD3524C51
Binary files differ
diff --git a/debian-keyring-gpg/0x53FE7BBDA68910FC b/debian-keyring-gpg/0x53FE7BBDA68910FC
index 5ce5a36..15ea0f4 100644
--- a/debian-keyring-gpg/0x53FE7BBDA68910FC
+++ b/debian-keyring-gpg/0x53FE7BBDA68910FC
Binary files differ
diff --git a/debian-keyring-gpg/0x5556A34E04A3610B b/debian-keyring-gpg/0x5556A34E04A3610B
index 9ad60ab..e0b241d 100644
--- a/debian-keyring-gpg/0x5556A34E04A3610B
+++ b/debian-keyring-gpg/0x5556A34E04A3610B
Binary files differ
diff --git a/debian-keyring-gpg/0x55AD141521E764DF b/debian-keyring-gpg/0x55AD141521E764DF
index 8cf8e67..2570357 100644
--- a/debian-keyring-gpg/0x55AD141521E764DF
+++ b/debian-keyring-gpg/0x55AD141521E764DF
Binary files differ
diff --git a/debian-keyring-gpg/0x5632906F4696E015 b/debian-keyring-gpg/0x5632906F4696E015
index 9e9ded8..677f75e 100644
--- a/debian-keyring-gpg/0x5632906F4696E015
+++ b/debian-keyring-gpg/0x5632906F4696E015
Binary files differ
diff --git a/debian-keyring-gpg/0x573EF1E4BD5A01FA b/debian-keyring-gpg/0x573EF1E4BD5A01FA
index 7694046..6fd422e 100644
--- a/debian-keyring-gpg/0x573EF1E4BD5A01FA
+++ b/debian-keyring-gpg/0x573EF1E4BD5A01FA
Binary files differ
diff --git a/debian-keyring-gpg/0x5759F35001AA4A64 b/debian-keyring-gpg/0x5759F35001AA4A64
index 885e15a..914888e 100644
--- a/debian-keyring-gpg/0x5759F35001AA4A64
+++ b/debian-keyring-gpg/0x5759F35001AA4A64
Binary files differ
diff --git a/debian-keyring-gpg/0x578A0494D1C646D1 b/debian-keyring-gpg/0x578A0494D1C646D1
index 8e3948e..a3a95eb 100644
--- a/debian-keyring-gpg/0x578A0494D1C646D1
+++ b/debian-keyring-gpg/0x578A0494D1C646D1
Binary files differ
diff --git a/debian-keyring-gpg/0x57930DAB0B86B067 b/debian-keyring-gpg/0x57930DAB0B86B067
index 8f8520c..0cac73c 100644
--- a/debian-keyring-gpg/0x57930DAB0B86B067
+++ b/debian-keyring-gpg/0x57930DAB0B86B067
Binary files differ
diff --git a/debian-keyring-gpg/0x587979573442684E b/debian-keyring-gpg/0x587979573442684E
index 0a3ad9d..98483bc 100644
--- a/debian-keyring-gpg/0x587979573442684E
+++ b/debian-keyring-gpg/0x587979573442684E
Binary files differ
diff --git a/debian-keyring-gpg/0x5A8728BE7BDA8506 b/debian-keyring-gpg/0x5A8728BE7BDA8506
index ea8878f..2e5c1ad 100644
--- a/debian-keyring-gpg/0x5A8728BE7BDA8506
+++ b/debian-keyring-gpg/0x5A8728BE7BDA8506
Binary files differ
diff --git a/debian-keyring-gpg/0x5ACE8D6E0C14A470 b/debian-keyring-gpg/0x5ACE8D6E0C14A470
index 8500e8c..59d11e1 100644
--- a/debian-keyring-gpg/0x5ACE8D6E0C14A470
+++ b/debian-keyring-gpg/0x5ACE8D6E0C14A470
Binary files differ
diff --git a/debian-keyring-gpg/0x5D328D082AAAB140 b/debian-keyring-gpg/0x5D328D082AAAB140
index bc88638..d08b075 100644
--- a/debian-keyring-gpg/0x5D328D082AAAB140
+++ b/debian-keyring-gpg/0x5D328D082AAAB140
Binary files differ
diff --git a/debian-keyring-gpg/0x5E62533F19765111 b/debian-keyring-gpg/0x5E62533F19765111
index 8c11e1c..c87a8a2 100644
--- a/debian-keyring-gpg/0x5E62533F19765111
+++ b/debian-keyring-gpg/0x5E62533F19765111
Binary files differ
diff --git a/debian-keyring-gpg/0x5EE76EE20216D2A5 b/debian-keyring-gpg/0x5EE76EE20216D2A5
index 83fe548..01303d1 100644
--- a/debian-keyring-gpg/0x5EE76EE20216D2A5
+++ b/debian-keyring-gpg/0x5EE76EE20216D2A5
Binary files differ
diff --git a/debian-keyring-gpg/0x634F4BD1E7AD5568 b/debian-keyring-gpg/0x634F4BD1E7AD5568
index d4c06f8..e3ba56a 100644
--- a/debian-keyring-gpg/0x634F4BD1E7AD5568
+++ b/debian-keyring-gpg/0x634F4BD1E7AD5568
Binary files differ
diff --git a/debian-keyring-gpg/0x64959FE9838DF19C b/debian-keyring-gpg/0x64959FE9838DF19C
index 3a5bcda..c731b65 100644
--- a/debian-keyring-gpg/0x64959FE9838DF19C
+++ b/debian-keyring-gpg/0x64959FE9838DF19C
Binary files differ
diff --git a/debian-keyring-gpg/0x673A03E4C1DB921F b/debian-keyring-gpg/0x673A03E4C1DB921F
index ef1341a..16aa044 100644
--- a/debian-keyring-gpg/0x673A03E4C1DB921F
+++ b/debian-keyring-gpg/0x673A03E4C1DB921F
Binary files differ
diff --git a/debian-keyring-gpg/0x68E713981D1515F8 b/debian-keyring-gpg/0x68E713981D1515F8
index e4003a6..54d0d60 100644
--- a/debian-keyring-gpg/0x68E713981D1515F8
+++ b/debian-keyring-gpg/0x68E713981D1515F8
Binary files differ
diff --git a/debian-keyring-gpg/0x6B720BE9C5CF6D9E b/debian-keyring-gpg/0x6B720BE9C5CF6D9E
index badc8df..675a6db 100644
--- a/debian-keyring-gpg/0x6B720BE9C5CF6D9E
+++ b/debian-keyring-gpg/0x6B720BE9C5CF6D9E
Binary files differ
diff --git a/debian-maintainers-gpg/0x6B7498FCB9B358AC b/debian-keyring-gpg/0x6B7498FCB9B358AC
index 3325349..3325349 100644
--- a/debian-maintainers-gpg/0x6B7498FCB9B358AC
+++ b/debian-keyring-gpg/0x6B7498FCB9B358AC
Binary files differ
diff --git a/debian-keyring-gpg/0x6C6580E77BD756C4 b/debian-keyring-gpg/0x6C6580E77BD756C4
index 40ec8a4..72e36a7 100644
--- a/debian-keyring-gpg/0x6C6580E77BD756C4
+++ b/debian-keyring-gpg/0x6C6580E77BD756C4
Binary files differ
diff --git a/debian-keyring-gpg/0x6C6ACD6417B3ACB1 b/debian-keyring-gpg/0x6C6ACD6417B3ACB1
index 84858be..768fded 100644
--- a/debian-keyring-gpg/0x6C6ACD6417B3ACB1
+++ b/debian-keyring-gpg/0x6C6ACD6417B3ACB1
Binary files differ
diff --git a/debian-keyring-gpg/0x6EA4D2311A2D268D b/debian-keyring-gpg/0x6EA4D2311A2D268D
index c0c6afb..6136419 100644
--- a/debian-keyring-gpg/0x6EA4D2311A2D268D
+++ b/debian-keyring-gpg/0x6EA4D2311A2D268D
Binary files differ
diff --git a/debian-keyring-gpg/0x7115AFD07710DCF7 b/debian-keyring-gpg/0x7115AFD07710DCF7
index 7143023..dead92c 100644
--- a/debian-keyring-gpg/0x7115AFD07710DCF7
+++ b/debian-keyring-gpg/0x7115AFD07710DCF7
Binary files differ
diff --git a/debian-keyring-gpg/0x7403062689664EDE b/debian-keyring-gpg/0x7403062689664EDE
index 3af33c8..900d6ce 100644
--- a/debian-keyring-gpg/0x7403062689664EDE
+++ b/debian-keyring-gpg/0x7403062689664EDE
Binary files differ
diff --git a/debian-keyring-gpg/0x745C4766D4CACDFF b/debian-keyring-gpg/0x745C4766D4CACDFF
index df5daf9..ec72688 100644
--- a/debian-keyring-gpg/0x745C4766D4CACDFF
+++ b/debian-keyring-gpg/0x745C4766D4CACDFF
Binary files differ
diff --git a/debian-keyring-gpg/0x751AB5DDA79679CC b/debian-keyring-gpg/0x751AB5DDA79679CC
index 765ec49..4154c64 100644
--- a/debian-keyring-gpg/0x751AB5DDA79679CC
+++ b/debian-keyring-gpg/0x751AB5DDA79679CC
Binary files differ
diff --git a/debian-keyring-gpg/0x7731FCCC63E4E277 b/debian-keyring-gpg/0x7731FCCC63E4E277
index e1d6a3c..3e2c5c8 100644
--- a/debian-keyring-gpg/0x7731FCCC63E4E277
+++ b/debian-keyring-gpg/0x7731FCCC63E4E277
Binary files differ
diff --git a/debian-keyring-gpg/0x789D6F057FD863FE b/debian-keyring-gpg/0x789D6F057FD863FE
index d18882a..bf883ea 100644
--- a/debian-keyring-gpg/0x789D6F057FD863FE
+++ b/debian-keyring-gpg/0x789D6F057FD863FE
Binary files differ
diff --git a/debian-keyring-gpg/0x792152527B75921E b/debian-keyring-gpg/0x792152527B75921E
index 4aa1d84..8021abb 100644
--- a/debian-keyring-gpg/0x792152527B75921E
+++ b/debian-keyring-gpg/0x792152527B75921E
Binary files differ
diff --git a/debian-keyring-gpg/0x7C56ACFE947897D8 b/debian-keyring-gpg/0x7C56ACFE947897D8
index c4cd21f..f8e6aa4 100644
--- a/debian-keyring-gpg/0x7C56ACFE947897D8
+++ b/debian-keyring-gpg/0x7C56ACFE947897D8
Binary files differ
diff --git a/debian-keyring-gpg/0x7DBA958C1C055538 b/debian-keyring-gpg/0x7DBA958C1C055538
index ff318f2..42d9689 100644
--- a/debian-keyring-gpg/0x7DBA958C1C055538
+++ b/debian-keyring-gpg/0x7DBA958C1C055538
Binary files differ
diff --git a/debian-keyring-gpg/0x7EA7A51C29C2BDB6 b/debian-keyring-gpg/0x7EA7A51C29C2BDB6
index f81082a..ca773ba 100644
--- a/debian-keyring-gpg/0x7EA7A51C29C2BDB6
+++ b/debian-keyring-gpg/0x7EA7A51C29C2BDB6
Binary files differ
diff --git a/debian-keyring-gpg/0x7F55BB12A40F862E b/debian-keyring-gpg/0x7F55BB12A40F862E
index 6333ad8..8d4d629 100644
--- a/debian-keyring-gpg/0x7F55BB12A40F862E
+++ b/debian-keyring-gpg/0x7F55BB12A40F862E
Binary files differ
diff --git a/debian-keyring-gpg/0x80E627A0AB757E23 b/debian-keyring-gpg/0x80E627A0AB757E23
index 4ca4336..946a790 100644
--- a/debian-keyring-gpg/0x80E627A0AB757E23
+++ b/debian-keyring-gpg/0x80E627A0AB757E23
Binary files differ
diff --git a/debian-keyring-gpg/0x82B5B40868C097BC b/debian-keyring-gpg/0x82B5B40868C097BC
index 0fc5757..66c4ba1 100644
--- a/debian-keyring-gpg/0x82B5B40868C097BC
+++ b/debian-keyring-gpg/0x82B5B40868C097BC
Binary files differ
diff --git a/debian-keyring-gpg/0x8382C95C29023DF9 b/debian-keyring-gpg/0x8382C95C29023DF9
index 1852928..6cc5c42 100644
--- a/debian-keyring-gpg/0x8382C95C29023DF9
+++ b/debian-keyring-gpg/0x8382C95C29023DF9
Binary files differ
diff --git a/debian-maintainers-gpg/0x83E33BD7D4DD4CA1 b/debian-keyring-gpg/0x83E33BD7D4DD4CA1
index 5ec4fa3..890b081 100644
--- a/debian-maintainers-gpg/0x83E33BD7D4DD4CA1
+++ b/debian-keyring-gpg/0x83E33BD7D4DD4CA1
Binary files differ
diff --git a/debian-maintainers-gpg/0x86561F452180FCFE b/debian-keyring-gpg/0x86561F452180FCFE
index ab81287..ab81287 100644
--- a/debian-maintainers-gpg/0x86561F452180FCFE
+++ b/debian-keyring-gpg/0x86561F452180FCFE
Binary files differ
diff --git a/debian-keyring-gpg/0x872F702C4D6E25A8 b/debian-keyring-gpg/0x872F702C4D6E25A8
index 18719e2..358545f 100644
--- a/debian-keyring-gpg/0x872F702C4D6E25A8
+++ b/debian-keyring-gpg/0x872F702C4D6E25A8
Binary files differ
diff --git a/debian-keyring-gpg/0x887B60618B3C16AE b/debian-keyring-gpg/0x887B60618B3C16AE
index c4a5573..ff88528 100644
--- a/debian-keyring-gpg/0x887B60618B3C16AE
+++ b/debian-keyring-gpg/0x887B60618B3C16AE
Binary files differ
diff --git a/debian-keyring-gpg/0x8A0A48874687AF4F b/debian-keyring-gpg/0x8A0A48874687AF4F
index bb5b7bf..a132871 100644
--- a/debian-keyring-gpg/0x8A0A48874687AF4F
+++ b/debian-keyring-gpg/0x8A0A48874687AF4F
Binary files differ
diff --git a/debian-keyring-gpg/0x8A3171EF366150CE b/debian-keyring-gpg/0x8A3171EF366150CE
index b4e3180..c955ee5 100644
--- a/debian-keyring-gpg/0x8A3171EF366150CE
+++ b/debian-keyring-gpg/0x8A3171EF366150CE
Binary files differ
diff --git a/debian-keyring-gpg/0x8D83379110000DEB b/debian-keyring-gpg/0x8D83379110000DEB
index d211ae9..2ad2470 100644
--- a/debian-keyring-gpg/0x8D83379110000DEB
+++ b/debian-keyring-gpg/0x8D83379110000DEB
Binary files differ
diff --git a/debian-keyring-gpg/0x8FF1CB6E8D89059F b/debian-keyring-gpg/0x8FF1CB6E8D89059F
index 94b6d42..fce90b7 100644
--- a/debian-keyring-gpg/0x8FF1CB6E8D89059F
+++ b/debian-keyring-gpg/0x8FF1CB6E8D89059F
Binary files differ
diff --git a/debian-keyring-gpg/0x94FA372B2DA8B985 b/debian-keyring-gpg/0x94FA372B2DA8B985
index b9026db..9a54449 100644
--- a/debian-keyring-gpg/0x94FA372B2DA8B985
+++ b/debian-keyring-gpg/0x94FA372B2DA8B985
Binary files differ
diff --git a/debian-keyring-gpg/0x9688FFC1C78102DF b/debian-keyring-gpg/0x9688FFC1C78102DF
index e474be7..2c14835 100644
--- a/debian-keyring-gpg/0x9688FFC1C78102DF
+++ b/debian-keyring-gpg/0x9688FFC1C78102DF
Binary files differ
diff --git a/debian-keyring-gpg/0x96EDAB9B2E6B7171 b/debian-keyring-gpg/0x96EDAB9B2E6B7171
index 3c62e8b..c808687 100644
--- a/debian-keyring-gpg/0x96EDAB9B2E6B7171
+++ b/debian-keyring-gpg/0x96EDAB9B2E6B7171
Binary files differ
diff --git a/debian-keyring-gpg/0x97BA9CE761A0963B b/debian-keyring-gpg/0x97BA9CE761A0963B
index e3cedf6..4db6ba3 100644
--- a/debian-keyring-gpg/0x97BA9CE761A0963B
+++ b/debian-keyring-gpg/0x97BA9CE761A0963B
Binary files differ
diff --git a/debian-keyring-gpg/0x98CABB3ABD4CA59E b/debian-keyring-gpg/0x98CABB3ABD4CA59E
index c3d5b06..038a803 100644
--- a/debian-keyring-gpg/0x98CABB3ABD4CA59E
+++ b/debian-keyring-gpg/0x98CABB3ABD4CA59E
Binary files differ
diff --git a/debian-keyring-gpg/0x9C27B31342B7511D b/debian-keyring-gpg/0x9C27B31342B7511D
index 940f5f0..c68e672 100644
--- a/debian-keyring-gpg/0x9C27B31342B7511D
+++ b/debian-keyring-gpg/0x9C27B31342B7511D
Binary files differ
diff --git a/debian-keyring-gpg/0x9C31503C6D866396 b/debian-keyring-gpg/0x9C31503C6D866396
index 1c242cc..9b3b452 100644
--- a/debian-keyring-gpg/0x9C31503C6D866396
+++ b/debian-keyring-gpg/0x9C31503C6D866396
Binary files differ
diff --git a/debian-keyring-gpg/0x9D0B5E5B1EEC8F0E b/debian-keyring-gpg/0x9D0B5E5B1EEC8F0E
index ade196c..0930939 100644
--- a/debian-keyring-gpg/0x9D0B5E5B1EEC8F0E
+++ b/debian-keyring-gpg/0x9D0B5E5B1EEC8F0E
Binary files differ
diff --git a/debian-keyring-gpg/0x9EA33414F5852F4E b/debian-keyring-gpg/0x9EA33414F5852F4E
index dd7964c..ea606ba 100644
--- a/debian-keyring-gpg/0x9EA33414F5852F4E
+++ b/debian-keyring-gpg/0x9EA33414F5852F4E
Binary files differ
diff --git a/debian-keyring-gpg/0x9EC002FE1C9CA517 b/debian-keyring-gpg/0x9EC002FE1C9CA517
index 742c396..59c73e1 100644
--- a/debian-keyring-gpg/0x9EC002FE1C9CA517
+++ b/debian-keyring-gpg/0x9EC002FE1C9CA517
Binary files differ
diff --git a/debian-keyring-gpg/0x9EDCC991D9AB457E b/debian-keyring-gpg/0x9EDCC991D9AB457E
index 9739509..12e7d6f 100644
--- a/debian-keyring-gpg/0x9EDCC991D9AB457E
+++ b/debian-keyring-gpg/0x9EDCC991D9AB457E
Binary files differ
diff --git a/debian-keyring-gpg/0xA1B986143704397B b/debian-keyring-gpg/0xA1B986143704397B
new file mode 100644
index 0000000..9e1782f
--- /dev/null
+++ b/debian-keyring-gpg/0xA1B986143704397B
Binary files differ
diff --git a/debian-keyring-gpg/0xA2D13001D98C0FBA b/debian-keyring-gpg/0xA2D13001D98C0FBA
index 791114b..c416330 100644
--- a/debian-keyring-gpg/0xA2D13001D98C0FBA
+++ b/debian-keyring-gpg/0xA2D13001D98C0FBA
Binary files differ
diff --git a/debian-keyring-gpg/0xA3BABAE2408DD6CF b/debian-keyring-gpg/0xA3BABAE2408DD6CF
index 00ba787..2bdfb96 100644
--- a/debian-keyring-gpg/0xA3BABAE2408DD6CF
+++ b/debian-keyring-gpg/0xA3BABAE2408DD6CF
Binary files differ
diff --git a/debian-keyring-gpg/0xA81CEA22BC8C7E2E b/debian-keyring-gpg/0xA81CEA22BC8C7E2E
index d101447..13b2dcb 100644
--- a/debian-keyring-gpg/0xA81CEA22BC8C7E2E
+++ b/debian-keyring-gpg/0xA81CEA22BC8C7E2E
Binary files differ
diff --git a/debian-keyring-gpg/0xA97A7702BAF91EF5 b/debian-keyring-gpg/0xA97A7702BAF91EF5
index 6ac75de..68d9e18 100644
--- a/debian-keyring-gpg/0xA97A7702BAF91EF5
+++ b/debian-keyring-gpg/0xA97A7702BAF91EF5
Binary files differ
diff --git a/debian-keyring-gpg/0xAC1E90BAC433F68F b/debian-keyring-gpg/0xAC1E90BAC433F68F
index da7562d..90fc19b 100644
--- a/debian-keyring-gpg/0xAC1E90BAC433F68F
+++ b/debian-keyring-gpg/0xAC1E90BAC433F68F
Binary files differ
diff --git a/debian-keyring-gpg/0xAEED6158020EAFFF b/debian-keyring-gpg/0xAEED6158020EAFFF
index 3685959..02aa948 100644
--- a/debian-keyring-gpg/0xAEED6158020EAFFF
+++ b/debian-keyring-gpg/0xAEED6158020EAFFF
Binary files differ
diff --git a/debian-keyring-gpg/0xAEF6F1A2A7457645 b/debian-keyring-gpg/0xAEF6F1A2A7457645
index a7d7801..8f085dc 100644
--- a/debian-keyring-gpg/0xAEF6F1A2A7457645
+++ b/debian-keyring-gpg/0xAEF6F1A2A7457645
Binary files differ
diff --git a/debian-keyring-gpg/0xB01D1A72AC8DC9A1 b/debian-keyring-gpg/0xB01D1A72AC8DC9A1
index a4ef8cd..9276dae 100644
--- a/debian-keyring-gpg/0xB01D1A72AC8DC9A1
+++ b/debian-keyring-gpg/0xB01D1A72AC8DC9A1
Binary files differ
diff --git a/debian-keyring-gpg/0xB01FEA84617B586D b/debian-keyring-gpg/0xB01FEA84617B586D
index 5c0c8d7..9f458ef 100644
--- a/debian-keyring-gpg/0xB01FEA84617B586D
+++ b/debian-keyring-gpg/0xB01FEA84617B586D
Binary files differ
diff --git a/debian-keyring-gpg/0xB3118CEF8AEA8FEE b/debian-keyring-gpg/0xB3118CEF8AEA8FEE
index ff02718..b6afb95 100644
--- a/debian-keyring-gpg/0xB3118CEF8AEA8FEE
+++ b/debian-keyring-gpg/0xB3118CEF8AEA8FEE
Binary files differ
diff --git a/debian-keyring-gpg/0xB3464F896AA15948 b/debian-keyring-gpg/0xB3464F896AA15948
index 4c95942..dcdd941 100644
--- a/debian-keyring-gpg/0xB3464F896AA15948
+++ b/debian-keyring-gpg/0xB3464F896AA15948
Binary files differ
diff --git a/debian-keyring-gpg/0xB3F25D6B00A80662 b/debian-keyring-gpg/0xB3F25D6B00A80662
deleted file mode 100644
index 3b3367d..0000000
--- a/debian-keyring-gpg/0xB3F25D6B00A80662
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0xB5754A69B6BE608C b/debian-keyring-gpg/0xB5754A69B6BE608C
index fe54c8c..fd63a2b 100644
--- a/debian-keyring-gpg/0xB5754A69B6BE608C
+++ b/debian-keyring-gpg/0xB5754A69B6BE608C
Binary files differ
diff --git a/debian-keyring-gpg/0xB59EB72202D1BC65 b/debian-keyring-gpg/0xB59EB72202D1BC65
index 45fd4bf..48a37b3 100644
--- a/debian-keyring-gpg/0xB59EB72202D1BC65
+++ b/debian-keyring-gpg/0xB59EB72202D1BC65
Binary files differ
diff --git a/debian-keyring-gpg/0xB6F6F753E15B47E9 b/debian-keyring-gpg/0xB6F6F753E15B47E9
index 87b6842..79c8d0d 100644
--- a/debian-keyring-gpg/0xB6F6F753E15B47E9
+++ b/debian-keyring-gpg/0xB6F6F753E15B47E9
Binary files differ
diff --git a/debian-keyring-gpg/0xB82A217AFDFE09F2 b/debian-keyring-gpg/0xB82A217AFDFE09F2
index 993ed5f..0fa1b7a 100644
--- a/debian-keyring-gpg/0xB82A217AFDFE09F2
+++ b/debian-keyring-gpg/0xB82A217AFDFE09F2
Binary files differ
diff --git a/debian-keyring-gpg/0xB8688CA3D876D5A3 b/debian-keyring-gpg/0xB8688CA3D876D5A3
index a63aad8..9263894 100644
--- a/debian-keyring-gpg/0xB8688CA3D876D5A3
+++ b/debian-keyring-gpg/0xB8688CA3D876D5A3
Binary files differ
diff --git a/debian-keyring-gpg/0xB8E5087766475AAF b/debian-keyring-gpg/0xB8E5087766475AAF
index cc11a62..48b9a57 100644
--- a/debian-keyring-gpg/0xB8E5087766475AAF
+++ b/debian-keyring-gpg/0xB8E5087766475AAF
Binary files differ
diff --git a/debian-keyring-gpg/0xB999CDB58C8DDBD2 b/debian-keyring-gpg/0xB999CDB58C8DDBD2
index 51406c8..508d1fd 100644
--- a/debian-keyring-gpg/0xB999CDB58C8DDBD2
+++ b/debian-keyring-gpg/0xB999CDB58C8DDBD2
Binary files differ
diff --git a/debian-keyring-gpg/0xBA9C78061DDD8C9B b/debian-keyring-gpg/0xBA9C78061DDD8C9B
index ab38d52..336688f 100644
--- a/debian-keyring-gpg/0xBA9C78061DDD8C9B
+++ b/debian-keyring-gpg/0xBA9C78061DDD8C9B
Binary files differ
diff --git a/debian-keyring-gpg/0xBB3A68018649AA06 b/debian-keyring-gpg/0xBB3A68018649AA06
index 16acc13..fe4368a 100644
--- a/debian-keyring-gpg/0xBB3A68018649AA06
+++ b/debian-keyring-gpg/0xBB3A68018649AA06
Binary files differ
diff --git a/debian-keyring-gpg/0xBC10BD0F7B8BF08B b/debian-keyring-gpg/0xBC10BD0F7B8BF08B
index 2ed331a..2147886 100644
--- a/debian-keyring-gpg/0xBC10BD0F7B8BF08B
+++ b/debian-keyring-gpg/0xBC10BD0F7B8BF08B
Binary files differ
diff --git a/debian-keyring-gpg/0xBC1256AA6AA6EC5E b/debian-keyring-gpg/0xBC1256AA6AA6EC5E
index 339a88a..74e8b8b 100644
--- a/debian-keyring-gpg/0xBC1256AA6AA6EC5E
+++ b/debian-keyring-gpg/0xBC1256AA6AA6EC5E
Binary files differ
diff --git a/debian-keyring-gpg/0xBC372252CA1CF964 b/debian-keyring-gpg/0xBC372252CA1CF964
index 76e9df3..d66771c 100644
--- a/debian-keyring-gpg/0xBC372252CA1CF964
+++ b/debian-keyring-gpg/0xBC372252CA1CF964
Binary files differ
diff --git a/debian-keyring-gpg/0xC0F039E9ED1B597A b/debian-keyring-gpg/0xC0F039E9ED1B597A
index 3578ad2..fbaabc2 100644
--- a/debian-keyring-gpg/0xC0F039E9ED1B597A
+++ b/debian-keyring-gpg/0xC0F039E9ED1B597A
Binary files differ
diff --git a/debian-keyring-gpg/0xC256FBD500221E93 b/debian-keyring-gpg/0xC256FBD500221E93
index 5ffae8b..f4f5dd5 100644
--- a/debian-keyring-gpg/0xC256FBD500221E93
+++ b/debian-keyring-gpg/0xC256FBD500221E93
Binary files differ
diff --git a/debian-keyring-gpg/0xC3F436CA30F5D8EB b/debian-keyring-gpg/0xC3F436CA30F5D8EB
index 75dc678..d981797 100644
--- a/debian-keyring-gpg/0xC3F436CA30F5D8EB
+++ b/debian-keyring-gpg/0xC3F436CA30F5D8EB
Binary files differ
diff --git a/debian-keyring-gpg/0xC61A64DCF1393998 b/debian-keyring-gpg/0xC61A64DCF1393998
index 29da5c9..10cbd20 100644
--- a/debian-keyring-gpg/0xC61A64DCF1393998
+++ b/debian-keyring-gpg/0xC61A64DCF1393998
Binary files differ
diff --git a/debian-keyring-gpg/0xC6875F3541CEFDE0 b/debian-keyring-gpg/0xC6875F3541CEFDE0
index 988a62d..a7e196f 100644
--- a/debian-keyring-gpg/0xC6875F3541CEFDE0
+++ b/debian-keyring-gpg/0xC6875F3541CEFDE0
Binary files differ
diff --git a/debian-keyring-gpg/0xC6B8598485522E2D b/debian-keyring-gpg/0xC6B8598485522E2D
index eea2c90..bc713e4 100644
--- a/debian-keyring-gpg/0xC6B8598485522E2D
+++ b/debian-keyring-gpg/0xC6B8598485522E2D
Binary files differ
diff --git a/debian-keyring-gpg/0xCC65B0CDEC275D5B b/debian-keyring-gpg/0xCC65B0CDEC275D5B
index 4f707ec..f296a54 100644
--- a/debian-keyring-gpg/0xCC65B0CDEC275D5B
+++ b/debian-keyring-gpg/0xCC65B0CDEC275D5B
Binary files differ
diff --git a/debian-keyring-gpg/0xCCD2ED94D21739E9 b/debian-keyring-gpg/0xCCD2ED94D21739E9
index 003fa62..bcd3031 100644
--- a/debian-keyring-gpg/0xCCD2ED94D21739E9
+++ b/debian-keyring-gpg/0xCCD2ED94D21739E9
Binary files differ
diff --git a/debian-keyring-gpg/0xCEAE6AD3AFE826FB b/debian-keyring-gpg/0xCEAE6AD3AFE826FB
index 17448f0..234a9b0 100644
--- a/debian-keyring-gpg/0xCEAE6AD3AFE826FB
+++ b/debian-keyring-gpg/0xCEAE6AD3AFE826FB
Binary files differ
diff --git a/debian-keyring-gpg/0xD0178C767D069EE6 b/debian-keyring-gpg/0xD0178C767D069EE6
index fbca1cd..93e7b64 100644
--- a/debian-keyring-gpg/0xD0178C767D069EE6
+++ b/debian-keyring-gpg/0xD0178C767D069EE6
Binary files differ
diff --git a/debian-keyring-gpg/0xD15D313882004173 b/debian-keyring-gpg/0xD15D313882004173
index a1e11c7..a9ccd6b 100644
--- a/debian-keyring-gpg/0xD15D313882004173
+++ b/debian-keyring-gpg/0xD15D313882004173
Binary files differ
diff --git a/debian-keyring-gpg/0xD4F219BFEC998489 b/debian-keyring-gpg/0xD4F219BFEC998489
index 926c0d7..01e8422 100644
--- a/debian-keyring-gpg/0xD4F219BFEC998489
+++ b/debian-keyring-gpg/0xD4F219BFEC998489
Binary files differ
diff --git a/debian-keyring-gpg/0xD5FDFC156168BF60 b/debian-keyring-gpg/0xD5FDFC156168BF60
index c88616e..87bc404 100644
--- a/debian-keyring-gpg/0xD5FDFC156168BF60
+++ b/debian-keyring-gpg/0xD5FDFC156168BF60
Binary files differ
diff --git a/debian-keyring-gpg/0xD7884C4718E18F44 b/debian-keyring-gpg/0xD7884C4718E18F44
deleted file mode 100644
index 309742d..0000000
--- a/debian-keyring-gpg/0xD7884C4718E18F44
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0xD929F2992BEF0A33 b/debian-keyring-gpg/0xD929F2992BEF0A33
index 657f30a..7179853 100644
--- a/debian-keyring-gpg/0xD929F2992BEF0A33
+++ b/debian-keyring-gpg/0xD929F2992BEF0A33
Binary files differ
diff --git a/debian-keyring-gpg/0xD9817E8FDF69C32E b/debian-keyring-gpg/0xD9817E8FDF69C32E
deleted file mode 100644
index 6911a4e..0000000
--- a/debian-keyring-gpg/0xD9817E8FDF69C32E
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0xDA82830E3CCC3A3A b/debian-keyring-gpg/0xDA82830E3CCC3A3A
index 5d12710..b87cc03 100644
--- a/debian-keyring-gpg/0xDA82830E3CCC3A3A
+++ b/debian-keyring-gpg/0xDA82830E3CCC3A3A
Binary files differ
diff --git a/debian-keyring-gpg/0xDD29F88442839ED3 b/debian-keyring-gpg/0xDD29F88442839ED3
index 9a62c05..35e633c 100644
--- a/debian-keyring-gpg/0xDD29F88442839ED3
+++ b/debian-keyring-gpg/0xDD29F88442839ED3
Binary files differ
diff --git a/debian-keyring-gpg/0xDECA0C9D30ED9FE3 b/debian-keyring-gpg/0xDECA0C9D30ED9FE3
new file mode 100644
index 0000000..1514405
--- /dev/null
+++ b/debian-keyring-gpg/0xDECA0C9D30ED9FE3
Binary files differ
diff --git a/debian-keyring-gpg/0xDECF849AA6357FB7 b/debian-keyring-gpg/0xDECF849AA6357FB7
index 1e92dc4..ad503e8 100644
--- a/debian-keyring-gpg/0xDECF849AA6357FB7
+++ b/debian-keyring-gpg/0xDECF849AA6357FB7
Binary files differ
diff --git a/debian-keyring-gpg/0xDF6D76C44D696F6B b/debian-keyring-gpg/0xDF6D76C44D696F6B
index 8d37b7b..b84cf3f 100644
--- a/debian-keyring-gpg/0xDF6D76C44D696F6B
+++ b/debian-keyring-gpg/0xDF6D76C44D696F6B
Binary files differ
diff --git a/debian-keyring-gpg/0xDFC671EEB333FA25 b/debian-keyring-gpg/0xDFC671EEB333FA25
index e6c3b96..e890380 100644
--- a/debian-keyring-gpg/0xDFC671EEB333FA25
+++ b/debian-keyring-gpg/0xDFC671EEB333FA25
Binary files differ
diff --git a/debian-keyring-gpg/0xE523F220AC8DFBD0 b/debian-keyring-gpg/0xE523F220AC8DFBD0
index 00b0574..373d762 100644
--- a/debian-keyring-gpg/0xE523F220AC8DFBD0
+++ b/debian-keyring-gpg/0xE523F220AC8DFBD0
Binary files differ
diff --git a/debian-keyring-gpg/0xE63716F4E069949E b/debian-keyring-gpg/0xE63716F4E069949E
index 4ab042d..9cc4669 100644
--- a/debian-keyring-gpg/0xE63716F4E069949E
+++ b/debian-keyring-gpg/0xE63716F4E069949E
Binary files differ
diff --git a/debian-keyring-gpg/0xE6FFF1E38DC968B0 b/debian-keyring-gpg/0xE6FFF1E38DC968B0
index 92a5a45..c2bd794 100644
--- a/debian-keyring-gpg/0xE6FFF1E38DC968B0
+++ b/debian-keyring-gpg/0xE6FFF1E38DC968B0
Binary files differ
diff --git a/debian-keyring-gpg/0xEBB31A62C85D8F71 b/debian-keyring-gpg/0xEBB31A62C85D8F71
index 6e32ee2..43b5f4b 100644
--- a/debian-keyring-gpg/0xEBB31A62C85D8F71
+++ b/debian-keyring-gpg/0xEBB31A62C85D8F71
Binary files differ
diff --git a/debian-keyring-gpg/0xEBF67A846AABE354 b/debian-keyring-gpg/0xEBF67A846AABE354
index d0ca025..b5b71fc 100644
--- a/debian-keyring-gpg/0xEBF67A846AABE354
+++ b/debian-keyring-gpg/0xEBF67A846AABE354
Binary files differ
diff --git a/debian-keyring-gpg/0xEC63699779074FA8 b/debian-keyring-gpg/0xEC63699779074FA8
index 6c0856d..a98e794 100644
--- a/debian-keyring-gpg/0xEC63699779074FA8
+++ b/debian-keyring-gpg/0xEC63699779074FA8
Binary files differ
diff --git a/debian-keyring-gpg/0xED0DD3368DE40924 b/debian-keyring-gpg/0xED0DD3368DE40924
index a230c66..58003f1 100644
--- a/debian-keyring-gpg/0xED0DD3368DE40924
+++ b/debian-keyring-gpg/0xED0DD3368DE40924
Binary files differ
diff --git a/debian-keyring-gpg/0xF1A69BE429C0FFEE b/debian-keyring-gpg/0xF1A69BE429C0FFEE
index 7115814..84e2b5e 100644
--- a/debian-keyring-gpg/0xF1A69BE429C0FFEE
+++ b/debian-keyring-gpg/0xF1A69BE429C0FFEE
Binary files differ
diff --git a/debian-keyring-gpg/0xF53E93AF3DED42EB b/debian-keyring-gpg/0xF53E93AF3DED42EB
index c0ca403..23e3995 100644
--- a/debian-keyring-gpg/0xF53E93AF3DED42EB
+++ b/debian-keyring-gpg/0xF53E93AF3DED42EB
Binary files differ
diff --git a/debian-keyring-gpg/0xF5C83C05D9CEEEEE b/debian-keyring-gpg/0xF5C83C05D9CEEEEE
index 77f4c6c..cafff02 100644
--- a/debian-keyring-gpg/0xF5C83C05D9CEEEEE
+++ b/debian-keyring-gpg/0xF5C83C05D9CEEEEE
Binary files differ
diff --git a/debian-keyring-gpg/0xF6D3495BB0AE9A02 b/debian-keyring-gpg/0xF6D3495BB0AE9A02
index 123acaa..7d4d4d5 100644
--- a/debian-keyring-gpg/0xF6D3495BB0AE9A02
+++ b/debian-keyring-gpg/0xF6D3495BB0AE9A02
Binary files differ
diff --git a/debian-keyring-gpg/0xF823A2729883C97C b/debian-keyring-gpg/0xF823A2729883C97C
index 6d464cc..6e91550 100644
--- a/debian-keyring-gpg/0xF823A2729883C97C
+++ b/debian-keyring-gpg/0xF823A2729883C97C
Binary files differ
diff --git a/debian-keyring-gpg/0xFA643BA61D227AFB b/debian-keyring-gpg/0xFA643BA61D227AFB
index cd752a6..4ce68cd 100644
--- a/debian-keyring-gpg/0xFA643BA61D227AFB
+++ b/debian-keyring-gpg/0xFA643BA61D227AFB
Binary files differ
diff --git a/debian-keyring-gpg/0xFC0DB1BBCD460BDE b/debian-keyring-gpg/0xFC0DB1BBCD460BDE
index 463232b..00a3d41 100644
--- a/debian-keyring-gpg/0xFC0DB1BBCD460BDE
+++ b/debian-keyring-gpg/0xFC0DB1BBCD460BDE
Binary files differ
diff --git a/debian-keyring-gpg/0xFFCE1C9A4FADF197 b/debian-keyring-gpg/0xFFCE1C9A4FADF197
index 498d5ef..a707893 100644
--- a/debian-keyring-gpg/0xFFCE1C9A4FADF197
+++ b/debian-keyring-gpg/0xFFCE1C9A4FADF197
Binary files differ
diff --git a/debian-maintainers-gpg/0x015F4DD4A70FB705 b/debian-maintainers-gpg/0x015F4DD4A70FB705
index 2d3b78b..d792cf2 100644
--- a/debian-maintainers-gpg/0x015F4DD4A70FB705
+++ b/debian-maintainers-gpg/0x015F4DD4A70FB705
Binary files differ
diff --git a/debian-maintainers-gpg/0x03A1FB7A1904771B b/debian-maintainers-gpg/0x03A1FB7A1904771B
index a83720e..01a0c47 100644
--- a/debian-maintainers-gpg/0x03A1FB7A1904771B
+++ b/debian-maintainers-gpg/0x03A1FB7A1904771B
Binary files differ
diff --git a/debian-maintainers-gpg/0x04C53BD7FE030551 b/debian-maintainers-gpg/0x04C53BD7FE030551
index c6f551b..19665eb 100644
--- a/debian-maintainers-gpg/0x04C53BD7FE030551
+++ b/debian-maintainers-gpg/0x04C53BD7FE030551
Binary files differ
diff --git a/debian-maintainers-gpg/0x0CB18E521B24F3FF b/debian-maintainers-gpg/0x0CB18E521B24F3FF
index 067be8c..57a3a2c 100644
--- a/debian-maintainers-gpg/0x0CB18E521B24F3FF
+++ b/debian-maintainers-gpg/0x0CB18E521B24F3FF
Binary files differ
diff --git a/debian-maintainers-gpg/0x0D442664194974E2 b/debian-maintainers-gpg/0x0D442664194974E2
new file mode 100644
index 0000000..9288284
--- /dev/null
+++ b/debian-maintainers-gpg/0x0D442664194974E2
Binary files differ
diff --git a/debian-maintainers-gpg/0x1762E0227034CF84 b/debian-maintainers-gpg/0x1762E0227034CF84
index 7492172..85453c8 100644
--- a/debian-maintainers-gpg/0x1762E0227034CF84
+++ b/debian-maintainers-gpg/0x1762E0227034CF84
Binary files differ
diff --git a/debian-maintainers-gpg/0x1C01F443C9C93C5A b/debian-maintainers-gpg/0x1C01F443C9C93C5A
index ef05117..c0eafdc 100644
--- a/debian-maintainers-gpg/0x1C01F443C9C93C5A
+++ b/debian-maintainers-gpg/0x1C01F443C9C93C5A
Binary files differ
diff --git a/debian-maintainers-gpg/0x1E759A726A9FDD74 b/debian-maintainers-gpg/0x1E759A726A9FDD74
index 524027a..cfe0af8 100644
--- a/debian-maintainers-gpg/0x1E759A726A9FDD74
+++ b/debian-maintainers-gpg/0x1E759A726A9FDD74
Binary files differ
diff --git a/debian-maintainers-gpg/0x1EEF53D38A3A9C67 b/debian-maintainers-gpg/0x1EEF53D38A3A9C67
index 53dd58b..12f487a 100644
--- a/debian-maintainers-gpg/0x1EEF53D38A3A9C67
+++ b/debian-maintainers-gpg/0x1EEF53D38A3A9C67
Binary files differ
diff --git a/debian-maintainers-gpg/0x28D9A6F364EB7512 b/debian-maintainers-gpg/0x28D9A6F364EB7512
index b701337..65a6e67 100644
--- a/debian-maintainers-gpg/0x28D9A6F364EB7512
+++ b/debian-maintainers-gpg/0x28D9A6F364EB7512
Binary files differ
diff --git a/debian-maintainers-gpg/0x3798AF15A1565658 b/debian-maintainers-gpg/0x3798AF15A1565658
index 256b6f2..2018657 100644
--- a/debian-maintainers-gpg/0x3798AF15A1565658
+++ b/debian-maintainers-gpg/0x3798AF15A1565658
Binary files differ
diff --git a/debian-maintainers-gpg/0x40BFEE868B055D9A b/debian-maintainers-gpg/0x40BFEE868B055D9A
index 9b2ac25..ec97bc4 100644
--- a/debian-maintainers-gpg/0x40BFEE868B055D9A
+++ b/debian-maintainers-gpg/0x40BFEE868B055D9A
Binary files differ
diff --git a/debian-maintainers-gpg/0x48D19F46BC99C9B7 b/debian-maintainers-gpg/0x48D19F46BC99C9B7
new file mode 100644
index 0000000..e380e92
--- /dev/null
+++ b/debian-maintainers-gpg/0x48D19F46BC99C9B7
Binary files differ
diff --git a/debian-maintainers-gpg/0x500398DF5AB387D3 b/debian-maintainers-gpg/0x500398DF5AB387D3
index 9363085..eee9b96 100644
--- a/debian-maintainers-gpg/0x500398DF5AB387D3
+++ b/debian-maintainers-gpg/0x500398DF5AB387D3
Binary files differ
diff --git a/debian-maintainers-gpg/0x554297EDF9CCA585 b/debian-maintainers-gpg/0x554297EDF9CCA585
index 1323458..8b7ee16 100644
--- a/debian-maintainers-gpg/0x554297EDF9CCA585
+++ b/debian-maintainers-gpg/0x554297EDF9CCA585
Binary files differ
diff --git a/debian-maintainers-gpg/0x5A8830475F7D1061 b/debian-maintainers-gpg/0x5A8830475F7D1061
index cbc0f26..0d5637b 100644
--- a/debian-maintainers-gpg/0x5A8830475F7D1061
+++ b/debian-maintainers-gpg/0x5A8830475F7D1061
Binary files differ
diff --git a/debian-maintainers-gpg/0x5B019455E2B84FA5 b/debian-maintainers-gpg/0x5B019455E2B84FA5
index a0fb563..e8ad53c 100644
--- a/debian-maintainers-gpg/0x5B019455E2B84FA5
+++ b/debian-maintainers-gpg/0x5B019455E2B84FA5
Binary files differ
diff --git a/debian-maintainers-gpg/0x5C5245265C413520 b/debian-maintainers-gpg/0x5C5245265C413520
index dca8fc1..e74c82c 100644
--- a/debian-maintainers-gpg/0x5C5245265C413520
+++ b/debian-maintainers-gpg/0x5C5245265C413520
Binary files differ
diff --git a/debian-maintainers-gpg/0x612EF1613E050F54 b/debian-maintainers-gpg/0x612EF1613E050F54
index 15d5863..2bd2b61 100644
--- a/debian-maintainers-gpg/0x612EF1613E050F54
+++ b/debian-maintainers-gpg/0x612EF1613E050F54
Binary files differ
diff --git a/debian-maintainers-gpg/0x689A04020D7EA9A1 b/debian-maintainers-gpg/0x689A04020D7EA9A1
new file mode 100644
index 0000000..4c17c44
--- /dev/null
+++ b/debian-maintainers-gpg/0x689A04020D7EA9A1
Binary files differ
diff --git a/debian-maintainers-gpg/0x7541CFAAFC35EACF b/debian-maintainers-gpg/0x7541CFAAFC35EACF
new file mode 100644
index 0000000..1467100
--- /dev/null
+++ b/debian-maintainers-gpg/0x7541CFAAFC35EACF
Binary files differ
diff --git a/debian-maintainers-gpg/0x77C0C75E7B650808 b/debian-maintainers-gpg/0x77C0C75E7B650808
index e21e49d..5c2e83c 100644
--- a/debian-maintainers-gpg/0x77C0C75E7B650808
+++ b/debian-maintainers-gpg/0x77C0C75E7B650808
Binary files differ
diff --git a/debian-maintainers-gpg/0x79C43E620B039B35 b/debian-maintainers-gpg/0x79C43E620B039B35
index 67c48b9..4c22a16 100644
--- a/debian-maintainers-gpg/0x79C43E620B039B35
+++ b/debian-maintainers-gpg/0x79C43E620B039B35
Binary files differ
diff --git a/debian-maintainers-gpg/0x8B3D867C823E7A61 b/debian-maintainers-gpg/0x8B3D867C823E7A61
index b95ecb0..27318bb 100644
--- a/debian-maintainers-gpg/0x8B3D867C823E7A61
+++ b/debian-maintainers-gpg/0x8B3D867C823E7A61
Binary files differ
diff --git a/debian-maintainers-gpg/0x8F32B4422F52107F b/debian-maintainers-gpg/0x8F32B4422F52107F
index 8e10ea0..276d4cf 100644
--- a/debian-maintainers-gpg/0x8F32B4422F52107F
+++ b/debian-maintainers-gpg/0x8F32B4422F52107F
Binary files differ
diff --git a/debian-maintainers-gpg/0x94842BC86E511C31 b/debian-maintainers-gpg/0x94842BC86E511C31
index 28f24e3..4251e93 100644
--- a/debian-maintainers-gpg/0x94842BC86E511C31
+++ b/debian-maintainers-gpg/0x94842BC86E511C31
Binary files differ
diff --git a/debian-maintainers-gpg/0x9866E4A9EC1663E5 b/debian-maintainers-gpg/0x9866E4A9EC1663E5
index 9789e10..9ca63af 100644
--- a/debian-maintainers-gpg/0x9866E4A9EC1663E5
+++ b/debian-maintainers-gpg/0x9866E4A9EC1663E5
Binary files differ
diff --git a/debian-maintainers-gpg/0x9B2E6B82752DB03B b/debian-maintainers-gpg/0x9B2E6B82752DB03B
index 97a8752..77c8479 100644
--- a/debian-maintainers-gpg/0x9B2E6B82752DB03B
+++ b/debian-maintainers-gpg/0x9B2E6B82752DB03B
Binary files differ
diff --git a/debian-maintainers-gpg/0xAEC2DF8E23BE7E38 b/debian-maintainers-gpg/0xAEC2DF8E23BE7E38
new file mode 100644
index 0000000..5be7519
--- /dev/null
+++ b/debian-maintainers-gpg/0xAEC2DF8E23BE7E38
Binary files differ
diff --git a/debian-maintainers-gpg/0xB195E1C4779BA9B2 b/debian-maintainers-gpg/0xB195E1C4779BA9B2
new file mode 100644
index 0000000..73a11ba
--- /dev/null
+++ b/debian-maintainers-gpg/0xB195E1C4779BA9B2
Binary files differ
diff --git a/debian-maintainers-gpg/0xC6079EAD0F1F7C52 b/debian-maintainers-gpg/0xC6079EAD0F1F7C52
index d4607ed..9ac5ba2 100644
--- a/debian-maintainers-gpg/0xC6079EAD0F1F7C52
+++ b/debian-maintainers-gpg/0xC6079EAD0F1F7C52
Binary files differ
diff --git a/debian-maintainers-gpg/0xC654FB332AD59860 b/debian-maintainers-gpg/0xC654FB332AD59860
index 6190fb7..301d0b3 100644
--- a/debian-maintainers-gpg/0xC654FB332AD59860
+++ b/debian-maintainers-gpg/0xC654FB332AD59860
Binary files differ
diff --git a/debian-maintainers-gpg/0xC89D5712DF945F6F b/debian-maintainers-gpg/0xC89D5712DF945F6F
new file mode 100644
index 0000000..7dc0a9e
--- /dev/null
+++ b/debian-maintainers-gpg/0xC89D5712DF945F6F
Binary files differ
diff --git a/debian-maintainers-gpg/0xC9B0AC74C72B5836 b/debian-maintainers-gpg/0xC9B0AC74C72B5836
index 8782709..8d2773b 100644
--- a/debian-maintainers-gpg/0xC9B0AC74C72B5836
+++ b/debian-maintainers-gpg/0xC9B0AC74C72B5836
Binary files differ
diff --git a/debian-maintainers-gpg/0xCA8D40019EBD4E93 b/debian-maintainers-gpg/0xCA8D40019EBD4E93
new file mode 100644
index 0000000..3a2b9ec
--- /dev/null
+++ b/debian-maintainers-gpg/0xCA8D40019EBD4E93
Binary files differ
diff --git a/debian-maintainers-gpg/0xCF0E265B7DFBB2F2 b/debian-maintainers-gpg/0xCF0E265B7DFBB2F2
index 08603bc..3613eb6 100644
--- a/debian-maintainers-gpg/0xCF0E265B7DFBB2F2
+++ b/debian-maintainers-gpg/0xCF0E265B7DFBB2F2
Binary files differ
diff --git a/debian-maintainers-gpg/0xD25D611C8E192076 b/debian-maintainers-gpg/0xD25D611C8E192076
index 370bd3f..1d4bc85 100644
--- a/debian-maintainers-gpg/0xD25D611C8E192076
+++ b/debian-maintainers-gpg/0xD25D611C8E192076
Binary files differ
diff --git a/debian-maintainers-gpg/0xED34CEABE27BAABC b/debian-maintainers-gpg/0xED34CEABE27BAABC
index 555aa4d..dd7a8d9 100644
--- a/debian-maintainers-gpg/0xED34CEABE27BAABC
+++ b/debian-maintainers-gpg/0xED34CEABE27BAABC
Binary files differ
diff --git a/debian-maintainers-gpg/0xF095F7BB018FE2B3 b/debian-maintainers-gpg/0xF095F7BB018FE2B3
index c9741ee..45a9fe6 100644
--- a/debian-maintainers-gpg/0xF095F7BB018FE2B3
+++ b/debian-maintainers-gpg/0xF095F7BB018FE2B3
Binary files differ
diff --git a/debian-nonupload-gpg/0x7A749064D38F11A3 b/debian-nonupload-gpg/0x7A749064D38F11A3
index 8336c8b..c60f741 100644
--- a/debian-nonupload-gpg/0x7A749064D38F11A3
+++ b/debian-nonupload-gpg/0x7A749064D38F11A3
Binary files differ
diff --git a/debian-keyring-gpg/0x7FD9FCCB000BEEEE b/debian-nonupload-gpg/0x7FD9FCCB000BEEEE
index c1738ee..c1738ee 100644
--- a/debian-keyring-gpg/0x7FD9FCCB000BEEEE
+++ b/debian-nonupload-gpg/0x7FD9FCCB000BEEEE
Binary files differ
diff --git a/debian-nonupload-gpg/0xDB686C92D9D59F61 b/debian-nonupload-gpg/0xDB686C92D9D59F61
index db432be..6e9e762 100644
--- a/debian-nonupload-gpg/0xDB686C92D9D59F61
+++ b/debian-nonupload-gpg/0xDB686C92D9D59F61
Binary files differ
diff --git a/debian-nonupload-gpg/0xE5EC4AC9BD627B05 b/debian-nonupload-gpg/0xE5EC4AC9BD627B05
index 71b0a1f..02efe37 100644
--- a/debian-nonupload-gpg/0xE5EC4AC9BD627B05
+++ b/debian-nonupload-gpg/0xE5EC4AC9BD627B05
Binary files differ
diff --git a/debian-nonupload-gpg/0xF22674467E4AF4A3 b/debian-nonupload-gpg/0xF22674467E4AF4A3
index 69b32de..cfa6aa2 100644
--- a/debian-nonupload-gpg/0xF22674467E4AF4A3
+++ b/debian-nonupload-gpg/0xF22674467E4AF4A3
Binary files differ
diff --git a/debian-keyring-gpg/0x12D34B8B656AE027 b/emeritus-keyring-gpg/0x12D34B8B656AE027
index 5da243c..5da243c 100644
--- a/debian-keyring-gpg/0x12D34B8B656AE027
+++ b/emeritus-keyring-gpg/0x12D34B8B656AE027
Binary files differ
diff --git a/debian-keyring-gpg/0x1885AD387D42F16E b/emeritus-keyring-gpg/0x1885AD387D42F16E
index 328c686..328c686 100644
--- a/debian-keyring-gpg/0x1885AD387D42F16E
+++ b/emeritus-keyring-gpg/0x1885AD387D42F16E
Binary files differ
diff --git a/debian-keyring-gpg/0x296A6F97E15ED335 b/emeritus-keyring-gpg/0x296A6F97E15ED335
index 8706b9d..8706b9d 100644
--- a/debian-keyring-gpg/0x296A6F97E15ED335
+++ b/emeritus-keyring-gpg/0x296A6F97E15ED335
Binary files differ
diff --git a/debian-keyring-gpg/0x72AF46E6E541A5A2 b/emeritus-keyring-gpg/0x72AF46E6E541A5A2
index 93c649b..93c649b 100644
--- a/debian-keyring-gpg/0x72AF46E6E541A5A2
+++ b/emeritus-keyring-gpg/0x72AF46E6E541A5A2
Binary files differ
diff --git a/debian-keyring-gpg/0x8E16B90AD6A6121C b/emeritus-keyring-gpg/0x8E16B90AD6A6121C
index af5fcbe..af5fcbe 100644
--- a/debian-keyring-gpg/0x8E16B90AD6A6121C
+++ b/emeritus-keyring-gpg/0x8E16B90AD6A6121C
Binary files differ
diff --git a/debian-keyring-gpg/0xAFCA65A20657A610 b/emeritus-keyring-gpg/0xAFCA65A20657A610
index 113b348..113b348 100644
--- a/debian-keyring-gpg/0xAFCA65A20657A610
+++ b/emeritus-keyring-gpg/0xAFCA65A20657A610
Binary files differ
diff --git a/debian-keyring-gpg/0xB11BD919079A3B98 b/emeritus-keyring-gpg/0xB11BD919079A3B98
index 4938090..4938090 100644
--- a/debian-keyring-gpg/0xB11BD919079A3B98
+++ b/emeritus-keyring-gpg/0xB11BD919079A3B98
Binary files differ
diff --git a/debian-keyring-gpg/0xBE5CF687DC5AB7C2 b/emeritus-keyring-gpg/0xBE5CF687DC5AB7C2
index 38e8e25..38e8e25 100644
--- a/debian-keyring-gpg/0xBE5CF687DC5AB7C2
+++ b/emeritus-keyring-gpg/0xBE5CF687DC5AB7C2
Binary files differ
diff --git a/debian-keyring-gpg/0xEB70FEF3CDFC6E4F b/emeritus-keyring-gpg/0xEB70FEF3CDFC6E4F
index cc9be06..cc9be06 100644
--- a/debian-keyring-gpg/0xEB70FEF3CDFC6E4F
+++ b/emeritus-keyring-gpg/0xEB70FEF3CDFC6E4F
Binary files differ
diff --git a/debian-keyring-gpg/0xF3AC49989AD13245 b/emeritus-keyring-gpg/0xF3AC49989AD13245
index b36e915..b36e915 100644
--- a/debian-keyring-gpg/0xF3AC49989AD13245
+++ b/emeritus-keyring-gpg/0xF3AC49989AD13245
Binary files differ
diff --git a/keyids b/keyids
index fb9732e..92e80be 100644
--- a/keyids
+++ b/keyids
@@ -145,6 +145,7 @@
0x0D06A759E6D38790 Niko Tyni <ntyni>
0x0D1B6F07658CB036 Reinhard Tartler <siretart>
0x0D2156BD3D97C149 Michael Stone <mstone>
+0x0D442664194974E2 Pierre-Elliott Bécue <peb>
0x0D46FE7CD21DF495 Brian Ristuccia <brianr>
0x0D4E7DC3FDB4E459 Julian Gilbey <jdg>
0x0D6527474CDC3EC9 Chu-yeon Park <kokids>
@@ -272,6 +273,7 @@
0x1962765BB9A8BACA Hugo Lefeuvre <hle>
0x19814D3E1F4986B8 Matt Brubeck <mbrubeck>
0x19874B18121379F6 Magnus Ekdahl <magnus>
+0x1988BAC881E23B3C Marco Túlio Gontijo e Silva <marcot>
0x19B267802103329F Patrick Ouellette <pouelle>
0x19B5E6C862191001 Dominique Belhachemi <domibel>
0x19E7BB9523D678A9 Igor Grobman <igor>
@@ -448,7 +450,6 @@
0x2BC8401620687895 Daniel Silverstone <dsilvers>
0x2BDCB21F8A04D15D Ossama Othman <ossama>
0x2BF8D9FE074BCDE4 Thomas Lange <lange>
-0x2BF8D9FE074BCDE4 Thomas Lange <lange>
0x2BF8EE2B7F961564 Fabio Tranchitella <kobold>
0x2C045542C9B55DAC Ricardo Mones Lastra <mones>
0x2C0E8031F29C4A30 Mark Purcell <msp>
@@ -669,7 +670,6 @@
0x43225D698FC03128 Thomas Wana <greuff>
0x4330169952D556DB Ben Armstrong <synrg>
0x4353E1C2F2FDE839 Fredrick Paul Eisele <phreed>
-0x437FE24F9543CB69 Jean-Michel Kelbert <ke>
0x437FE24F9543CB69 Jean-Michel Kelbert <kelbert>
0x438F770EC8FA5258 Chris Davis <cd>
0x439A3BCCCEC0E929 Mark Ng <ng>
@@ -697,6 +697,7 @@
0x462E80ACB7D86E0F Chris Boyle <cmb>
0x464CCC80F2B1606C Daniel Stone <daniels>
0x464DE301B74952A9 Ho-seok Lee <alee>
+0x4664E07DBDA485C5 Benjamin Barenblat <bbaren>
0x46801517A1696D2B Laurent Fousse <lfousse>
0x468D9BDF4ED62BFE Remi Perrot <rperrot>
0x469CE4B521259621 Maitland Bottoms <bottoms>
@@ -712,6 +713,7 @@
0x4814DEC22B307C3C Jérémy Bobbio <lunar>
0x482D17E94DADEC2F David Moreno <damog>
0x48682904DEE27C7D Ondřej Čertík <certik>
+0x48D19F46BC99C9B7 Mark Lee Garrett <lee>
0x48F47C58D61C6283 Alakom-Zed Pobre <zed>
0x49086AD3EBE2F31F Luca Falavigna <dktrkranz>
0x491531552F1F1CBD Anselm Lingnau <lingnau>
@@ -739,6 +741,7 @@
0x4B077723929D42C3 Emmanuel Bouthenot <kolter>
0x4B4F5954E7C4D469 Craig Small <csmall>
0x4BA00E72145B6966 Robert Lemmen <robertle>
+0x4BC80A69432387E8 Santiago Ruano Rincón <santiago>
0x4BCD0567C296D05D Daniel Leidert <dleidert>
0x4BE0582590788E11 Jose Carlos Garcia Sogo <jsogo>
0x4BFCF6B817C37EC4 Martijn van de Streek <martijn>
@@ -859,7 +862,7 @@
0x575B95B25C33C1B8 Yann Dirson <dirson>
0x578A0494D1C646D1 Andreas Tille <tille>
0x578BD370AAA22456 Martín Ferrari <tincho>
-0x57930DAB0B86B067 Joost van Baal <joostvb>
+0x57930DAB0B86B067 Joost van Baal <joostvb>
0x579329D3C01B2A22 Mikael Hedin <micce>
0x57A37FBD51CF8417 Joerg Wendland <joergland>
0x57CCF4596A1353C2 Andrea Mennucc <mennucc1>
@@ -1044,6 +1047,7 @@
0x6B37E8DD34B36856 Jeff Breidenbach <jab>
0x6B4371A8DE656B05 Adam Heath <doogie>
0x6B720BE9C5CF6D9E Reinhard Tartler <siretart>
+0x6B7498FCB9B358AC Frédéric Bonnard <frediz>
0x6B982DEBBFE91C29 Christian Bayle <bayle>
0x6C11AECB677E8651 Steve Dunham <dunham>
0x6C41F15185417161 Joost Kooij <joost>
@@ -1162,7 +1166,6 @@
0x78494EF72375A66C Giovani Augusto Ferreira <giovani>
0x7853DA4D49881AD3 Stéphane Glondu <glondu>
0x7867D53C747935DD Cyril Brulebois <kibi>
-0x786C36BB363CCD95 Debian Security Contact
0x78844BE847951BD0 Bradley Marshall <bradm>
0x78963B4BDF56FFF2 Mattias Ellert <ellert>
0x789D6F057FD863FE Salvatore Bonaccorso <carnil>
@@ -1285,6 +1288,7 @@
0x8382C95C29023DF9 Jérémy Bobbio <lunar>
0x83B4B2DC119A098F Ardo van Rangelrooij <ardo>
0x83C07215CDBDBCE2 Shachar Shemesh <shachar>
+0x83E33BD7D4DD4CA1 Jerome Charaoui <lavamind>
0x83E7EA669A19CB94 Matthieu Caneill <matthieucan>
0x83FD1C4682D138E0 Tobias Quathamer <toddy>
0x83FFC87BD02F8773 Angus Lees <gus>
@@ -1316,6 +1320,7 @@
0x8607903DBDF0AAD0 Shigeo Noshiro <noshiro>
0x86200551AA79B91A Charles Fry <cfry>
0x86464F59104378F1 Erich Schubert <erich>
+0x86561F452180FCFE Michael Jeanson <mjeanson>
0x867BF9A9FBD3EB8E Robert Collins <robertc>
0x86E00D0C19A42D19 Dann Frazier <dannf>
0x86F5FB8791776115 Robert Lemmen <robertle>
@@ -1593,6 +1598,7 @@
0xA19F1243EC41269F Peter Eisentraut <petere>
0xA1B09B42333961E8 Evgeni Golov <evgeni>
0xA1B13F2C2C8B195A Peter Makholm <makholm>
+0xA1B986143704397B Nelson A. de Oliveira <naoliv>
0xA1BCBB2F306CDFF3 Alejandro Ríos Peña <alerios>
0xA1BE358ABD9CF744 Guido Witmond <guido>
0xA1E52A7E249BC034 René Mayrhofer <rmayr>
@@ -1831,7 +1837,6 @@
0xBB20AC20E0B7D6BE René Mayorga <rmayorga>
0xBB3A68018649AA06 Gregor Herrmann <gregoa>
0xBB41D45770EF06F7 Andy Simpkins <rattusrattus>
-0xBB41D45770EF06F7 Andy Simpkins <rattusrattus>
0xBB9D98D9DEA2C38E Robert Millan <rmh>
0xBBB1CEC3443AEA81 Steve Dobson (dobbo) <dobbo>
0xBBC17EBB1396F2F7 Stuart Prescott <stuart>
@@ -2206,6 +2211,7 @@
0xDE7AAF6E94C09C7F Peter Palfrader <weasel>
0xDE85C199300CBB5C David I. Lehn <dlehn>
0xDE9F93584D474C1B Mohammed Adnène Trojette <adn>
+0xDECA0C9D30ED9FE3 Elana Hashman <ehashman>
0xDECF849AA6357FB7 Tobias Frost <tobi>
0xDEE8043EE17EBB30 Rhonda D'Vine <rhonda>
0xDEEC8C09DE415B0E Susumu Osawa <susumuo>
diff --git a/scripts/process-rt b/scripts/process-rt
new file mode 100755
index 0000000..3efc49a
--- /dev/null
+++ b/scripts/process-rt
@@ -0,0 +1,522 @@
+#!/usr/bin/python3
+
+# Copyright (c) 2017 Jonathan McDowell <noodles@earth.li>
+# GNU GPL; v2 or later
+#
+# Process RT tickets for keyring-maint@debian as raised by the
+# nm.debian.org web interface
+
+# Semi-helpful gpgme/Python examples:
+# https://pypkg.com/pypi/gpg/f/examples/
+
+import datetime
+import gpg
+import io
+import os
+import pprint
+import re
+import requests
+import subprocess
+import sys
+from urllib.parse import urlencode
+
+debug = False
+RT_BASE_URL = 'https://rt.debian.org/REST/1.0/'
+KEYSERVER = 'the.earth.li:11371'
+DAM = ['enrico', 'joerg', 'jmw', 'myon']
+FD = DAM + ['noodles']
+
+# Try to find the keyring base directory, assuming we live in /scripts/
+basedir = os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))) + '/'
+if os.path.exists(basedir + 'debian-keyring-gpg'):
+ KEYRING_BASE_DIR = basedir
+else:
+ print("Can't find keyring directory.")
+ sys.exit(-1)
+GNUPG_HOME = KEYRING_BASE_DIR + 'gpghome/'
+
+# Maps roles to keyring directories
+role2keyring = {
+ 'DM': 'debian-maintainers-gpg',
+ 'DD': 'debian-keyring-gpg',
+ 'DN': 'debian-nonupload-gpg',
+ 'emeritus': 'emeritus-keyring-gpg',
+}
+
+# The keys must match nm2:backend/const.py:ALL_STATUS
+desc2role = {
+ 'Debian Developer, uploading': 'DD',
+ 'Debian Developer, non-uploading': 'DN',
+ 'Debian Maintainer': 'DM',
+ 'Debian Maintainer, with guest account': 'DM',
+ 'Debian Contributor': 'DC',
+ 'Debian Contributor, with guest account': 'DC',
+ 'Debian Developer, emeritus': 'emeritus',
+ 'Debian Developer, removed': 'removed',
+}
+
+# Global keyid to username/name dict
+keyids = {}
+
+
+def get_gpg_ctx(do_import=False):
+ """ Setup (if necessary) and return a GnuPG context
+
+ Checks if the private GnuPG home directory already exists. If not,
+ creates it and imports the DD + DN keyrings into it. Also configures
+ GnuPG to do clean imports (i.e. only include signatures that can be
+ verified).
+ """
+ if not os.path.isdir(GNUPG_HOME):
+ os.makedirs(GNUPG_HOME)
+ do_import = True
+
+ c = gpg.Context()
+
+ c.set_engine_info(gpg.constants.protocol.OpenPGP,
+ home_dir=GNUPG_HOME)
+
+ if do_import:
+ for keyring in ['debian-keyring', 'debian-nonupload']:
+ keyfile = KEYRING_BASE_DIR + 'output/keyrings/' + keyring + '.gpg'
+ if not os.path.exists(keyfile):
+ raise RuntimeError(keyfile + " does not exist. " +
+ "Need to run 'make'?")
+ keys = gpg.Data(file=keyfile)
+ c.op_import(keys)
+
+ with open(GNUPG_HOME + 'gpg.conf', 'w') as f:
+ f.write('import-options import-clean\n')
+
+ return c
+
+
+def fetch_key(ctx, fpr):
+ """Fetches the supplied fingerprint from a public keyserver
+
+ Does an HKP lookup for the supplied fingerprint, then imports it into
+ the current keyring. Then does an export (picking up any cleaning done
+ by the import) and returns the binary key data.
+
+ Note this function does not remove the key from the GnuPG keyring. If
+ the key is destined for the DM keyring, or subsequently not to be added,
+ it must be removed by the caller using delete_key().
+ """
+ url = "http://{server}/pks/lookup?{query}".format(
+ server=KEYSERVER,
+ query=urlencode({
+ "op": "get",
+ "search": "0x" + fpr,
+ "exact": "on",
+ }))
+ res = requests.get(url)
+ keytext = []
+ gotkey = False
+ for line in res.text.splitlines():
+ if line == "-----BEGIN PGP PUBLIC KEY BLOCK-----":
+ gotkey = True
+ if gotkey:
+ keytext.append(line)
+ if line == "-----END PGP PUBLIC KEY BLOCK-----":
+ break
+ if not gotkey:
+ raise RuntimeError('Failed to fetch key')
+
+ key = gpg.Data(string="\n".join(keytext))
+ ctx.op_import(key)
+
+ key = gpg.Data()
+ ctx.op_export(fpr, 0, key)
+ key.seek(0, os.SEEK_SET)
+ keydata = key.read()
+
+ return keydata
+
+
+def delete_key(ctx, fpr):
+ """Delete the key matching fpr from the GnuPG keyring"""
+ keys = list(ctx.keylist(fpr))
+ for k in keys:
+ ctx.op_delete(k, True)
+
+
+def read_keyids():
+ """Read the keyids file into a dict allowing a username/name mapping"""
+ with open(KEYRING_BASE_DIR + 'keyids', 'r') as f:
+ dds = f.readlines()
+ for dd in dds:
+ keyid = dd[2:18]
+ name = dd[19:dd.find('<') - 1]
+ username = dd[dd.find('<') + 1:]
+ username = username[:username.find('>')]
+ keyids[keyid] = {
+ 'name': name,
+ 'username': username,
+ }
+
+
+def write_keyids():
+ """Write the sorted keyids username/name dict out to the keyids file"""
+ with open(KEYRING_BASE_DIR + 'keyids', 'w') as f:
+ for key in sorted(keyids.keys()):
+ f.write("0x{} {} <{}>\n".format(key,
+ keyids[key]['name'],
+ keyids[key]['username']))
+
+
+def get_rt_auth():
+ """Attempt to locate a valid set of RT login details
+
+ Look for, and return, a set of RT login details. Uses RT_USER/RT_PASS
+ from the environment, failing back to ~/.rtrc if either is not set.
+ """
+ rt_user = None
+ rt_pass = None
+
+ if 'RT_USER' in os.environ:
+ rt_user = os.environ['RT_USER']
+ if 'RT_PASS' in os.environ:
+ rt_pass = os.environ['RT_PASS']
+
+ if not rt_user or not rt_pass:
+ with open(os.environ['HOME'] + '/.rtrc', 'r') as f:
+ for line in f:
+ if not rt_user and line.startswith('user '):
+ rt_user = line[5:].strip()
+ elif not rt_pass and line.startswith('passwd '):
+ rt_pass = line[7:].strip()
+
+ return (rt_user, rt_pass)
+
+
+def fetch_ticket(rtid):
+ (rt_user, rt_pass) = get_rt_auth()
+
+ args = {
+ 'params': {
+ 'user': rt_user,
+ 'pass': rt_pass,
+ }
+ }
+
+ print("Fetching ticket " + str(rtid))
+
+ # res = requests.post(RT_BASE_URL + 'ticket/' + str(rtid) + '/show',
+ # **args)
+ # Look for "Owner: Nobody" or "Owner: noodles"
+ # res = requests.post(RT_BASE_URL + 'ticket/' + str(rtid) + '/edit',
+ # **args)
+ # "content" variable = "Owner: noodles"
+
+ res = requests.post(RT_BASE_URL + 'ticket/' + str(rtid) + '/attachments',
+ **args)
+
+ # Validate the RT result
+ res_lines = res.text.splitlines()
+ ver, status, text = res_lines[0].split(None, 2)
+
+ if int(status) != 200:
+ print("RT status code is not 200", res_lines)
+ return
+
+ attachment = None
+ text = None
+ signature = None
+
+ for line in res_lines[2:]:
+ m = re.match('Attachments: (\d+):', line)
+ if m:
+ print('Attachment found, ' + m.group(1))
+ attachment = int(m.group(1))
+
+ if attachment:
+ res = requests.post(RT_BASE_URL + 'ticket/' + str(rtid) +
+ '/attachments/' + str(attachment),
+ **args)
+
+ # Validate the RT result
+ res_lines = res.text.splitlines()
+ ver, status, text = res_lines[0].split(None, 2)
+
+ if int(status) != 200:
+ print("RT status code is not 200", res_lines)
+
+ incontent = False
+ message = []
+ for line in res_lines[2:]:
+ if line.startswith('Content: '):
+ incontent = True
+ message.append(line[9:])
+ elif incontent and line.startswith(' '):
+ message.append(line[9:])
+ elif incontent:
+ incontent = False
+
+ with get_gpg_ctx() as c:
+ try:
+ text, result = c.verify(io.BytesIO(
+ "\n".join(message).encode('utf-8')))
+ except gpg.errors.GPGMEError:
+ return (None, None)
+ if result:
+ key = c.get_key(result.signatures[0].fpr)
+ # print(result.signatures[0].__str__())
+ for subkey in key.subkeys:
+ if subkey.fpr[24:] in keyids:
+ signature = keyids[subkey.fpr[24:]]['username']
+ print("Good signature from " + signature + " (" +
+ result.signatures[0].fpr + ")")
+ else:
+ print("Couldn't verify message.")
+
+ return (signature, text)
+
+
+def parse_ticket(text):
+ state = {}
+
+ for line in text.decode().split('\n'):
+ if line.startswith(' Key fingerprint: '):
+ if line[20:] != 'None':
+ state['keyid'] = line[20:]
+ elif line.startswith(' Username: '):
+ state['username'] = line[20:]
+ elif line.startswith(' Details: '):
+ state['details'] = line[20:]
+ elif line.startswith(' First name: '):
+ state['first'] = line[20:]
+ elif line.startswith(' Middle name: '):
+ state['middle'] = line[20:]
+ elif line.startswith(' Last name: '):
+ state['last'] = line[20:]
+ elif line.startswith(' Current status: '):
+ if line[20:] not in desc2role:
+ print('Unknown current status: ' + line[20:])
+ else:
+ state['current'] = desc2role[line[20:]]
+ elif line.startswith(' Target keyring: '):
+ if line[20:] not in desc2role:
+ print('Unknown destination status: ' + line[20:])
+ else:
+ state['dest'] = desc2role[line[20:]]
+
+ # Based on the current + target statuses work out if this is an add or
+ # remove.
+ if state['dest'] in ['DD', 'DM', 'DN']:
+ state['action'] = 'add'
+ state['role'] = state['dest']
+ elif state['dest'] in ['emeritus', 'removed']:
+ state['action'] = 'remove'
+ if 'current' in state:
+ state['role'] = state['current']
+ else:
+ # Assume DD -> removed as a fall back
+ state['role'] = 'DD'
+
+ # Collapse first/middle/last to a single name field
+ if 'first' in state and state['first'] != '-':
+ state['subject'] = state['first']
+ if 'middle' in state and state['middle'] != '-':
+ if 'subject' in state:
+ state['subject'] += ' ' + state['middle']
+ else:
+ state['subject'] = state['middle']
+ if 'last' in state and state['last'] != '-':
+ if 'subject' in state:
+ state['subject'] += ' ' + state['last']
+ else:
+ state['subject'] = state['last']
+
+ # Get the key length + type, plus signatures from other DDs
+ if 'keyid' in state:
+ with get_gpg_ctx() as c:
+ if state['action'] == 'add':
+ state['keydata'] = fetch_key(c, state['keyid'])
+ c.set_keylist_mode(gpg.constants.keylist.mode.SIGS)
+ key = c.get_key(state['keyid'])
+ for subkey in key.subkeys:
+ if subkey.fpr == state['keyid']:
+ state['keytype'] = str(subkey.length)
+ if subkey.pubkey_algo == gpg.constants.pk.RSA:
+ state['keytype'] += 'R'
+ elif subkey.pubkey_algo == gpg.constants.pk.DSA:
+ state['keytype'] += 'D'
+ elif subkey.pubkey_algo == gpg.constants.pk.ECC:
+ state['keytype'] += 'E'
+ elif subkey.pubkey_algo == gpg.constants.pk.ELG:
+ state['keytype'] += 'g'
+ else:
+ state['keytype'] += '?'
+
+ sigs = {}
+ for uid in key.uids:
+ # print(uid.name, uid.email)
+ if not uid.revoked:
+ for sig in uid.signatures:
+ if sig.keyid in keyids:
+ sigs[keyids[sig.keyid]['username']] = 1
+ # else:
+ # print("Skipping unknown ID " + sig.keyid)
+
+ if len(sigs) < 2:
+ raise RuntimeError('Insufficent key signatures')
+
+ for sig in sorted(sigs.keys()):
+ if 'certs' in state:
+ state['certs'] += ', ' + sig
+ else:
+ state['certs'] = sig
+
+ return state
+
+
+def do_action(state):
+ if state['action'] == 'remove':
+ if 'dest' in state and state['dest'] == 'emeritus':
+ subprocess.call(['git', 'mv', role2keyring[state['role']] + '/0x' +
+ state['keyid'][24:],
+ 'emeritus-keyring-gpg/'])
+ state['logmsg'] = ('Move 0x' + state['keyid'][24:] +
+ ' (' + state['subject'] + ') to ' +
+ 'emeritus (RT #' + state['rtid'] + ')')
+ else:
+ subprocess.call(['git', 'rm', role2keyring[state['role']] + '/0x' +
+ state['keyid'][24:]])
+ state['logmsg'] = ('Remove 0x' + state['keyid'][24:] +
+ ' (' + state['subject'] + ')' +
+ ' (RT #' + state['rtid'] + ')')
+ if state['role'] in ['DD', 'DN']:
+ with get_gpg_ctx() as c:
+ delete_key(c, state['keyid'])
+ elif state['action'] == 'add':
+ state['logmsg'] = ('Add new ' + state['dest'] + ' key 0x' +
+ state['keyid'][24:] + ' (' + state['subject'] +
+ ') (RT #' + state['rtid'] + ')')
+ # See if it's just a move from a different keyring
+ if state['current'] in role2keyring:
+ subprocess.call(['git', 'mv',
+ role2keyring[state['current']] + '/0x' +
+ state['keyid'][24:],
+ role2keyring[state['dest']]])
+ state['notes'] = 'Move from ' + state['current'] + ' keyring'
+ else:
+ keyfile = role2keyring[state['dest']] + '/0x' + state['keyid'][24:]
+ with open(keyfile, 'wb') as f:
+ f.write(state['keydata'])
+ subprocess.call(['git', 'add', keyfile])
+
+ # We don't keep DM keys in the our working keyring
+ if state['dest'] == 'DM':
+ with get_gpg_ctx() as c:
+ delete_key(c, state['keyid'])
+ keyids[state['keyid'][24:]] = {
+ 'name': state['subject'],
+ 'username': state['username'],
+ }
+ write_keyids()
+ subprocess.call(['git', 'add', 'keyids'])
+ else:
+ print("Don't know how to handle action: " + state['action'])
+
+
+def do_dch(state):
+ release = "unknown"
+ with open('debian/changelog', 'r') as f:
+ line = f.readline()
+ m = re.match("debian-keyring \((.*)\) (.*); urgency=", line)
+ version = m.group(1)
+ release = m.group(2)
+ if release == "UNRELEASED":
+ if debug:
+ print('dch --multimaint-merge -D UNRELEASED -a "' +
+ state['logmsg'] + '"')
+ else:
+ subprocess.call(['dch', '--multimaint-merge', '-D', 'UNRELEASED',
+ '-a', state['logmsg']])
+ elif release == "unstable":
+ newver = datetime.date.today().strftime("%Y.%m.xx")
+ if newver == version:
+ print(' * Warning: New version and previous released version are ')
+ print(' the same: ' + newver + '. This should not be so!')
+ print(' Check debian/changelog')
+ if debug:
+ print('dch -D UNRELEASED -v ' + newver + ' "' + state['logmsg'] +
+ '"')
+ else:
+ subprocess.call(['dch', '-D', 'UNRELEASED', '-v', newver,
+ state['logmsg']])
+ else:
+ print("Unknown changelog release: " + release)
+
+ if not debug:
+ subprocess.call(['git', 'add', 'debian/changelog'])
+
+
+def do_git_template(state):
+ with open('git-commit-template', 'w') as f:
+ f.write(state['logmsg'])
+ f.write('\n\n')
+ f.write("Action: " + state['action'] + "\n")
+ f.write("Subject: " + state['subject'] + "\n")
+ if 'username' in state:
+ f.write("Username: " + state['username'] + "\n")
+ f.write("Role: " + state['role'] + "\n")
+ f.write("Key: " + state['keyid'] + "\n")
+ f.write("Key-type: " + state['keytype'] + "\n")
+ f.write("RT-Ticket: " + state['rtid'] + "\n")
+ f.write("Request-signed-by: " + state['requester'] + "\n")
+ if state['action'] != 'remove':
+ prefix = 'Key-certified-by: '
+ prefixlen = len(prefix)
+ certs = state['certs']
+ while (len(certs) + prefixlen) > 72:
+ last = certs.rfind(',', 0, 72 - prefixlen) + 1
+ f.write(prefix + certs[:last] + "\n")
+ certs = certs[last:]
+ prefix = ' '
+ prefixlen = 1
+ f.write(prefix + certs + "\n")
+ if 'details' in state:
+ f.write("Details: " + state['details'] + "\n")
+ if state['role'] == 'DM' and 'agreement' in state:
+ f.write("Advocates:\n")
+ for a in state['advocates']:
+ f.write(" " + a + "\n")
+ f.write("Agreement: " + state['agreement'] + "\n")
+ f.write("BTS: " + state['bts'] + "\n")
+ if 'notes' in state:
+ f.write('Notes: ' + state['notes'] + '\n')
+
+
+if len(sys.argv) < 2:
+ print('Must supply RT ticket to process.')
+ sys.exit(-1)
+
+# Change to the keyring dir so that git etc work
+os.chdir(KEYRING_BASE_DIR)
+
+read_keyids()
+(requester, ticket) = fetch_ticket(sys.argv[1])
+if ticket is None:
+ print('No signature on ticket.')
+ sys.exit(-1)
+if requester is None:
+ print('Signature from unknown key.')
+ sys.exit(-1)
+state = parse_ticket(ticket)
+state['rtid'] = sys.argv[1]
+state['requester'] = requester
+if state['action'] == 'add':
+ if state['role'] == 'DM':
+ if requester not in FD:
+ print('Signature for DM add must come from Front Desk.')
+ sys.exit(-1)
+ elif requester not in DAM:
+ print('Signature for DD/DN add must come from DAM.')
+ sys.exit(-1)
+pp = pprint.PrettyPrinter()
+pp.pprint(state)
+# sys.exit(-1)
+do_action(state)
+do_dch(state)
+do_git_template(state)