summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-25 15:27:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-25 15:29:24 +0000
commit8f1b6b2efbc346d74e9f74278bac9973c18194f9 (patch)
treec29dfd7ce7c3e79316fd2d40fa1c7ef887b32292
parentReleasing progress-linux version 2017.11.24-0+dschinn1. (diff)
downloaddebian-keyring-8f1b6b2efbc346d74e9f74278bac9973c18194f9.zip
debian-keyring-8f1b6b2efbc346d74e9f74278bac9973c18194f9.tar.xz
Merging upstream version 2018.01.24.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--cheatsheets/infrastructure/git.txt6
-rw-r--r--debian-keyring-gpg/0x021B361B6B031B00bin79413 -> 81434 bytes
-rw-r--r--debian-keyring-gpg/0x049B1033AF060C5Abin91649 -> 93378 bytes
-rw-r--r--debian-keyring-gpg/0x06EAA066E397832Fbin364692 -> 368493 bytes
-rw-r--r--debian-keyring-gpg/0x0F56D0553B6D411Bbin71215 -> 85421 bytes
-rw-r--r--debian-keyring-gpg/0x14135D277B88D7E5bin66723 -> 71128 bytes
-rw-r--r--debian-keyring-gpg/0x16281F2E007C98D1bin65232 -> 67404 bytes
-rw-r--r--debian-keyring-gpg/0x17DC3CC470D4A979bin3444 -> 5073 bytes
-rw-r--r--debian-keyring-gpg/0x17FBDCBFD9928FF4bin12514 -> 18174 bytes
-rw-r--r--debian-keyring-gpg/0x1E08BF280CB9A31Abin8531 -> 8616 bytes
-rw-r--r--debian-keyring-gpg/0x1E759A726A9FDD74 (renamed from debian-maintainers-gpg/0x1E759A726A9FDD74)bin84981 -> 108503 bytes
-rw-r--r--debian-keyring-gpg/0x1E953E27D4311E58bin38103 -> 40367 bytes
-rw-r--r--debian-keyring-gpg/0x2064C53641C25E5Dbin69134 -> 70189 bytes
-rw-r--r--debian-keyring-gpg/0x223AE055BD94E154bin219809 -> 223067 bytes
-rw-r--r--debian-keyring-gpg/0x2C3B436FEAC68101bin27512 -> 29336 bytes
-rw-r--r--debian-keyring-gpg/0x2C7C3146C1A00121bin164178 -> 170670 bytes
-rw-r--r--debian-keyring-gpg/0x2EC0FFB3B7301B1Fbin25987 -> 27787 bytes
-rw-r--r--debian-keyring-gpg/0x310180050905E40Cbin69453 -> 71652 bytes
-rw-r--r--debian-keyring-gpg/0x3116BA5E9FFA69A3bin37811 -> 39587 bytes
-rw-r--r--debian-keyring-gpg/0x32247FBB40AD1FA6bin279245 -> 279863 bytes
-rw-r--r--debian-keyring-gpg/0x357312559D1E064Bbin62389 -> 65173 bytes
-rw-r--r--debian-keyring-gpg/0x3631D4FB7FF2B8B8bin13983 -> 16866 bytes
-rw-r--r--debian-keyring-gpg/0x3914B532F4DFBE99bin367721 -> 372065 bytes
-rw-r--r--debian-keyring-gpg/0x3FA78B77EB9B072Bbin9933 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0x44BB1BA79F6C6333bin29600 -> 35416 bytes
-rw-r--r--debian-keyring-gpg/0x4B043FCDB9444540bin89305 -> 92020 bytes
-rw-r--r--debian-keyring-gpg/0x4BC80A69432387E8bin7988 -> 15444 bytes
-rw-r--r--debian-keyring-gpg/0x4C5A6BAB12D2A7AEbin87345 -> 90510 bytes
-rw-r--r--debian-keyring-gpg/0x4F9F6D550ED6122Abin69056 -> 69599 bytes
-rw-r--r--debian-keyring-gpg/0x5394479DD3524C51bin155359 -> 157530 bytes
-rw-r--r--debian-keyring-gpg/0x5556A34E04A3610Bbin94755 -> 106233 bytes
-rw-r--r--debian-keyring-gpg/0x55C9882D999BBCC4bin114271 -> 117960 bytes
-rw-r--r--debian-keyring-gpg/0x5D328D082AAAB140bin144902 -> 147663 bytes
-rw-r--r--debian-keyring-gpg/0x5EE76EE20216D2A5bin34186 -> 38622 bytes
-rw-r--r--debian-keyring-gpg/0x62AF4031C82E0039bin193994 -> 197159 bytes
-rw-r--r--debian-keyring-gpg/0x634F4BD1E7AD5568bin266664 -> 270884 bytes
-rw-r--r--debian-keyring-gpg/0x6611C05EDD39F374bin19287 -> 21087 bytes
-rw-r--r--debian-keyring-gpg/0x664F1238AA8F138Abin33198 -> 39836 bytes
-rw-r--r--debian-keyring-gpg/0x69F30763DFEFC134bin37053 -> 39240 bytes
-rw-r--r--debian-keyring-gpg/0x6B7498FCB9B358ACbin4417 -> 5754 bytes
-rw-r--r--debian-keyring-gpg/0x6C6ACD6417B3ACB1bin51144 -> 58394 bytes
-rw-r--r--debian-keyring-gpg/0x6CACA448860CDC13bin23635 -> 25580 bytes
-rw-r--r--debian-keyring-gpg/0x7127E5ABEEF946C8bin6333 -> 4873 bytes
-rw-r--r--debian-keyring-gpg/0x74263B37F5B5F913bin57632 -> 70206 bytes
-rw-r--r--debian-keyring-gpg/0x759778A9A36B494Fbin70063 -> 71756 bytes
-rw-r--r--debian-keyring-gpg/0x762B57BB784206ADbin98258 -> 96730 bytes
-rw-r--r--debian-keyring-gpg/0x76B534B2E99007E0bin34428 -> 36325 bytes
-rw-r--r--debian-keyring-gpg/0x7731FCCC63E4E277bin65504 -> 67133 bytes
-rw-r--r--debian-keyring-gpg/0x7853DA4D49881AD3bin150923 -> 153638 bytes
-rw-r--r--debian-keyring-gpg/0x7C56ACFE947897D8bin237962 -> 239048 bytes
-rw-r--r--debian-keyring-gpg/0x7F6022516E869F64bin60192 -> 117007 bytes
-rw-r--r--debian-keyring-gpg/0x8062398983B2CF7Abin25456 -> 27245 bytes
-rw-r--r--debian-keyring-gpg/0x85199DE8C6648E90bin32155 -> 34985 bytes
-rw-r--r--debian-keyring-gpg/0x86561F452180FCFEbin25917 -> 29943 bytes
-rw-r--r--debian-keyring-gpg/0x872F702C4D6E25A8bin390988 -> 393703 bytes
-rw-r--r--debian-keyring-gpg/0x8CBF9A322861A790bin66240 -> 67326 bytes
-rw-r--r--debian-keyring-gpg/0x96EDAB9B2E6B7171bin5513 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0x992D23B392F9E4F2bin8314 -> 8942 bytes
-rw-r--r--debian-keyring-gpg/0x9AFB7B8C9A5F5BBCbin7901 -> 7090 bytes
-rw-r--r--debian-keyring-gpg/0x9C27B31342B7511Dbin76242 -> 79592 bytes
-rw-r--r--debian-keyring-gpg/0x9C31503C6D866396bin306571 -> 310822 bytes
-rw-r--r--debian-keyring-gpg/0x9EA33414F5852F4Ebin40750 -> 50164 bytes
-rw-r--r--debian-keyring-gpg/0x9EC002FE1C9CA517bin104315 -> 106487 bytes
-rw-r--r--debian-keyring-gpg/0x9FB9262724B17D29bin15461 -> 19214 bytes
-rw-r--r--debian-keyring-gpg/0xA1B09B42333961E8bin128049 -> 133594 bytes
-rw-r--r--debian-keyring-gpg/0xA2DE235062DA33FAbin36608 -> 39323 bytes
-rw-r--r--debian-keyring-gpg/0xAF2283AA76E2AC7Bbin149482 -> 151654 bytes
-rw-r--r--debian-keyring-gpg/0xAFCFEC8E669CE1C2bin45755 -> 47817 bytes
-rw-r--r--debian-keyring-gpg/0xB01FEA84617B586Dbin78371 -> 80543 bytes
-rw-r--r--debian-keyring-gpg/0xB06662EC9C0C1404bin40748 -> 46270 bytes
-rw-r--r--debian-keyring-gpg/0xB14BB0C38D861CF1bin11090 -> 12866 bytes
-rw-r--r--debian-keyring-gpg/0xB3464F896AA15948bin117328 -> 118414 bytes
-rw-r--r--debian-keyring-gpg/0xB5754A69B6BE608Cbin205428 -> 208593 bytes
-rw-r--r--debian-keyring-gpg/0xB77D2E2E23735427bin0 -> 14723 bytes
-rw-r--r--debian-keyring-gpg/0xB8688CA3D876D5A3bin9366 -> 10452 bytes
-rw-r--r--debian-keyring-gpg/0xB8E5087766475AAFbin170631 -> 172260 bytes
-rw-r--r--debian-keyring-gpg/0xBC8031288D89A751bin0 -> 6192 bytes
-rw-r--r--debian-keyring-gpg/0xC073D2287FFB9E9Bbin49507 -> 50076 bytes
-rw-r--r--debian-keyring-gpg/0xC31F4FD949AB2B6Cbin20535 -> 23574 bytes
-rw-r--r--debian-keyring-gpg/0xC6875F3541CEFDE0bin87250 -> 90415 bytes
-rw-r--r--debian-keyring-gpg/0xC92949B8A63BB098bin42094 -> 45508 bytes
-rw-r--r--debian-keyring-gpg/0xCAFB3BAD0A75C877bin17045 -> 17620 bytes
-rw-r--r--debian-keyring-gpg/0xCC057E722F1FFCC7bin30920 -> 33092 bytes
-rw-r--r--debian-keyring-gpg/0xCC79866F99409084bin38277 -> 40215 bytes
-rw-r--r--debian-keyring-gpg/0xCCD2ED94D21739E9bin256499 -> 266126 bytes
-rw-r--r--debian-keyring-gpg/0xD0178C767D069EE6bin112014 -> 115849 bytes
-rw-r--r--debian-keyring-gpg/0xD0E94F8D882D4468bin8757 -> 9907 bytes
-rw-r--r--debian-keyring-gpg/0xD15D313882004173bin107709 -> 108476 bytes
-rw-r--r--debian-keyring-gpg/0xD36F769BC11804F0bin25324 -> 25393 bytes
-rw-r--r--debian-keyring-gpg/0xD3E17383CFA7FF06bin38572 -> 39704 bytes
-rw-r--r--debian-keyring-gpg/0xD6EFA6AC4B10D847bin87965 -> 89051 bytes
-rw-r--r--debian-keyring-gpg/0xD9EEBFB4B66B10F0bin107846 -> 129077 bytes
-rw-r--r--debian-keyring-gpg/0xDA4958F611E149E9bin153081 -> 154823 bytes
-rw-r--r--debian-keyring-gpg/0xDA82830E3CCC3A3Abin76460 -> 81392 bytes
-rw-r--r--debian-keyring-gpg/0xE7BFC8EC95861109bin58035 -> 58661 bytes
-rw-r--r--debian-keyring-gpg/0xE9E28DEA00AA5556bin15103 -> 16801 bytes
-rw-r--r--debian-keyring-gpg/0xEB36171A6FF9435Fbin74895 -> 75461 bytes
-rw-r--r--debian-keyring-gpg/0xED63B6125A1D1561bin6697 -> 7871 bytes
-rw-r--r--debian-keyring-gpg/0xEED5716B078E43D4bin33168 -> 32478 bytes
-rw-r--r--debian-keyring-gpg/0xF5C83C05D9CEEEEEbin151283 -> 153547 bytes
-rw-r--r--debian-keyring-gpg/0xF6D3495BB0AE9A02bin214216 -> 223711 bytes
-rw-r--r--debian-keyring-gpg/0xFA643BA61D227AFBbin23318 -> 24404 bytes
-rw-r--r--debian-keyring-gpg/0xFC0DB1BBCD460BDEbin117951 -> 120949 bytes
-rw-r--r--debian-keyring-gpg/0xFF914AF0C2B35520bin82153 -> 88945 bytes
-rw-r--r--debian-maintainers-gpg/0x015F4DD4A70FB705bin10255 -> 11134 bytes
-rw-r--r--debian-maintainers-gpg/0x0D442664194974E2bin31778 -> 35441 bytes
-rw-r--r--debian-maintainers-gpg/0x1EEF53D38A3A9C67bin10452 -> 11018 bytes
-rw-r--r--debian-maintainers-gpg/0x28D9A6F364EB7512bin4844 -> 6295 bytes
-rw-r--r--debian-maintainers-gpg/0x296975951879E9CCbin5631 -> 8525 bytes
-rw-r--r--debian-maintainers-gpg/0x39F17A5F5AEFBE73bin8881 -> 11879 bytes
-rw-r--r--debian-maintainers-gpg/0x427E381D05190E55bin0 -> 24167 bytes
-rw-r--r--debian-maintainers-gpg/0x47A47BF84C62CABBbin7098 -> 7641 bytes
-rw-r--r--debian-maintainers-gpg/0x48D19F46BC99C9B7bin25428 -> 28235 bytes
-rw-r--r--debian-maintainers-gpg/0x500398DF5AB387D3bin7491 -> 9160 bytes
-rw-r--r--debian-maintainers-gpg/0x59895E44B169626Dbin5039 -> 6813 bytes
-rw-r--r--debian-maintainers-gpg/0x5A8830475F7D1061bin14872 -> 16493 bytes
-rw-r--r--debian-maintainers-gpg/0x5AD75B414EA41667bin0 -> 3373 bytes
-rw-r--r--debian-maintainers-gpg/0x5E946C090AFF0427bin2836 -> 3453 bytes
-rw-r--r--debian-maintainers-gpg/0x79C43E620B039B35bin107429 -> 110663 bytes
-rw-r--r--debian-maintainers-gpg/0x7EAE264181E773D5bin104277 -> 106387 bytes
-rw-r--r--debian-maintainers-gpg/0x863D4DF2ED9C28EFbin4480 -> 5566 bytes
-rw-r--r--debian-maintainers-gpg/0x914F833437204C75bin0 -> 3925 bytes
-rw-r--r--debian-maintainers-gpg/0x93022BAD0563A51Dbin0 -> 4432 bytes
-rw-r--r--debian-maintainers-gpg/0xA2591E231E251F36bin29881 -> 30048 bytes
-rw-r--r--debian-maintainers-gpg/0xC5C329EC35C2E2F1bin63223 -> 71428 bytes
-rw-r--r--debian-maintainers-gpg/0xC654FB332AD59860bin57215 -> 0 bytes
-rw-r--r--debian-maintainers-gpg/0xC9B0AC74C72B5836bin7767 -> 11755 bytes
-rw-r--r--debian-maintainers-gpg/0xCA8D40019EBD4E93bin4045 -> 6217 bytes
-rw-r--r--debian-maintainers-gpg/0xCFBBFCE0B74F1B14bin41038 -> 41677 bytes
-rw-r--r--debian-maintainers-gpg/0xE4AFEBC61BB4B289bin16951 -> 17494 bytes
-rw-r--r--debian-maintainers-gpg/0xE6C710E2E5C1E4A3bin94607 -> 97772 bytes
-rw-r--r--debian-maintainers-gpg/0xECB73E37E887AA8Cbin0 -> 21717 bytes
-rw-r--r--debian-maintainers-gpg/0xED34CEABE27BAABCbin57630 -> 63575 bytes
-rw-r--r--debian-nonupload-gpg/0x83E7EA669A19CB94bin63267 -> 65531 bytes
-rw-r--r--emeritus-keyring-gpg/0x1988BAC881E23B3C (renamed from debian-keyring-gpg/0x1988BAC881E23B3C)bin4284 -> 4284 bytes
-rw-r--r--emeritus-keyring-gpg/0x6887935AB297B391 (renamed from debian-nonupload-gpg/0x6887935AB297B391)bin10729 -> 10729 bytes
-rw-r--r--emeritus-keyring-gpg/0x95BD42E195D12EF7 (renamed from debian-keyring-gpg/0x95BD42E195D12EF7)bin6722 -> 6722 bytes
-rw-r--r--emeritus-keyring-gpg/0x9AED197FD311BBA1 (renamed from debian-keyring-gpg/0x9AED197FD311BBA1)bin5104 -> 5104 bytes
-rw-r--r--keyids7
-rwxr-xr-xscripts/process-rt14
-rwxr-xr-xscripts/replace-key1
-rwxr-xr-xscripts/update-key1
-rwxr-xr-xt/at-least-2048.t6
-rwxr-xr-xt/no-expired.t2
-rwxr-xr-xt/no-revoked.t4
145 files changed, 32 insertions, 9 deletions
diff --git a/cheatsheets/infrastructure/git.txt b/cheatsheets/infrastructure/git.txt
index 20e90a0..63ed1d6 100644
--- a/cheatsheets/infrastructure/git.txt
+++ b/cheatsheets/infrastructure/git.txt
@@ -22,15 +22,15 @@ Public tree copy
There is a public copy of the tree we push to whenever we push the
updates; it is available at Debian's Git server:
- https://alioth.debian.org/anonscm/git/keyring/keyring.git
+ https://salsa.debian.org/debian-keyring/keyring.git
This tree can also be browsed online at:
- http://anonscm.debian.org/gitweb/?p=keyring/keyring.git
+ http://salsa.debian.org/debian-keyring/keyring
So, when you push a new revision, do:
-$ git push ssh://git.debian.org/git/keyring/keyring.git master
+$ git push ssh://salsa.debian.org/debian-keyring/keyring.git master
Signing commits
---------------
diff --git a/debian-keyring-gpg/0x021B361B6B031B00 b/debian-keyring-gpg/0x021B361B6B031B00
index 7be9d4c..3da5ede 100644
--- a/debian-keyring-gpg/0x021B361B6B031B00
+++ b/debian-keyring-gpg/0x021B361B6B031B00
Binary files differ
diff --git a/debian-keyring-gpg/0x049B1033AF060C5A b/debian-keyring-gpg/0x049B1033AF060C5A
index 95913ef..040c919 100644
--- a/debian-keyring-gpg/0x049B1033AF060C5A
+++ b/debian-keyring-gpg/0x049B1033AF060C5A
Binary files differ
diff --git a/debian-keyring-gpg/0x06EAA066E397832F b/debian-keyring-gpg/0x06EAA066E397832F
index 0d4fb2e..0e4f34d 100644
--- a/debian-keyring-gpg/0x06EAA066E397832F
+++ b/debian-keyring-gpg/0x06EAA066E397832F
Binary files differ
diff --git a/debian-keyring-gpg/0x0F56D0553B6D411B b/debian-keyring-gpg/0x0F56D0553B6D411B
index 4691b38..116fb6e 100644
--- a/debian-keyring-gpg/0x0F56D0553B6D411B
+++ b/debian-keyring-gpg/0x0F56D0553B6D411B
Binary files differ
diff --git a/debian-keyring-gpg/0x14135D277B88D7E5 b/debian-keyring-gpg/0x14135D277B88D7E5
index b7bfe52..29c761d 100644
--- a/debian-keyring-gpg/0x14135D277B88D7E5
+++ b/debian-keyring-gpg/0x14135D277B88D7E5
Binary files differ
diff --git a/debian-keyring-gpg/0x16281F2E007C98D1 b/debian-keyring-gpg/0x16281F2E007C98D1
index e463efb..9cff996 100644
--- a/debian-keyring-gpg/0x16281F2E007C98D1
+++ b/debian-keyring-gpg/0x16281F2E007C98D1
Binary files differ
diff --git a/debian-keyring-gpg/0x17DC3CC470D4A979 b/debian-keyring-gpg/0x17DC3CC470D4A979
index ecb2212..a0001e5 100644
--- a/debian-keyring-gpg/0x17DC3CC470D4A979
+++ b/debian-keyring-gpg/0x17DC3CC470D4A979
Binary files differ
diff --git a/debian-keyring-gpg/0x17FBDCBFD9928FF4 b/debian-keyring-gpg/0x17FBDCBFD9928FF4
index 33a077b..2c2c444 100644
--- a/debian-keyring-gpg/0x17FBDCBFD9928FF4
+++ b/debian-keyring-gpg/0x17FBDCBFD9928FF4
Binary files differ
diff --git a/debian-keyring-gpg/0x1E08BF280CB9A31A b/debian-keyring-gpg/0x1E08BF280CB9A31A
index 98345a1..4a15bba 100644
--- a/debian-keyring-gpg/0x1E08BF280CB9A31A
+++ b/debian-keyring-gpg/0x1E08BF280CB9A31A
Binary files differ
diff --git a/debian-maintainers-gpg/0x1E759A726A9FDD74 b/debian-keyring-gpg/0x1E759A726A9FDD74
index cfe0af8..0fb2733 100644
--- a/debian-maintainers-gpg/0x1E759A726A9FDD74
+++ b/debian-keyring-gpg/0x1E759A726A9FDD74
Binary files differ
diff --git a/debian-keyring-gpg/0x1E953E27D4311E58 b/debian-keyring-gpg/0x1E953E27D4311E58
index 877e343..52b382f 100644
--- a/debian-keyring-gpg/0x1E953E27D4311E58
+++ b/debian-keyring-gpg/0x1E953E27D4311E58
Binary files differ
diff --git a/debian-keyring-gpg/0x2064C53641C25E5D b/debian-keyring-gpg/0x2064C53641C25E5D
index b8609ea..1fd7306 100644
--- a/debian-keyring-gpg/0x2064C53641C25E5D
+++ b/debian-keyring-gpg/0x2064C53641C25E5D
Binary files differ
diff --git a/debian-keyring-gpg/0x223AE055BD94E154 b/debian-keyring-gpg/0x223AE055BD94E154
index e2d693a..00b6be8 100644
--- a/debian-keyring-gpg/0x223AE055BD94E154
+++ b/debian-keyring-gpg/0x223AE055BD94E154
Binary files differ
diff --git a/debian-keyring-gpg/0x2C3B436FEAC68101 b/debian-keyring-gpg/0x2C3B436FEAC68101
index 2d19702..6835d96 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 df7afa1..7ec5390 100644
--- a/debian-keyring-gpg/0x2C7C3146C1A00121
+++ b/debian-keyring-gpg/0x2C7C3146C1A00121
Binary files differ
diff --git a/debian-keyring-gpg/0x2EC0FFB3B7301B1F b/debian-keyring-gpg/0x2EC0FFB3B7301B1F
index 275f191..ede45e2 100644
--- a/debian-keyring-gpg/0x2EC0FFB3B7301B1F
+++ b/debian-keyring-gpg/0x2EC0FFB3B7301B1F
Binary files differ
diff --git a/debian-keyring-gpg/0x310180050905E40C b/debian-keyring-gpg/0x310180050905E40C
index e8440fe..11ce6ff 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 38b6879..9463f83 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 30dfab5..afdf384 100644
--- a/debian-keyring-gpg/0x32247FBB40AD1FA6
+++ b/debian-keyring-gpg/0x32247FBB40AD1FA6
Binary files differ
diff --git a/debian-keyring-gpg/0x357312559D1E064B b/debian-keyring-gpg/0x357312559D1E064B
index a3be6b2..31b316c 100644
--- a/debian-keyring-gpg/0x357312559D1E064B
+++ b/debian-keyring-gpg/0x357312559D1E064B
Binary files differ
diff --git a/debian-keyring-gpg/0x3631D4FB7FF2B8B8 b/debian-keyring-gpg/0x3631D4FB7FF2B8B8
index f2d8406..50bd8b7 100644
--- a/debian-keyring-gpg/0x3631D4FB7FF2B8B8
+++ b/debian-keyring-gpg/0x3631D4FB7FF2B8B8
Binary files differ
diff --git a/debian-keyring-gpg/0x3914B532F4DFBE99 b/debian-keyring-gpg/0x3914B532F4DFBE99
index d10df2a..1750f48 100644
--- a/debian-keyring-gpg/0x3914B532F4DFBE99
+++ b/debian-keyring-gpg/0x3914B532F4DFBE99
Binary files differ
diff --git a/debian-keyring-gpg/0x3FA78B77EB9B072B b/debian-keyring-gpg/0x3FA78B77EB9B072B
deleted file mode 100644
index 7250dc3..0000000
--- a/debian-keyring-gpg/0x3FA78B77EB9B072B
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0x44BB1BA79F6C6333 b/debian-keyring-gpg/0x44BB1BA79F6C6333
index 86b3073..8e294a6 100644
--- a/debian-keyring-gpg/0x44BB1BA79F6C6333
+++ b/debian-keyring-gpg/0x44BB1BA79F6C6333
Binary files differ
diff --git a/debian-keyring-gpg/0x4B043FCDB9444540 b/debian-keyring-gpg/0x4B043FCDB9444540
index f22c5f0..3bbb2b3 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
index 8470ee5..6ece52d 100644
--- a/debian-keyring-gpg/0x4BC80A69432387E8
+++ b/debian-keyring-gpg/0x4BC80A69432387E8
Binary files differ
diff --git a/debian-keyring-gpg/0x4C5A6BAB12D2A7AE b/debian-keyring-gpg/0x4C5A6BAB12D2A7AE
index 2eb1809..c9d7a72 100644
--- a/debian-keyring-gpg/0x4C5A6BAB12D2A7AE
+++ b/debian-keyring-gpg/0x4C5A6BAB12D2A7AE
Binary files differ
diff --git a/debian-keyring-gpg/0x4F9F6D550ED6122A b/debian-keyring-gpg/0x4F9F6D550ED6122A
index f7a458e..6f0960b 100644
--- a/debian-keyring-gpg/0x4F9F6D550ED6122A
+++ b/debian-keyring-gpg/0x4F9F6D550ED6122A
Binary files differ
diff --git a/debian-keyring-gpg/0x5394479DD3524C51 b/debian-keyring-gpg/0x5394479DD3524C51
index 129101f..61d4dad 100644
--- a/debian-keyring-gpg/0x5394479DD3524C51
+++ b/debian-keyring-gpg/0x5394479DD3524C51
Binary files differ
diff --git a/debian-keyring-gpg/0x5556A34E04A3610B b/debian-keyring-gpg/0x5556A34E04A3610B
index e0b241d..f9961bc 100644
--- a/debian-keyring-gpg/0x5556A34E04A3610B
+++ b/debian-keyring-gpg/0x5556A34E04A3610B
Binary files differ
diff --git a/debian-keyring-gpg/0x55C9882D999BBCC4 b/debian-keyring-gpg/0x55C9882D999BBCC4
index 42ecfe8..993942b 100644
--- a/debian-keyring-gpg/0x55C9882D999BBCC4
+++ b/debian-keyring-gpg/0x55C9882D999BBCC4
Binary files differ
diff --git a/debian-keyring-gpg/0x5D328D082AAAB140 b/debian-keyring-gpg/0x5D328D082AAAB140
index d08b075..1a9c541 100644
--- a/debian-keyring-gpg/0x5D328D082AAAB140
+++ b/debian-keyring-gpg/0x5D328D082AAAB140
Binary files differ
diff --git a/debian-keyring-gpg/0x5EE76EE20216D2A5 b/debian-keyring-gpg/0x5EE76EE20216D2A5
index 01303d1..dd9091c 100644
--- a/debian-keyring-gpg/0x5EE76EE20216D2A5
+++ b/debian-keyring-gpg/0x5EE76EE20216D2A5
Binary files differ
diff --git a/debian-keyring-gpg/0x62AF4031C82E0039 b/debian-keyring-gpg/0x62AF4031C82E0039
index 4cfdf3f..a50b9a3 100644
--- a/debian-keyring-gpg/0x62AF4031C82E0039
+++ b/debian-keyring-gpg/0x62AF4031C82E0039
Binary files differ
diff --git a/debian-keyring-gpg/0x634F4BD1E7AD5568 b/debian-keyring-gpg/0x634F4BD1E7AD5568
index e3ba56a..935ca72 100644
--- a/debian-keyring-gpg/0x634F4BD1E7AD5568
+++ b/debian-keyring-gpg/0x634F4BD1E7AD5568
Binary files differ
diff --git a/debian-keyring-gpg/0x6611C05EDD39F374 b/debian-keyring-gpg/0x6611C05EDD39F374
index 070be42..e026f40 100644
--- a/debian-keyring-gpg/0x6611C05EDD39F374
+++ b/debian-keyring-gpg/0x6611C05EDD39F374
Binary files differ
diff --git a/debian-keyring-gpg/0x664F1238AA8F138A b/debian-keyring-gpg/0x664F1238AA8F138A
index 8a5825e..3951624 100644
--- a/debian-keyring-gpg/0x664F1238AA8F138A
+++ b/debian-keyring-gpg/0x664F1238AA8F138A
Binary files differ
diff --git a/debian-keyring-gpg/0x69F30763DFEFC134 b/debian-keyring-gpg/0x69F30763DFEFC134
index fe2755a..ac58cf4 100644
--- a/debian-keyring-gpg/0x69F30763DFEFC134
+++ b/debian-keyring-gpg/0x69F30763DFEFC134
Binary files differ
diff --git a/debian-keyring-gpg/0x6B7498FCB9B358AC b/debian-keyring-gpg/0x6B7498FCB9B358AC
index 3325349..0a927a6 100644
--- a/debian-keyring-gpg/0x6B7498FCB9B358AC
+++ b/debian-keyring-gpg/0x6B7498FCB9B358AC
Binary files differ
diff --git a/debian-keyring-gpg/0x6C6ACD6417B3ACB1 b/debian-keyring-gpg/0x6C6ACD6417B3ACB1
index 768fded..0d17624 100644
--- a/debian-keyring-gpg/0x6C6ACD6417B3ACB1
+++ b/debian-keyring-gpg/0x6C6ACD6417B3ACB1
Binary files differ
diff --git a/debian-keyring-gpg/0x6CACA448860CDC13 b/debian-keyring-gpg/0x6CACA448860CDC13
index fc3da6e..4fa7be7 100644
--- a/debian-keyring-gpg/0x6CACA448860CDC13
+++ b/debian-keyring-gpg/0x6CACA448860CDC13
Binary files differ
diff --git a/debian-keyring-gpg/0x7127E5ABEEF946C8 b/debian-keyring-gpg/0x7127E5ABEEF946C8
index 07cce01..5bbf1fa 100644
--- a/debian-keyring-gpg/0x7127E5ABEEF946C8
+++ b/debian-keyring-gpg/0x7127E5ABEEF946C8
Binary files differ
diff --git a/debian-keyring-gpg/0x74263B37F5B5F913 b/debian-keyring-gpg/0x74263B37F5B5F913
index 2eb9cfa..2f816aa 100644
--- a/debian-keyring-gpg/0x74263B37F5B5F913
+++ b/debian-keyring-gpg/0x74263B37F5B5F913
Binary files differ
diff --git a/debian-keyring-gpg/0x759778A9A36B494F b/debian-keyring-gpg/0x759778A9A36B494F
index 807469c..671f3ab 100644
--- a/debian-keyring-gpg/0x759778A9A36B494F
+++ b/debian-keyring-gpg/0x759778A9A36B494F
Binary files differ
diff --git a/debian-keyring-gpg/0x762B57BB784206AD b/debian-keyring-gpg/0x762B57BB784206AD
index c95cf2c..ef62b3c 100644
--- a/debian-keyring-gpg/0x762B57BB784206AD
+++ b/debian-keyring-gpg/0x762B57BB784206AD
Binary files differ
diff --git a/debian-keyring-gpg/0x76B534B2E99007E0 b/debian-keyring-gpg/0x76B534B2E99007E0
index 78ca79f..e982562 100644
--- a/debian-keyring-gpg/0x76B534B2E99007E0
+++ b/debian-keyring-gpg/0x76B534B2E99007E0
Binary files differ
diff --git a/debian-keyring-gpg/0x7731FCCC63E4E277 b/debian-keyring-gpg/0x7731FCCC63E4E277
index 3e2c5c8..a2356d1 100644
--- a/debian-keyring-gpg/0x7731FCCC63E4E277
+++ b/debian-keyring-gpg/0x7731FCCC63E4E277
Binary files differ
diff --git a/debian-keyring-gpg/0x7853DA4D49881AD3 b/debian-keyring-gpg/0x7853DA4D49881AD3
index b31087d..fd1852b 100644
--- a/debian-keyring-gpg/0x7853DA4D49881AD3
+++ b/debian-keyring-gpg/0x7853DA4D49881AD3
Binary files differ
diff --git a/debian-keyring-gpg/0x7C56ACFE947897D8 b/debian-keyring-gpg/0x7C56ACFE947897D8
index f8e6aa4..fb2f6d1 100644
--- a/debian-keyring-gpg/0x7C56ACFE947897D8
+++ b/debian-keyring-gpg/0x7C56ACFE947897D8
Binary files differ
diff --git a/debian-keyring-gpg/0x7F6022516E869F64 b/debian-keyring-gpg/0x7F6022516E869F64
index 7e9cddc..ba751b8 100644
--- a/debian-keyring-gpg/0x7F6022516E869F64
+++ b/debian-keyring-gpg/0x7F6022516E869F64
Binary files differ
diff --git a/debian-keyring-gpg/0x8062398983B2CF7A b/debian-keyring-gpg/0x8062398983B2CF7A
index ed0c394..accda0a 100644
--- a/debian-keyring-gpg/0x8062398983B2CF7A
+++ b/debian-keyring-gpg/0x8062398983B2CF7A
Binary files differ
diff --git a/debian-keyring-gpg/0x85199DE8C6648E90 b/debian-keyring-gpg/0x85199DE8C6648E90
index 718ba29..5739f9d 100644
--- a/debian-keyring-gpg/0x85199DE8C6648E90
+++ b/debian-keyring-gpg/0x85199DE8C6648E90
Binary files differ
diff --git a/debian-keyring-gpg/0x86561F452180FCFE b/debian-keyring-gpg/0x86561F452180FCFE
index ab81287..0cd501a 100644
--- a/debian-keyring-gpg/0x86561F452180FCFE
+++ b/debian-keyring-gpg/0x86561F452180FCFE
Binary files differ
diff --git a/debian-keyring-gpg/0x872F702C4D6E25A8 b/debian-keyring-gpg/0x872F702C4D6E25A8
index 358545f..e8e9296 100644
--- a/debian-keyring-gpg/0x872F702C4D6E25A8
+++ b/debian-keyring-gpg/0x872F702C4D6E25A8
Binary files differ
diff --git a/debian-keyring-gpg/0x8CBF9A322861A790 b/debian-keyring-gpg/0x8CBF9A322861A790
index 0f713f9..c1bd7ae 100644
--- a/debian-keyring-gpg/0x8CBF9A322861A790
+++ b/debian-keyring-gpg/0x8CBF9A322861A790
Binary files differ
diff --git a/debian-keyring-gpg/0x96EDAB9B2E6B7171 b/debian-keyring-gpg/0x96EDAB9B2E6B7171
deleted file mode 100644
index c808687..0000000
--- a/debian-keyring-gpg/0x96EDAB9B2E6B7171
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0x992D23B392F9E4F2 b/debian-keyring-gpg/0x992D23B392F9E4F2
index 83f80ca..5bdc460 100644
--- a/debian-keyring-gpg/0x992D23B392F9E4F2
+++ b/debian-keyring-gpg/0x992D23B392F9E4F2
Binary files differ
diff --git a/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC b/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC
index 8cb0225..bc58820 100644
--- a/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC
+++ b/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC
Binary files differ
diff --git a/debian-keyring-gpg/0x9C27B31342B7511D b/debian-keyring-gpg/0x9C27B31342B7511D
index c68e672..c5f8df8 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 9b3b452..5a391a5 100644
--- a/debian-keyring-gpg/0x9C31503C6D866396
+++ b/debian-keyring-gpg/0x9C31503C6D866396
Binary files differ
diff --git a/debian-keyring-gpg/0x9EA33414F5852F4E b/debian-keyring-gpg/0x9EA33414F5852F4E
index ea606ba..c3b71a0 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 59c73e1..490c62c 100644
--- a/debian-keyring-gpg/0x9EC002FE1C9CA517
+++ b/debian-keyring-gpg/0x9EC002FE1C9CA517
Binary files differ
diff --git a/debian-keyring-gpg/0x9FB9262724B17D29 b/debian-keyring-gpg/0x9FB9262724B17D29
index 0b702c5..d50a357 100644
--- a/debian-keyring-gpg/0x9FB9262724B17D29
+++ b/debian-keyring-gpg/0x9FB9262724B17D29
Binary files differ
diff --git a/debian-keyring-gpg/0xA1B09B42333961E8 b/debian-keyring-gpg/0xA1B09B42333961E8
index 858a318..94bd1b9 100644
--- a/debian-keyring-gpg/0xA1B09B42333961E8
+++ b/debian-keyring-gpg/0xA1B09B42333961E8
Binary files differ
diff --git a/debian-keyring-gpg/0xA2DE235062DA33FA b/debian-keyring-gpg/0xA2DE235062DA33FA
index e8b1cb0..f4614d7 100644
--- a/debian-keyring-gpg/0xA2DE235062DA33FA
+++ b/debian-keyring-gpg/0xA2DE235062DA33FA
Binary files differ
diff --git a/debian-keyring-gpg/0xAF2283AA76E2AC7B b/debian-keyring-gpg/0xAF2283AA76E2AC7B
index 7bcdf66..9d2b056 100644
--- a/debian-keyring-gpg/0xAF2283AA76E2AC7B
+++ b/debian-keyring-gpg/0xAF2283AA76E2AC7B
Binary files differ
diff --git a/debian-keyring-gpg/0xAFCFEC8E669CE1C2 b/debian-keyring-gpg/0xAFCFEC8E669CE1C2
index 488c1ff..bf6ecbe 100644
--- a/debian-keyring-gpg/0xAFCFEC8E669CE1C2
+++ b/debian-keyring-gpg/0xAFCFEC8E669CE1C2
Binary files differ
diff --git a/debian-keyring-gpg/0xB01FEA84617B586D b/debian-keyring-gpg/0xB01FEA84617B586D
index 9f458ef..4eb522f 100644
--- a/debian-keyring-gpg/0xB01FEA84617B586D
+++ b/debian-keyring-gpg/0xB01FEA84617B586D
Binary files differ
diff --git a/debian-keyring-gpg/0xB06662EC9C0C1404 b/debian-keyring-gpg/0xB06662EC9C0C1404
index 310982a..a4b8488 100644
--- a/debian-keyring-gpg/0xB06662EC9C0C1404
+++ b/debian-keyring-gpg/0xB06662EC9C0C1404
Binary files differ
diff --git a/debian-keyring-gpg/0xB14BB0C38D861CF1 b/debian-keyring-gpg/0xB14BB0C38D861CF1
index c1dc0eb..e46dc1b 100644
--- a/debian-keyring-gpg/0xB14BB0C38D861CF1
+++ b/debian-keyring-gpg/0xB14BB0C38D861CF1
Binary files differ
diff --git a/debian-keyring-gpg/0xB3464F896AA15948 b/debian-keyring-gpg/0xB3464F896AA15948
index dcdd941..b044a5d 100644
--- a/debian-keyring-gpg/0xB3464F896AA15948
+++ b/debian-keyring-gpg/0xB3464F896AA15948
Binary files differ
diff --git a/debian-keyring-gpg/0xB5754A69B6BE608C b/debian-keyring-gpg/0xB5754A69B6BE608C
index fd63a2b..a8982ef 100644
--- a/debian-keyring-gpg/0xB5754A69B6BE608C
+++ b/debian-keyring-gpg/0xB5754A69B6BE608C
Binary files differ
diff --git a/debian-keyring-gpg/0xB77D2E2E23735427 b/debian-keyring-gpg/0xB77D2E2E23735427
new file mode 100644
index 0000000..34953f8
--- /dev/null
+++ b/debian-keyring-gpg/0xB77D2E2E23735427
Binary files differ
diff --git a/debian-keyring-gpg/0xB8688CA3D876D5A3 b/debian-keyring-gpg/0xB8688CA3D876D5A3
index 9263894..a2ba72d 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 48b9a57..d0ea0d4 100644
--- a/debian-keyring-gpg/0xB8E5087766475AAF
+++ b/debian-keyring-gpg/0xB8E5087766475AAF
Binary files differ
diff --git a/debian-keyring-gpg/0xBC8031288D89A751 b/debian-keyring-gpg/0xBC8031288D89A751
new file mode 100644
index 0000000..240d93b
--- /dev/null
+++ b/debian-keyring-gpg/0xBC8031288D89A751
Binary files differ
diff --git a/debian-keyring-gpg/0xC073D2287FFB9E9B b/debian-keyring-gpg/0xC073D2287FFB9E9B
index d697598..34151cf 100644
--- a/debian-keyring-gpg/0xC073D2287FFB9E9B
+++ b/debian-keyring-gpg/0xC073D2287FFB9E9B
Binary files differ
diff --git a/debian-keyring-gpg/0xC31F4FD949AB2B6C b/debian-keyring-gpg/0xC31F4FD949AB2B6C
index 542ae9f..bd38cf8 100644
--- a/debian-keyring-gpg/0xC31F4FD949AB2B6C
+++ b/debian-keyring-gpg/0xC31F4FD949AB2B6C
Binary files differ
diff --git a/debian-keyring-gpg/0xC6875F3541CEFDE0 b/debian-keyring-gpg/0xC6875F3541CEFDE0
index a7e196f..6f70eee 100644
--- a/debian-keyring-gpg/0xC6875F3541CEFDE0
+++ b/debian-keyring-gpg/0xC6875F3541CEFDE0
Binary files differ
diff --git a/debian-keyring-gpg/0xC92949B8A63BB098 b/debian-keyring-gpg/0xC92949B8A63BB098
index c6ecf00..0cf01b0 100644
--- a/debian-keyring-gpg/0xC92949B8A63BB098
+++ b/debian-keyring-gpg/0xC92949B8A63BB098
Binary files differ
diff --git a/debian-keyring-gpg/0xCAFB3BAD0A75C877 b/debian-keyring-gpg/0xCAFB3BAD0A75C877
index 1745434..4623166 100644
--- a/debian-keyring-gpg/0xCAFB3BAD0A75C877
+++ b/debian-keyring-gpg/0xCAFB3BAD0A75C877
Binary files differ
diff --git a/debian-keyring-gpg/0xCC057E722F1FFCC7 b/debian-keyring-gpg/0xCC057E722F1FFCC7
index 8fe700f..7d752c7 100644
--- a/debian-keyring-gpg/0xCC057E722F1FFCC7
+++ b/debian-keyring-gpg/0xCC057E722F1FFCC7
Binary files differ
diff --git a/debian-keyring-gpg/0xCC79866F99409084 b/debian-keyring-gpg/0xCC79866F99409084
index a369fee..43087db 100644
--- a/debian-keyring-gpg/0xCC79866F99409084
+++ b/debian-keyring-gpg/0xCC79866F99409084
Binary files differ
diff --git a/debian-keyring-gpg/0xCCD2ED94D21739E9 b/debian-keyring-gpg/0xCCD2ED94D21739E9
index bcd3031..57b7870 100644
--- a/debian-keyring-gpg/0xCCD2ED94D21739E9
+++ b/debian-keyring-gpg/0xCCD2ED94D21739E9
Binary files differ
diff --git a/debian-keyring-gpg/0xD0178C767D069EE6 b/debian-keyring-gpg/0xD0178C767D069EE6
index 93e7b64..abcc654 100644
--- a/debian-keyring-gpg/0xD0178C767D069EE6
+++ b/debian-keyring-gpg/0xD0178C767D069EE6
Binary files differ
diff --git a/debian-keyring-gpg/0xD0E94F8D882D4468 b/debian-keyring-gpg/0xD0E94F8D882D4468
index 219d2b3..45fe11c 100644
--- a/debian-keyring-gpg/0xD0E94F8D882D4468
+++ b/debian-keyring-gpg/0xD0E94F8D882D4468
Binary files differ
diff --git a/debian-keyring-gpg/0xD15D313882004173 b/debian-keyring-gpg/0xD15D313882004173
index a9ccd6b..5ea392f 100644
--- a/debian-keyring-gpg/0xD15D313882004173
+++ b/debian-keyring-gpg/0xD15D313882004173
Binary files differ
diff --git a/debian-keyring-gpg/0xD36F769BC11804F0 b/debian-keyring-gpg/0xD36F769BC11804F0
index ead30a4..9bd11df 100644
--- a/debian-keyring-gpg/0xD36F769BC11804F0
+++ b/debian-keyring-gpg/0xD36F769BC11804F0
Binary files differ
diff --git a/debian-keyring-gpg/0xD3E17383CFA7FF06 b/debian-keyring-gpg/0xD3E17383CFA7FF06
index 42851fa..c8c2acc 100644
--- a/debian-keyring-gpg/0xD3E17383CFA7FF06
+++ b/debian-keyring-gpg/0xD3E17383CFA7FF06
Binary files differ
diff --git a/debian-keyring-gpg/0xD6EFA6AC4B10D847 b/debian-keyring-gpg/0xD6EFA6AC4B10D847
index 2ca288e..867d823 100644
--- a/debian-keyring-gpg/0xD6EFA6AC4B10D847
+++ b/debian-keyring-gpg/0xD6EFA6AC4B10D847
Binary files differ
diff --git a/debian-keyring-gpg/0xD9EEBFB4B66B10F0 b/debian-keyring-gpg/0xD9EEBFB4B66B10F0
index 19ce1e8..4700d21 100644
--- a/debian-keyring-gpg/0xD9EEBFB4B66B10F0
+++ b/debian-keyring-gpg/0xD9EEBFB4B66B10F0
Binary files differ
diff --git a/debian-keyring-gpg/0xDA4958F611E149E9 b/debian-keyring-gpg/0xDA4958F611E149E9
index f270361..91cc45b 100644
--- a/debian-keyring-gpg/0xDA4958F611E149E9
+++ b/debian-keyring-gpg/0xDA4958F611E149E9
Binary files differ
diff --git a/debian-keyring-gpg/0xDA82830E3CCC3A3A b/debian-keyring-gpg/0xDA82830E3CCC3A3A
index b87cc03..b6ec889 100644
--- a/debian-keyring-gpg/0xDA82830E3CCC3A3A
+++ b/debian-keyring-gpg/0xDA82830E3CCC3A3A
Binary files differ
diff --git a/debian-keyring-gpg/0xE7BFC8EC95861109 b/debian-keyring-gpg/0xE7BFC8EC95861109
index 6f23a3c..2ac7e5d 100644
--- a/debian-keyring-gpg/0xE7BFC8EC95861109
+++ b/debian-keyring-gpg/0xE7BFC8EC95861109
Binary files differ
diff --git a/debian-keyring-gpg/0xE9E28DEA00AA5556 b/debian-keyring-gpg/0xE9E28DEA00AA5556
index d06af5a..0117885 100644
--- a/debian-keyring-gpg/0xE9E28DEA00AA5556
+++ b/debian-keyring-gpg/0xE9E28DEA00AA5556
Binary files differ
diff --git a/debian-keyring-gpg/0xEB36171A6FF9435F b/debian-keyring-gpg/0xEB36171A6FF9435F
index 52dc330..fc3448a 100644
--- a/debian-keyring-gpg/0xEB36171A6FF9435F
+++ b/debian-keyring-gpg/0xEB36171A6FF9435F
Binary files differ
diff --git a/debian-keyring-gpg/0xED63B6125A1D1561 b/debian-keyring-gpg/0xED63B6125A1D1561
index 979c523..decd399 100644
--- a/debian-keyring-gpg/0xED63B6125A1D1561
+++ b/debian-keyring-gpg/0xED63B6125A1D1561
Binary files differ
diff --git a/debian-keyring-gpg/0xEED5716B078E43D4 b/debian-keyring-gpg/0xEED5716B078E43D4
index 8af8ab9..2fef413 100644
--- a/debian-keyring-gpg/0xEED5716B078E43D4
+++ b/debian-keyring-gpg/0xEED5716B078E43D4
Binary files differ
diff --git a/debian-keyring-gpg/0xF5C83C05D9CEEEEE b/debian-keyring-gpg/0xF5C83C05D9CEEEEE
index cafff02..1a2bb5d 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 7d4d4d5..e8a94dc 100644
--- a/debian-keyring-gpg/0xF6D3495BB0AE9A02
+++ b/debian-keyring-gpg/0xF6D3495BB0AE9A02
Binary files differ
diff --git a/debian-keyring-gpg/0xFA643BA61D227AFB b/debian-keyring-gpg/0xFA643BA61D227AFB
index 4ce68cd..64b6297 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 00a3d41..9840477 100644
--- a/debian-keyring-gpg/0xFC0DB1BBCD460BDE
+++ b/debian-keyring-gpg/0xFC0DB1BBCD460BDE
Binary files differ
diff --git a/debian-keyring-gpg/0xFF914AF0C2B35520 b/debian-keyring-gpg/0xFF914AF0C2B35520
index c6e2f85..552143b 100644
--- a/debian-keyring-gpg/0xFF914AF0C2B35520
+++ b/debian-keyring-gpg/0xFF914AF0C2B35520
Binary files differ
diff --git a/debian-maintainers-gpg/0x015F4DD4A70FB705 b/debian-maintainers-gpg/0x015F4DD4A70FB705
index d792cf2..b6b5b38 100644
--- a/debian-maintainers-gpg/0x015F4DD4A70FB705
+++ b/debian-maintainers-gpg/0x015F4DD4A70FB705
Binary files differ
diff --git a/debian-maintainers-gpg/0x0D442664194974E2 b/debian-maintainers-gpg/0x0D442664194974E2
index 9288284..0f4d1ec 100644
--- a/debian-maintainers-gpg/0x0D442664194974E2
+++ b/debian-maintainers-gpg/0x0D442664194974E2
Binary files differ
diff --git a/debian-maintainers-gpg/0x1EEF53D38A3A9C67 b/debian-maintainers-gpg/0x1EEF53D38A3A9C67
index 12f487a..31ce20c 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 65a6e67..32c525d 100644
--- a/debian-maintainers-gpg/0x28D9A6F364EB7512
+++ b/debian-maintainers-gpg/0x28D9A6F364EB7512
Binary files differ
diff --git a/debian-maintainers-gpg/0x296975951879E9CC b/debian-maintainers-gpg/0x296975951879E9CC
index 98c8417..701b3d3 100644
--- a/debian-maintainers-gpg/0x296975951879E9CC
+++ b/debian-maintainers-gpg/0x296975951879E9CC
Binary files differ
diff --git a/debian-maintainers-gpg/0x39F17A5F5AEFBE73 b/debian-maintainers-gpg/0x39F17A5F5AEFBE73
index 9f0488a..2fbfd88 100644
--- a/debian-maintainers-gpg/0x39F17A5F5AEFBE73
+++ b/debian-maintainers-gpg/0x39F17A5F5AEFBE73
Binary files differ
diff --git a/debian-maintainers-gpg/0x427E381D05190E55 b/debian-maintainers-gpg/0x427E381D05190E55
new file mode 100644
index 0000000..c2595c4
--- /dev/null
+++ b/debian-maintainers-gpg/0x427E381D05190E55
Binary files differ
diff --git a/debian-maintainers-gpg/0x47A47BF84C62CABB b/debian-maintainers-gpg/0x47A47BF84C62CABB
index 1093459..c14314a 100644
--- a/debian-maintainers-gpg/0x47A47BF84C62CABB
+++ b/debian-maintainers-gpg/0x47A47BF84C62CABB
Binary files differ
diff --git a/debian-maintainers-gpg/0x48D19F46BC99C9B7 b/debian-maintainers-gpg/0x48D19F46BC99C9B7
index e380e92..c0564a8 100644
--- a/debian-maintainers-gpg/0x48D19F46BC99C9B7
+++ b/debian-maintainers-gpg/0x48D19F46BC99C9B7
Binary files differ
diff --git a/debian-maintainers-gpg/0x500398DF5AB387D3 b/debian-maintainers-gpg/0x500398DF5AB387D3
index eee9b96..ba8e32d 100644
--- a/debian-maintainers-gpg/0x500398DF5AB387D3
+++ b/debian-maintainers-gpg/0x500398DF5AB387D3
Binary files differ
diff --git a/debian-maintainers-gpg/0x59895E44B169626D b/debian-maintainers-gpg/0x59895E44B169626D
index a3bac75..9c5d7cb 100644
--- a/debian-maintainers-gpg/0x59895E44B169626D
+++ b/debian-maintainers-gpg/0x59895E44B169626D
Binary files differ
diff --git a/debian-maintainers-gpg/0x5A8830475F7D1061 b/debian-maintainers-gpg/0x5A8830475F7D1061
index 0d5637b..84db86b 100644
--- a/debian-maintainers-gpg/0x5A8830475F7D1061
+++ b/debian-maintainers-gpg/0x5A8830475F7D1061
Binary files differ
diff --git a/debian-maintainers-gpg/0x5AD75B414EA41667 b/debian-maintainers-gpg/0x5AD75B414EA41667
new file mode 100644
index 0000000..cfae722
--- /dev/null
+++ b/debian-maintainers-gpg/0x5AD75B414EA41667
Binary files differ
diff --git a/debian-maintainers-gpg/0x5E946C090AFF0427 b/debian-maintainers-gpg/0x5E946C090AFF0427
index 84f7609..2daae1c 100644
--- a/debian-maintainers-gpg/0x5E946C090AFF0427
+++ b/debian-maintainers-gpg/0x5E946C090AFF0427
Binary files differ
diff --git a/debian-maintainers-gpg/0x79C43E620B039B35 b/debian-maintainers-gpg/0x79C43E620B039B35
index 4c22a16..371a7f8 100644
--- a/debian-maintainers-gpg/0x79C43E620B039B35
+++ b/debian-maintainers-gpg/0x79C43E620B039B35
Binary files differ
diff --git a/debian-maintainers-gpg/0x7EAE264181E773D5 b/debian-maintainers-gpg/0x7EAE264181E773D5
index ce8dc8b..d71a275 100644
--- a/debian-maintainers-gpg/0x7EAE264181E773D5
+++ b/debian-maintainers-gpg/0x7EAE264181E773D5
Binary files differ
diff --git a/debian-maintainers-gpg/0x863D4DF2ED9C28EF b/debian-maintainers-gpg/0x863D4DF2ED9C28EF
index 1a4af80..99fc258 100644
--- a/debian-maintainers-gpg/0x863D4DF2ED9C28EF
+++ b/debian-maintainers-gpg/0x863D4DF2ED9C28EF
Binary files differ
diff --git a/debian-maintainers-gpg/0x914F833437204C75 b/debian-maintainers-gpg/0x914F833437204C75
new file mode 100644
index 0000000..dc9adf4
--- /dev/null
+++ b/debian-maintainers-gpg/0x914F833437204C75
Binary files differ
diff --git a/debian-maintainers-gpg/0x93022BAD0563A51D b/debian-maintainers-gpg/0x93022BAD0563A51D
new file mode 100644
index 0000000..da0bdb6
--- /dev/null
+++ b/debian-maintainers-gpg/0x93022BAD0563A51D
Binary files differ
diff --git a/debian-maintainers-gpg/0xA2591E231E251F36 b/debian-maintainers-gpg/0xA2591E231E251F36
index cca6fac..c5257d1 100644
--- a/debian-maintainers-gpg/0xA2591E231E251F36
+++ b/debian-maintainers-gpg/0xA2591E231E251F36
Binary files differ
diff --git a/debian-maintainers-gpg/0xC5C329EC35C2E2F1 b/debian-maintainers-gpg/0xC5C329EC35C2E2F1
index 96d5dc5..6f2bbdc 100644
--- a/debian-maintainers-gpg/0xC5C329EC35C2E2F1
+++ b/debian-maintainers-gpg/0xC5C329EC35C2E2F1
Binary files differ
diff --git a/debian-maintainers-gpg/0xC654FB332AD59860 b/debian-maintainers-gpg/0xC654FB332AD59860
deleted file mode 100644
index 301d0b3..0000000
--- a/debian-maintainers-gpg/0xC654FB332AD59860
+++ /dev/null
Binary files differ
diff --git a/debian-maintainers-gpg/0xC9B0AC74C72B5836 b/debian-maintainers-gpg/0xC9B0AC74C72B5836
index 8d2773b..9a03244 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
index 3a2b9ec..8d2796f 100644
--- a/debian-maintainers-gpg/0xCA8D40019EBD4E93
+++ b/debian-maintainers-gpg/0xCA8D40019EBD4E93
Binary files differ
diff --git a/debian-maintainers-gpg/0xCFBBFCE0B74F1B14 b/debian-maintainers-gpg/0xCFBBFCE0B74F1B14
index 6a05673..5a45290 100644
--- a/debian-maintainers-gpg/0xCFBBFCE0B74F1B14
+++ b/debian-maintainers-gpg/0xCFBBFCE0B74F1B14
Binary files differ
diff --git a/debian-maintainers-gpg/0xE4AFEBC61BB4B289 b/debian-maintainers-gpg/0xE4AFEBC61BB4B289
index 82f6a5d..eb93224 100644
--- a/debian-maintainers-gpg/0xE4AFEBC61BB4B289
+++ b/debian-maintainers-gpg/0xE4AFEBC61BB4B289
Binary files differ
diff --git a/debian-maintainers-gpg/0xE6C710E2E5C1E4A3 b/debian-maintainers-gpg/0xE6C710E2E5C1E4A3
index 8c41cd8..fce0942 100644
--- a/debian-maintainers-gpg/0xE6C710E2E5C1E4A3
+++ b/debian-maintainers-gpg/0xE6C710E2E5C1E4A3
Binary files differ
diff --git a/debian-maintainers-gpg/0xECB73E37E887AA8C b/debian-maintainers-gpg/0xECB73E37E887AA8C
new file mode 100644
index 0000000..379fda5
--- /dev/null
+++ b/debian-maintainers-gpg/0xECB73E37E887AA8C
Binary files differ
diff --git a/debian-maintainers-gpg/0xED34CEABE27BAABC b/debian-maintainers-gpg/0xED34CEABE27BAABC
index dd7a8d9..5cc3474 100644
--- a/debian-maintainers-gpg/0xED34CEABE27BAABC
+++ b/debian-maintainers-gpg/0xED34CEABE27BAABC
Binary files differ
diff --git a/debian-nonupload-gpg/0x83E7EA669A19CB94 b/debian-nonupload-gpg/0x83E7EA669A19CB94
index 3574239..8330f47 100644
--- a/debian-nonupload-gpg/0x83E7EA669A19CB94
+++ b/debian-nonupload-gpg/0x83E7EA669A19CB94
Binary files differ
diff --git a/debian-keyring-gpg/0x1988BAC881E23B3C b/emeritus-keyring-gpg/0x1988BAC881E23B3C
index 472578d..472578d 100644
--- a/debian-keyring-gpg/0x1988BAC881E23B3C
+++ b/emeritus-keyring-gpg/0x1988BAC881E23B3C
Binary files differ
diff --git a/debian-nonupload-gpg/0x6887935AB297B391 b/emeritus-keyring-gpg/0x6887935AB297B391
index b1e48fe..b1e48fe 100644
--- a/debian-nonupload-gpg/0x6887935AB297B391
+++ b/emeritus-keyring-gpg/0x6887935AB297B391
Binary files differ
diff --git a/debian-keyring-gpg/0x95BD42E195D12EF7 b/emeritus-keyring-gpg/0x95BD42E195D12EF7
index 13478f5..13478f5 100644
--- a/debian-keyring-gpg/0x95BD42E195D12EF7
+++ b/emeritus-keyring-gpg/0x95BD42E195D12EF7
Binary files differ
diff --git a/debian-keyring-gpg/0x9AED197FD311BBA1 b/emeritus-keyring-gpg/0x9AED197FD311BBA1
index d340b33..d340b33 100644
--- a/debian-keyring-gpg/0x9AED197FD311BBA1
+++ b/emeritus-keyring-gpg/0x9AED197FD311BBA1
Binary files differ
diff --git a/keyids b/keyids
index 92e80be..db76a31 100644
--- a/keyids
+++ b/keyids
@@ -330,6 +330,7 @@
0x1E4F6649EA291785 Matt Taggart <taggart>
0x1E5276729197B5F9 Devin Carraway <devin>
0x1E7091B1F14A64A2 Aaron M. Ucko <ucko>
+0x1E759A726A9FDD74 Christopher Knadle <krait>
0x1E9310D9ADCE6065 Matt Kraai <kraai>
0x1E953E27D4311E58 Chris Lamb <lamby>
0x1EA8E5AA9725F63B Damyan Ivanov <dmn>
@@ -662,6 +663,7 @@
0x41CE7F0B9F1B8B32 Santiago Vila <sanvila>
0x41DC1C907244970B Kurt Roeckx <kroeckx>
0x420A4295E9DBDDBC Steve Kostecke <steve>
+0x427E381D05190E55 Kyle John Robbertze <paddatrapper>
0x42959C6163A8B719 David Huggins-Daines <dhd>
0x429F015B096C4DD3 Keith Packard <keithp>
0x42EE72DAC27319AD Thomas Bechtold <toabctl>
@@ -903,6 +905,7 @@
0x5AC47FD9A0F2EB10 Lisa Baron <jeffity>
0x5ACE8D6E0C14A470 Luke Faraone <lfaraone>
0x5ACFC4840D62001B David Martínez <ender>
+0x5AD75B414EA41667 Georg Faerber <georg>
0x5B0181EC978BF669 Joost Kooij <joost>
0x5B8FE2F59D1B82F6 Andre Luis Lopes <andrelop>
0x5B924EE310055CD3 Marcelo Jorge Vieira <metal>
@@ -1430,6 +1433,7 @@
0x9128875A82DD0E65 Dale Scheetz <dwarf>
0x912924FE3DC29B41 Milan Zamazal <pdm>
0x91374E81825BEF79 Mattias Wadenstein <maswan>
+0x914F833437204C75 Nico Schlömer <nschloe>
0x9168856B48BFF157 Neale Pickett <neale>
0x91ACEA99DC0D40AD Romain Lerallut <romain>
0x91AD581ADAF6CE93 Sebastien Delafond <seb>
@@ -1440,6 +1444,7 @@
0x92BC94766394265E Peter Karlsson <peterk>
0x92E0BDE7C6002CBD Paul Brossier <piem>
0x92E60A8B5F6D8015 Kalle Kivimaa <killer>
+0x93022BAD0563A51D Teus Benschop <teusbenschop>
0x9306C9BCDAF1054C Maitland Bottoms <bottoms>
0x9355686F01884051 joost witteveen <joostje>
0x937A206B4A5D72FE Rafael Laboissiere <rafael>
@@ -1800,6 +1805,7 @@
0xB735A649E0BA04C1 Ralf Treinen <treinen>
0xB756A78C882A6C4B Gustavo Noronha Silva <kov>
0xB7635728153FF940 Joachim Reichel <reichel>
+0xB77D2E2E23735427 Balasankar C <balasankarc>
0xB7F68E1C797E641D Ben Pfaff <pfaffben>
0xB828A71C00530C24 Brian May <bam>
0xB82A217AFDFE09F2 David Prévot <taffit>
@@ -1852,6 +1858,7 @@
0xBC372252CA1CF964 Ansgar Burchardt <ansgar>
0xBC5758175230514A Shaun Jackman <sjackman>
0xBC6AFB5BA1EE761C Pierre Habouzit <madcoder>
+0xBC8031288D89A751 Chris Halls <halls>
0xBC9B473384FB46D6 Lucas Wall <lwall>
0xBCBBC495718A9256 Wesley W. Terpstra <terpstra>
0xBCBCB2C82BE2FE81 Mark Johnson <mrj>
diff --git a/scripts/process-rt b/scripts/process-rt
index 3efc49a..9dfa0e7 100755
--- a/scripts/process-rt
+++ b/scripts/process-rt
@@ -514,9 +514,19 @@ if state['action'] == 'add':
elif requester not in DAM:
print('Signature for DD/DN add must come from DAM.')
sys.exit(-1)
+# Output our state for confirmation, without the keydata
pp = pprint.PrettyPrinter()
-pp.pprint(state)
-# sys.exit(-1)
+s = dict(state)
+if 'keydata' in s:
+ del s['keydata']
+pp.pprint(s)
+proceed = input("Do you wish to proceed? [y/n]: ")
+if proceed.lower() not in ['y', 'yes']:
+ print("Aborting.")
+ # If this was an add we need to make sure the key isn't in our keyring
+ if state['action'] in ['add', 'replace']:
+ delete_key(get_gpg_ctx(), state['keyid'])
+ sys.exit(-1)
do_action(state)
do_dch(state)
do_git_template(state)
diff --git a/scripts/replace-key b/scripts/replace-key
index c84e2e6..b5f9998 100755
--- a/scripts/replace-key
+++ b/scripts/replace-key
@@ -22,6 +22,7 @@ export GNUPGHOME
cat > "$GNUPGHOME"/gpg.conf <<EOF
keyid-format 0xlong
keyserver hkps.pool.sks-keyservers.net
+no-autostart
EOF
trap cleanup exit
cleanup () {
diff --git a/scripts/update-key b/scripts/update-key
index fdd3f00..c0126a5 100755
--- a/scripts/update-key
+++ b/scripts/update-key
@@ -25,6 +25,7 @@ export GNUPGHOME
cat > "$GNUPGHOME"/gpg.conf <<EOF
keyid-format 0xlong
no-auto-check-trustdb
+no-autostart
EOF
if [ "$NOCLEAN" = "0" ]; then
diff --git a/t/at-least-2048.t b/t/at-least-2048.t
index 2c3442b..fc0b06c 100755
--- a/t/at-least-2048.t
+++ b/t/at-least-2048.t
@@ -6,9 +6,11 @@ find_too_short () {
k=$1
gpg --no-options --no-auto-check-trustdb --no-default-keyring \
--keyring "./output/keyrings/$k" --list-keys --with-colons \
- | grep -a '^pub' \
| awk -F: -v keyring=$1 \
- '$3 < 2048 {print keyring ":\t0x" $5 " is smaller than 2048 bits"}'
+ 'BEGIN { ok = 1 } \
+ /^pub/ { fpr = $5 ; if ($3 < 2048) { print keyring ":\t0x" $5 " is smaller than 2048 bits"; ok = 0 } } \
+ /^sub/ { if ($2 != "r" && $2 != "e" && $3 < 2048 && $4 < 19) { print keyring ":\t0x" fpr " has subkey smaller than 2048 bits"; ok = 0 } } \
+ END { if (!ok) { exit 1 } }'
}
fail=0
diff --git a/t/no-expired.t b/t/no-expired.t
index 6be403f..7ac6eb8 100755
--- a/t/no-expired.t
+++ b/t/no-expired.t
@@ -8,7 +8,7 @@ find_expired () {
--keyring "./output/keyrings/$k" --list-keys --with-colons \
| grep -a '^pub' \
| awk -F: -v keyring=$1 \
- '$2 == "e" {print keyring ":\t0x" $5 " expired on " $7 " (" $10 ")"}'
+ '$2 == "e" {print keyring ":\t0x" $5 " expired on " strftime("%F %T", $7) " (" $10 ")"}'
}
fail=0
diff --git a/t/no-revoked.t b/t/no-revoked.t
index ab4bbfa..efd90b0 100755
--- a/t/no-revoked.t
+++ b/t/no-revoked.t
@@ -8,7 +8,9 @@ find_revoked () {
--keyring "./output/keyrings/$k" --list-keys --with-colons \
| grep -a '^pub' \
| awk -F: -v keyring=$1 \
- '$2 == "r" {print keyring ":\t0x" $5 " is revoked"}'
+ 'BEGIN { ok = 1 } \
+ $2 == "r" {print keyring ":\t0x" $5 " is revoked"; ok = 0} \
+ END { if (!ok) { exit 1 } }'
}
fail=0