summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-30 16:15:26 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-30 16:15:35 +0000
commit8d4383ce42312f5c1e441f5bbb9493c510f04565 (patch)
treee372030f5dece9bdee7ddac1bfd0e0ddd08da1ce
parentReleasing progress-linux version 2018.07.24-0+dschinn1. (diff)
downloaddebian-keyring-8d4383ce42312f5c1e441f5bbb9493c510f04565.zip
debian-keyring-8d4383ce42312f5c1e441f5bbb9493c510f04565.tar.xz
Merging upstream version 2018.09.30.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--cheatsheets/infrastructure/adding-new-member.txt23
-rw-r--r--cheatsheets/infrastructure/kaufmann.txt61
-rw-r--r--debian-keyring-gpg/0x054BBB9F7D806442bin6032 -> 10993 bytes
-rw-r--r--debian-keyring-gpg/0x0664A76954265E8Cbin13828 -> 9249 bytes
-rw-r--r--debian-keyring-gpg/0x06EAA066E397832Fbin204927 -> 216327 bytes
-rw-r--r--debian-keyring-gpg/0x07FC4891042BA65Abin0 -> 22062 bytes
-rw-r--r--debian-keyring-gpg/0x0C48EA2A7A8FFD7Bbin7222 -> 12293 bytes
-rw-r--r--debian-keyring-gpg/0x0D442664194974E2 (renamed from debian-maintainers-gpg/0x0D442664194974E2)bin27913 -> 27913 bytes
-rw-r--r--debian-keyring-gpg/0x0F56D0553B6D411Bbin88251 -> 101751 bytes
-rw-r--r--debian-keyring-gpg/0x11362600A747ECD9bin8044 -> 9867 bytes
-rw-r--r--debian-keyring-gpg/0x1762E0227034CF84bin33276 -> 33912 bytes
-rw-r--r--debian-keyring-gpg/0x17B1CA7D64089528bin23065 -> 24772 bytes
-rw-r--r--debian-keyring-gpg/0x2064C53641C25E5Dbin70189 -> 68840 bytes
-rw-r--r--debian-keyring-gpg/0x283681BA6FE7F41Dbin40489 -> 38295 bytes
-rw-r--r--debian-keyring-gpg/0x28FA801A43BDD637bin43574 -> 39360 bytes
-rw-r--r--debian-keyring-gpg/0x2930100100003344bin13642 -> 9843 bytes
-rw-r--r--debian-keyring-gpg/0x2C7C3146C1A00121bin168447 -> 171156 bytes
-rw-r--r--debian-keyring-gpg/0x30550F7871EF0BA8bin35538 -> 38977 bytes
-rw-r--r--debian-keyring-gpg/0x3116BA5E9FFA69A3bin41988 -> 37266 bytes
-rw-r--r--debian-keyring-gpg/0x348A778D6885EF8Fbin58727 -> 63879 bytes
-rw-r--r--debian-keyring-gpg/0x357312559D1E064Bbin78190 -> 79888 bytes
-rw-r--r--debian-keyring-gpg/0x3631D4FB7FF2B8B8bin16866 -> 24133 bytes
-rw-r--r--debian-keyring-gpg/0x3C4107E6826C40E4 (renamed from debian-maintainers-gpg/0x3C4107E6826C40E4)bin16944 -> 19843 bytes
-rw-r--r--debian-keyring-gpg/0x4664E07DBDA485C5bin17908 -> 21328 bytes
-rw-r--r--debian-keyring-gpg/0x4B043FCDB9444540bin94850 -> 97423 bytes
-rw-r--r--debian-keyring-gpg/0x4DE8FF2A63C7CC90bin41804 -> 54713 bytes
-rw-r--r--debian-keyring-gpg/0x5299B4990437AC41bin12512 -> 10041 bytes
-rw-r--r--debian-keyring-gpg/0x52FC8E7BEDB7FCA2 (renamed from debian-maintainers-gpg/0x52FC8E7BEDB7FCA2)bin14436 -> 14436 bytes
-rw-r--r--debian-keyring-gpg/0x5394479DD3524C51bin155514 -> 154918 bytes
-rw-r--r--debian-keyring-gpg/0x55AD141521E764DFbin54827 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0x55CF1BF986ABB9C7 (renamed from debian-maintainers-gpg/0x55CF1BF986ABB9C7)bin4403 -> 4403 bytes
-rw-r--r--debian-keyring-gpg/0x56034877E1F87C35bin23610 -> 26929 bytes
-rw-r--r--debian-keyring-gpg/0x5759F35001AA4A64bin95984 -> 98791 bytes
-rw-r--r--debian-keyring-gpg/0x587979573442684Ebin215076 -> 222467 bytes
-rw-r--r--debian-keyring-gpg/0x5ACE8D6E0C14A470bin53908 -> 54568 bytes
-rw-r--r--debian-keyring-gpg/0x5C13D6DB93052E03bin64020 -> 64020 bytes
-rw-r--r--debian-keyring-gpg/0x5D328D082AAAB140bin147663 -> 144114 bytes
-rw-r--r--debian-keyring-gpg/0x612EF1613E050F54 (renamed from debian-maintainers-gpg/0x612EF1613E050F54)bin6235 -> 6235 bytes
-rw-r--r--debian-keyring-gpg/0x62645EB35F686A8A (renamed from debian-maintainers-gpg/0x62645EB35F686A8A)bin4425 -> 4425 bytes
-rw-r--r--debian-keyring-gpg/0x63F7800A23D7B252bin0 -> 3494 bytes
-rw-r--r--debian-keyring-gpg/0x664F1238AA8F138Abin40379 -> 44907 bytes
-rw-r--r--debian-keyring-gpg/0x673A03E4C1DB921Fbin209951 -> 213333 bytes
-rw-r--r--debian-keyring-gpg/0x6ACEDAAE40DD2B46 (renamed from debian-maintainers-gpg/0x6ACEDAAE40DD2B46)bin7531 -> 8724 bytes
-rw-r--r--debian-keyring-gpg/0x6C6ACD6417B3ACB1bin57870 -> 72028 bytes
-rw-r--r--debian-keyring-gpg/0x6CACA448860CDC13bin27785 -> 43522 bytes
-rw-r--r--debian-keyring-gpg/0x7127E5ABEEF946C8bin4873 -> 4925 bytes
-rw-r--r--debian-keyring-gpg/0x71A7E533F291A324 (renamed from debian-maintainers-gpg/0x71A7E533F291A324)bin10529 -> 10529 bytes
-rw-r--r--debian-keyring-gpg/0x72CF8E5E25B4C293bin10740 -> 15436 bytes
-rw-r--r--debian-keyring-gpg/0x7541CFAAFC35EACF (renamed from debian-maintainers-gpg/0x7541CFAAFC35EACF)bin5517 -> 5517 bytes
-rw-r--r--debian-keyring-gpg/0x762B57BB784206ADbin96730 -> 92845 bytes
-rw-r--r--debian-keyring-gpg/0x76D58093F540ABCDbin33818 -> 26156 bytes
-rw-r--r--debian-keyring-gpg/0x7CFCD8CD257721E9bin52681 -> 60326 bytes
-rw-r--r--debian-keyring-gpg/0x83016014251D1DB0bin13876 -> 18358 bytes
-rw-r--r--debian-keyring-gpg/0x8C82169D8ECECD2Abin9994 -> 9534 bytes
-rw-r--r--debian-keyring-gpg/0x9688FFC1C78102DFbin64400 -> 78972 bytes
-rw-r--r--debian-keyring-gpg/0x97BA9CE761A0963Bbin70255 -> 74783 bytes
-rw-r--r--debian-keyring-gpg/0x9AFB7B8C9A5F5BBCbin7090 -> 7142 bytes
-rw-r--r--debian-keyring-gpg/0x9D0470BDA6CDC457bin13418 -> 15840 bytes
-rw-r--r--debian-keyring-gpg/0x9EC002FE1C9CA517bin106487 -> 107126 bytes
-rw-r--r--debian-keyring-gpg/0x9FB9262724B17D29bin19214 -> 18400 bytes
-rw-r--r--debian-keyring-gpg/0xA04AB3BADBE263EEbin11047 -> 12247 bytes
-rw-r--r--debian-keyring-gpg/0xAB645F406286A7D0bin12158 -> 15416 bytes
-rw-r--r--debian-keyring-gpg/0xAB98288E36D33D07bin10718 -> 13692 bytes
-rw-r--r--debian-keyring-gpg/0xAEED6158020EAFFFbin64733 -> 69968 bytes
-rw-r--r--debian-keyring-gpg/0xB01FEA84617B586Dbin86145 -> 74192 bytes
-rw-r--r--debian-keyring-gpg/0xB06662EC9C0C1404bin46270 -> 55510 bytes
-rw-r--r--debian-keyring-gpg/0xB5754A69B6BE608Cbin208593 -> 232044 bytes
-rw-r--r--debian-keyring-gpg/0xBBC17EBB1396F2F7bin24078 -> 33700 bytes
-rw-r--r--debian-keyring-gpg/0xBBF68F03E8F37941bin20401 -> 24446 bytes
-rw-r--r--debian-keyring-gpg/0xBC1256AA6AA6EC5Ebin12180 -> 15649 bytes
-rw-r--r--debian-keyring-gpg/0xC293E7B461825ACE (renamed from debian-maintainers-gpg/0xC293E7B461825ACE)bin3892 -> 3892 bytes
-rw-r--r--debian-keyring-gpg/0xC39E74E049E3ACD3bin17608 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0xC3F436CA30F5D8EBbin35328 -> 41073 bytes
-rw-r--r--debian-keyring-gpg/0xC61A64DCF1393998bin19465 -> 19941 bytes
-rw-r--r--debian-keyring-gpg/0xCC65B0CDEC275D5Bbin60644 -> 78400 bytes
-rw-r--r--debian-keyring-gpg/0xCD3CEA34F42AA45Dbin0 -> 13762 bytes
-rw-r--r--debian-keyring-gpg/0xCE1F9C674512C22Abin13571 -> 11955 bytes
-rw-r--r--debian-keyring-gpg/0xCF0E265B7DFBB2F2bin0 -> 21999 bytes
-rw-r--r--debian-keyring-gpg/0xD15D313882004173bin109338 -> 112911 bytes
-rw-r--r--debian-keyring-gpg/0xD84747ACE4B6813Dbin26834 -> 28008 bytes
-rw-r--r--debian-keyring-gpg/0xDECF849AA6357FB7bin96304 -> 95714 bytes
-rw-r--r--debian-keyring-gpg/0xDF6D76C44D696F6Bbin19697 -> 19020 bytes
-rw-r--r--debian-keyring-gpg/0xDFF738C2D16CFBA2bin45047 -> 0 bytes
-rw-r--r--debian-keyring-gpg/0xE352D5C51C5041D4bin67755 -> 66320 bytes
-rw-r--r--debian-keyring-gpg/0xE5AB5F161CDD0D98bin13745 -> 18936 bytes
-rw-r--r--debian-keyring-gpg/0xE63716F4E069949Ebin13940 -> 15026 bytes
-rw-r--r--debian-keyring-gpg/0xE69822C7E02958CD (renamed from debian-maintainers-gpg/0xE69822C7E02958CD)bin13130 -> 18295 bytes
-rw-r--r--debian-keyring-gpg/0xEC9D370872BC7A8Cbin0 -> 26156 bytes
-rw-r--r--debian-keyring-gpg/0xECB73E37E887AA8Cbin22351 -> 20064 bytes
-rw-r--r--debian-keyring-gpg/0xF5C83C05D9CEEEEEbin113817 -> 115515 bytes
-rw-r--r--debian-keyring-gpg/0xF6D3495BB0AE9A02bin228805 -> 233898 bytes
-rw-r--r--debian-keyring-gpg/0xFA0C410738C9D903bin38238 -> 42720 bytes
-rw-r--r--debian-maintainers-gpg/0x0CB18E521B24F3FFbin6098 -> 6719 bytes
-rw-r--r--debian-maintainers-gpg/0x2948210746DF73C0bin0 -> 2831 bytes
-rw-r--r--debian-maintainers-gpg/0x36C361440C9BC971bin9421 -> 13532 bytes
-rw-r--r--debian-maintainers-gpg/0x427E381D05190E55bin36587 -> 36081 bytes
-rw-r--r--debian-maintainers-gpg/0x479EC24F95C71D61bin4932 -> 6686 bytes
-rw-r--r--debian-maintainers-gpg/0x4A0CF639427884E3bin0 -> 4040 bytes
-rw-r--r--debian-maintainers-gpg/0x5AD75B414EA41667bin12002 -> 14266 bytes
-rw-r--r--debian-maintainers-gpg/0x61F3442674DE6624bin5727 -> 6951 bytes
-rw-r--r--debian-maintainers-gpg/0x6C6580E77BD756C4 (renamed from debian-keyring-gpg/0x6C6580E77BD756C4)bin55720 -> 55720 bytes
-rw-r--r--debian-maintainers-gpg/0x7EAE264181E773D5bin106387 -> 109681 bytes
-rw-r--r--debian-maintainers-gpg/0x8EFD9702F888B2AEbin6283 -> 7946 bytes
-rw-r--r--debian-maintainers-gpg/0xA8822153B391646Dbin6317 -> 8668 bytes
-rw-r--r--debian-maintainers-gpg/0xB3C2C7B73BA3CD7Fbin0 -> 5656 bytes
-rw-r--r--debian-maintainers-gpg/0xC0831D1F15E0DA64bin0 -> 6931 bytes
-rw-r--r--debian-maintainers-gpg/0xC617869F1478504Ebin12460 -> 11484 bytes
-rw-r--r--debian-maintainers-gpg/0xC89D5712DF945F6Fbin5663 -> 7375 bytes
-rw-r--r--debian-maintainers-gpg/0xCF0E265B7DFBB2F2bin7878 -> 0 bytes
-rw-r--r--debian-maintainers-gpg/0xD22C1A883455D448bin0 -> 6275 bytes
-rw-r--r--debian-maintainers-gpg/0xE27F2CF8458C2FA4bin7477 -> 9741 bytes
-rw-r--r--debian-maintainers-gpg/0xE7BC91544F3A531Bbin0 -> 5200 bytes
-rw-r--r--debian-maintainers-gpg/0xF505691E3867FB84bin3438 -> 6347 bytes
-rw-r--r--debian-maintainers-gpg/0xFD49D0BC6FEAECDAbin0 -> 2299 bytes
-rw-r--r--debian-nonupload-gpg/0x7F55BB12A40F862Ebin49203 -> 49769 bytes
-rw-r--r--debian-nonupload-gpg/0xBB41D45770EF06F7bin27946 -> 37476 bytes
-rw-r--r--debian-nonupload-gpg/0xCFBBFCE0B74F1B14 (renamed from debian-maintainers-gpg/0xCFBBFCE0B74F1B14)bin45852 -> 45852 bytes
-rw-r--r--emeritus-keyring-gpg/0x7F36CF55AA87AA77 (renamed from debian-keyring-gpg/0x7F36CF55AA87AA77)bin31053 -> 31053 bytes
-rw-r--r--keyids21
-rwxr-xr-xscripts/process-rt17
-rwxr-xr-xscripts/update-key5
-rwxr-xr-xscripts/update-keyrings52
122 files changed, 116 insertions, 63 deletions
diff --git a/cheatsheets/infrastructure/adding-new-member.txt b/cheatsheets/infrastructure/adding-new-member.txt
new file mode 100644
index 0000000..6b2c7ec
--- /dev/null
+++ b/cheatsheets/infrastructure/adding-new-member.txt
@@ -0,0 +1,23 @@
+When adding a new member to the keyring-maint team there are various
+steps which need to be performed.
+
+ * Signed email to DSA (admin@rt.debian.org, remember to add Debian RT
+ in the subject). This should include the name + Debian username of
+ the new team member and ask for the following:
+
+ * User addition to keyring group (which will allow access to
+ kaufmann)
+ * Addition to "Keyring Maintainers" LDAP object to enable editing of
+ fingerprint objects
+ * User account on rt.debian.org with access to the 2 keyring queues
+ * Addition to keyring-maint@debian.org email alias
+ * Import new member's Debian key into debian-trustedkeys.gpg
+ * Potential modification of dsa-misc/scripts/sync-keyring to include
+ new member's fingerprint
+
+ * Inform the NM Front Desk team with username, email address +
+ fingerprint details so keyring/git_ops.py and keyring/housekeeping.py
+ can be updated with the additional details
+
+ * Inform FTP master of the new member + fingerprint so they can be
+ added to DM-Admin / AdminFingerprints in dak.conf
diff --git a/cheatsheets/infrastructure/kaufmann.txt b/cheatsheets/infrastructure/kaufmann.txt
index 7f4a0e9..cd6c0fa 100644
--- a/cheatsheets/infrastructure/kaufmann.txt
+++ b/cheatsheets/infrastructure/kaufmann.txt
@@ -1,48 +1,23 @@
-kaufmann.debian.org layout
-==========================
+Pushing the changes to kaufmann.debian.org
+==========================================
+
+'mosca$' means the commands should be run on your own computer (it's
+gwolf's desktop name); of course, 'kaufmann$' means said steps are to
+be run from kaufmann.
mosca$ make
+mosca$ make test
+
+This will complain about expired keys and other common
+mistakes. Double check its output - Sometimes weak subkeys are added,
+they will be reported here!
+
mosca$ gpg --clearsign output/sha512sums.txt
mosca$ mv output/sha512sums.txt.asc output/sha512sums.txt
-mosca$ scp output/sha512sums.txt kaufmann.debian.org:/srv/keyring.debian.org/pub
-mosca$ scp output/keyrings/* kaufmann.debian.org:/srv/keyring.debian.org/pub/keyrings
+mosca$ scp scripts/update-keyrings kaufmann.debian.org:
+mosca$ scp -r output/ kaufmann.debian.org:
mosca$ git push git@salsa.debian.org:debian-keyring/keyring.git master
-
-kaufmann$ cat /home/noodles/update-keyrings
-#!/bin/bash
-
-SRCKEYRINGDIR=/srv/keyring.debian.org/master-keyring/output
-OUTPUTDIR=/srv/keyring.debian.org/pub
-HKPDIR=/srv/keyring.debian.org/keyrings-new
-PENDINGDIR=/srv/keyring.debian.org/pending-updates
-
-if ! gpg --batch --quiet --verify ${SRCKEYRINGDIR}/sha512sums.txt 2> /dev/null; \
- then
- echo sha512sums for update is not signed.
- exit 1
-fi
-
-cd ${SRCKEYRINGDIR}
-if ! sha512sum -c sha512sums.txt; then
- echo sha512sums for update does not match files.
- exit 1
-fi
-
-if [ -e ${PENDINGDIR}/debian-keyring.gpg -o \
- -e ${PENDINGDIR}/debian-maintainers.gpg -o \
- -e ${PENDINGDIR}/debian-nonupload.gpg ]; then
- echo Unhandled pending updates.
- exit 1
-fi
-
-cp ${HKPDIR}/debian-keyring.gpg ${PENDINGDIR}
-cp ${HKPDIR}/debian-maintainers.gpg ${PENDINGDIR}
-cp ${HKPDIR}/debian-nonupload.gpg ${PENDINGDIR}
-
-echo Updating active keyrings.
-cp -r ${SRCKEYRINGDIR}/* ${OUTPUTDIR}/
-echo Updating HKP keyrings.
-cp -r ${SRCKEYRINGDIR}/keyrings/debian-keyring.gpg \
- ${SRCKEYRINGDIR}/keyrings/debian-maintainers.gpg \
- ${SRCKEYRINGDIR}/keyrings/debian-nonupload.gpg \
- ${HKPDIR}/
+mosca$ ssh kaufmann
+kaufmann$ cp output/sha512sums.txt /srv/keyring.debian.org/pub
+kaufmann$ cp output/keyrings/* /srv/keyring.debian.org/pub/keyrings
+kaufmann$ ./update-keyrings ./output/keyrings
diff --git a/debian-keyring-gpg/0x054BBB9F7D806442 b/debian-keyring-gpg/0x054BBB9F7D806442
index 3f7549f..e5ab9a5 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 aa8cbb8..a8d1856 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 bc2bd9f..525a163 100644
--- a/debian-keyring-gpg/0x06EAA066E397832F
+++ b/debian-keyring-gpg/0x06EAA066E397832F
Binary files differ
diff --git a/debian-keyring-gpg/0x07FC4891042BA65A b/debian-keyring-gpg/0x07FC4891042BA65A
new file mode 100644
index 0000000..f302c4a
--- /dev/null
+++ b/debian-keyring-gpg/0x07FC4891042BA65A
Binary files differ
diff --git a/debian-keyring-gpg/0x0C48EA2A7A8FFD7B b/debian-keyring-gpg/0x0C48EA2A7A8FFD7B
index 96258cf..773e843 100644
--- a/debian-keyring-gpg/0x0C48EA2A7A8FFD7B
+++ b/debian-keyring-gpg/0x0C48EA2A7A8FFD7B
Binary files differ
diff --git a/debian-maintainers-gpg/0x0D442664194974E2 b/debian-keyring-gpg/0x0D442664194974E2
index 3e23c78..3e23c78 100644
--- a/debian-maintainers-gpg/0x0D442664194974E2
+++ b/debian-keyring-gpg/0x0D442664194974E2
Binary files differ
diff --git a/debian-keyring-gpg/0x0F56D0553B6D411B b/debian-keyring-gpg/0x0F56D0553B6D411B
index 0bf2cf2..4eb91c5 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 43821d0..b75fd5a 100644
--- a/debian-keyring-gpg/0x11362600A747ECD9
+++ b/debian-keyring-gpg/0x11362600A747ECD9
Binary files differ
diff --git a/debian-keyring-gpg/0x1762E0227034CF84 b/debian-keyring-gpg/0x1762E0227034CF84
index 00075a6..73f7b64 100644
--- a/debian-keyring-gpg/0x1762E0227034CF84
+++ b/debian-keyring-gpg/0x1762E0227034CF84
Binary files differ
diff --git a/debian-keyring-gpg/0x17B1CA7D64089528 b/debian-keyring-gpg/0x17B1CA7D64089528
index 50cf3f5..b5a3f02 100644
--- a/debian-keyring-gpg/0x17B1CA7D64089528
+++ b/debian-keyring-gpg/0x17B1CA7D64089528
Binary files differ
diff --git a/debian-keyring-gpg/0x2064C53641C25E5D b/debian-keyring-gpg/0x2064C53641C25E5D
index 1fd7306..5d65fdb 100644
--- a/debian-keyring-gpg/0x2064C53641C25E5D
+++ b/debian-keyring-gpg/0x2064C53641C25E5D
Binary files differ
diff --git a/debian-keyring-gpg/0x283681BA6FE7F41D b/debian-keyring-gpg/0x283681BA6FE7F41D
index 287301b..e59d678 100644
--- a/debian-keyring-gpg/0x283681BA6FE7F41D
+++ b/debian-keyring-gpg/0x283681BA6FE7F41D
Binary files differ
diff --git a/debian-keyring-gpg/0x28FA801A43BDD637 b/debian-keyring-gpg/0x28FA801A43BDD637
index 4f7f194..3d05758 100644
--- a/debian-keyring-gpg/0x28FA801A43BDD637
+++ b/debian-keyring-gpg/0x28FA801A43BDD637
Binary files differ
diff --git a/debian-keyring-gpg/0x2930100100003344 b/debian-keyring-gpg/0x2930100100003344
index a47bd24..61f3d24 100644
--- a/debian-keyring-gpg/0x2930100100003344
+++ b/debian-keyring-gpg/0x2930100100003344
Binary files differ
diff --git a/debian-keyring-gpg/0x2C7C3146C1A00121 b/debian-keyring-gpg/0x2C7C3146C1A00121
index d10aff0..02b497e 100644
--- a/debian-keyring-gpg/0x2C7C3146C1A00121
+++ b/debian-keyring-gpg/0x2C7C3146C1A00121
Binary files differ
diff --git a/debian-keyring-gpg/0x30550F7871EF0BA8 b/debian-keyring-gpg/0x30550F7871EF0BA8
index 45e14d8..767500b 100644
--- a/debian-keyring-gpg/0x30550F7871EF0BA8
+++ b/debian-keyring-gpg/0x30550F7871EF0BA8
Binary files differ
diff --git a/debian-keyring-gpg/0x3116BA5E9FFA69A3 b/debian-keyring-gpg/0x3116BA5E9FFA69A3
index 749bc58..489ab5d 100644
--- a/debian-keyring-gpg/0x3116BA5E9FFA69A3
+++ b/debian-keyring-gpg/0x3116BA5E9FFA69A3
Binary files differ
diff --git a/debian-keyring-gpg/0x348A778D6885EF8F b/debian-keyring-gpg/0x348A778D6885EF8F
index 238fc2b..00621f7 100644
--- a/debian-keyring-gpg/0x348A778D6885EF8F
+++ b/debian-keyring-gpg/0x348A778D6885EF8F
Binary files differ
diff --git a/debian-keyring-gpg/0x357312559D1E064B b/debian-keyring-gpg/0x357312559D1E064B
index bce3402..f973573 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 50bd8b7..165abcc 100644
--- a/debian-keyring-gpg/0x3631D4FB7FF2B8B8
+++ b/debian-keyring-gpg/0x3631D4FB7FF2B8B8
Binary files differ
diff --git a/debian-maintainers-gpg/0x3C4107E6826C40E4 b/debian-keyring-gpg/0x3C4107E6826C40E4
index e5c5c4d..c2975fd 100644
--- a/debian-maintainers-gpg/0x3C4107E6826C40E4
+++ b/debian-keyring-gpg/0x3C4107E6826C40E4
Binary files differ
diff --git a/debian-keyring-gpg/0x4664E07DBDA485C5 b/debian-keyring-gpg/0x4664E07DBDA485C5
index f7392e4..69f02ba 100644
--- a/debian-keyring-gpg/0x4664E07DBDA485C5
+++ b/debian-keyring-gpg/0x4664E07DBDA485C5
Binary files differ
diff --git a/debian-keyring-gpg/0x4B043FCDB9444540 b/debian-keyring-gpg/0x4B043FCDB9444540
index fc4d95f..5de0bbf 100644
--- a/debian-keyring-gpg/0x4B043FCDB9444540
+++ b/debian-keyring-gpg/0x4B043FCDB9444540
Binary files differ
diff --git a/debian-keyring-gpg/0x4DE8FF2A63C7CC90 b/debian-keyring-gpg/0x4DE8FF2A63C7CC90
index 28b3e70..60c9a88 100644
--- a/debian-keyring-gpg/0x4DE8FF2A63C7CC90
+++ b/debian-keyring-gpg/0x4DE8FF2A63C7CC90
Binary files differ
diff --git a/debian-keyring-gpg/0x5299B4990437AC41 b/debian-keyring-gpg/0x5299B4990437AC41
index f72287c..ad5b498 100644
--- a/debian-keyring-gpg/0x5299B4990437AC41
+++ b/debian-keyring-gpg/0x5299B4990437AC41
Binary files differ
diff --git a/debian-maintainers-gpg/0x52FC8E7BEDB7FCA2 b/debian-keyring-gpg/0x52FC8E7BEDB7FCA2
index 6be704a..6be704a 100644
--- a/debian-maintainers-gpg/0x52FC8E7BEDB7FCA2
+++ b/debian-keyring-gpg/0x52FC8E7BEDB7FCA2
Binary files differ
diff --git a/debian-keyring-gpg/0x5394479DD3524C51 b/debian-keyring-gpg/0x5394479DD3524C51
index a651fd0..ab5537f 100644
--- a/debian-keyring-gpg/0x5394479DD3524C51
+++ b/debian-keyring-gpg/0x5394479DD3524C51
Binary files differ
diff --git a/debian-keyring-gpg/0x55AD141521E764DF b/debian-keyring-gpg/0x55AD141521E764DF
deleted file mode 100644
index 2570357..0000000
--- a/debian-keyring-gpg/0x55AD141521E764DF
+++ /dev/null
Binary files differ
diff --git a/debian-maintainers-gpg/0x55CF1BF986ABB9C7 b/debian-keyring-gpg/0x55CF1BF986ABB9C7
index 64aa244..64aa244 100644
--- a/debian-maintainers-gpg/0x55CF1BF986ABB9C7
+++ b/debian-keyring-gpg/0x55CF1BF986ABB9C7
Binary files differ
diff --git a/debian-keyring-gpg/0x56034877E1F87C35 b/debian-keyring-gpg/0x56034877E1F87C35
index 211c1c6..17f262a 100644
--- a/debian-keyring-gpg/0x56034877E1F87C35
+++ b/debian-keyring-gpg/0x56034877E1F87C35
Binary files differ
diff --git a/debian-keyring-gpg/0x5759F35001AA4A64 b/debian-keyring-gpg/0x5759F35001AA4A64
index 914888e..b60e579 100644
--- a/debian-keyring-gpg/0x5759F35001AA4A64
+++ b/debian-keyring-gpg/0x5759F35001AA4A64
Binary files differ
diff --git a/debian-keyring-gpg/0x587979573442684E b/debian-keyring-gpg/0x587979573442684E
index ebed102..07333d9 100644
--- a/debian-keyring-gpg/0x587979573442684E
+++ b/debian-keyring-gpg/0x587979573442684E
Binary files differ
diff --git a/debian-keyring-gpg/0x5ACE8D6E0C14A470 b/debian-keyring-gpg/0x5ACE8D6E0C14A470
index 813c32e..23bea62 100644
--- a/debian-keyring-gpg/0x5ACE8D6E0C14A470
+++ b/debian-keyring-gpg/0x5ACE8D6E0C14A470
Binary files differ
diff --git a/debian-keyring-gpg/0x5C13D6DB93052E03 b/debian-keyring-gpg/0x5C13D6DB93052E03
index 5d6bc7f..e504f2b 100644
--- a/debian-keyring-gpg/0x5C13D6DB93052E03
+++ b/debian-keyring-gpg/0x5C13D6DB93052E03
Binary files differ
diff --git a/debian-keyring-gpg/0x5D328D082AAAB140 b/debian-keyring-gpg/0x5D328D082AAAB140
index 1a9c541..28a8a9b 100644
--- a/debian-keyring-gpg/0x5D328D082AAAB140
+++ b/debian-keyring-gpg/0x5D328D082AAAB140
Binary files differ
diff --git a/debian-maintainers-gpg/0x612EF1613E050F54 b/debian-keyring-gpg/0x612EF1613E050F54
index 2bd2b61..2bd2b61 100644
--- a/debian-maintainers-gpg/0x612EF1613E050F54
+++ b/debian-keyring-gpg/0x612EF1613E050F54
Binary files differ
diff --git a/debian-maintainers-gpg/0x62645EB35F686A8A b/debian-keyring-gpg/0x62645EB35F686A8A
index d605b34..d605b34 100644
--- a/debian-maintainers-gpg/0x62645EB35F686A8A
+++ b/debian-keyring-gpg/0x62645EB35F686A8A
Binary files differ
diff --git a/debian-keyring-gpg/0x63F7800A23D7B252 b/debian-keyring-gpg/0x63F7800A23D7B252
new file mode 100644
index 0000000..c0906fc
--- /dev/null
+++ b/debian-keyring-gpg/0x63F7800A23D7B252
Binary files differ
diff --git a/debian-keyring-gpg/0x664F1238AA8F138A b/debian-keyring-gpg/0x664F1238AA8F138A
index 29c2834..46bfbb0 100644
--- a/debian-keyring-gpg/0x664F1238AA8F138A
+++ b/debian-keyring-gpg/0x664F1238AA8F138A
Binary files differ
diff --git a/debian-keyring-gpg/0x673A03E4C1DB921F b/debian-keyring-gpg/0x673A03E4C1DB921F
index 60fc089..7ac0e79 100644
--- a/debian-keyring-gpg/0x673A03E4C1DB921F
+++ b/debian-keyring-gpg/0x673A03E4C1DB921F
Binary files differ
diff --git a/debian-maintainers-gpg/0x6ACEDAAE40DD2B46 b/debian-keyring-gpg/0x6ACEDAAE40DD2B46
index 7d835f6..de3b196 100644
--- a/debian-maintainers-gpg/0x6ACEDAAE40DD2B46
+++ b/debian-keyring-gpg/0x6ACEDAAE40DD2B46
Binary files differ
diff --git a/debian-keyring-gpg/0x6C6ACD6417B3ACB1 b/debian-keyring-gpg/0x6C6ACD6417B3ACB1
index b2ab5ae..54ac15a 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 b640cad..ca9a955 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 5bbf1fa..963ea5f 100644
--- a/debian-keyring-gpg/0x7127E5ABEEF946C8
+++ b/debian-keyring-gpg/0x7127E5ABEEF946C8
Binary files differ
diff --git a/debian-maintainers-gpg/0x71A7E533F291A324 b/debian-keyring-gpg/0x71A7E533F291A324
index 45017df..45017df 100644
--- a/debian-maintainers-gpg/0x71A7E533F291A324
+++ b/debian-keyring-gpg/0x71A7E533F291A324
Binary files differ
diff --git a/debian-keyring-gpg/0x72CF8E5E25B4C293 b/debian-keyring-gpg/0x72CF8E5E25B4C293
index a1b7d0d..c4bc9b9 100644
--- a/debian-keyring-gpg/0x72CF8E5E25B4C293
+++ b/debian-keyring-gpg/0x72CF8E5E25B4C293
Binary files differ
diff --git a/debian-maintainers-gpg/0x7541CFAAFC35EACF b/debian-keyring-gpg/0x7541CFAAFC35EACF
index 46f7383..46f7383 100644
--- a/debian-maintainers-gpg/0x7541CFAAFC35EACF
+++ b/debian-keyring-gpg/0x7541CFAAFC35EACF
Binary files differ
diff --git a/debian-keyring-gpg/0x762B57BB784206AD b/debian-keyring-gpg/0x762B57BB784206AD
index ef62b3c..ad8ea69 100644
--- a/debian-keyring-gpg/0x762B57BB784206AD
+++ b/debian-keyring-gpg/0x762B57BB784206AD
Binary files differ
diff --git a/debian-keyring-gpg/0x76D58093F540ABCD b/debian-keyring-gpg/0x76D58093F540ABCD
index 453a20b..e4f85cf 100644
--- a/debian-keyring-gpg/0x76D58093F540ABCD
+++ b/debian-keyring-gpg/0x76D58093F540ABCD
Binary files differ
diff --git a/debian-keyring-gpg/0x7CFCD8CD257721E9 b/debian-keyring-gpg/0x7CFCD8CD257721E9
index ca855ec..8b31eb1 100644
--- a/debian-keyring-gpg/0x7CFCD8CD257721E9
+++ b/debian-keyring-gpg/0x7CFCD8CD257721E9
Binary files differ
diff --git a/debian-keyring-gpg/0x83016014251D1DB0 b/debian-keyring-gpg/0x83016014251D1DB0
index f9d4cc0..4c4f507 100644
--- a/debian-keyring-gpg/0x83016014251D1DB0
+++ b/debian-keyring-gpg/0x83016014251D1DB0
Binary files differ
diff --git a/debian-keyring-gpg/0x8C82169D8ECECD2A b/debian-keyring-gpg/0x8C82169D8ECECD2A
index 84f3b1f..dc99401 100644
--- a/debian-keyring-gpg/0x8C82169D8ECECD2A
+++ b/debian-keyring-gpg/0x8C82169D8ECECD2A
Binary files differ
diff --git a/debian-keyring-gpg/0x9688FFC1C78102DF b/debian-keyring-gpg/0x9688FFC1C78102DF
index 2c14835..fee6999 100644
--- a/debian-keyring-gpg/0x9688FFC1C78102DF
+++ b/debian-keyring-gpg/0x9688FFC1C78102DF
Binary files differ
diff --git a/debian-keyring-gpg/0x97BA9CE761A0963B b/debian-keyring-gpg/0x97BA9CE761A0963B
index a39f994..fd9cdb3 100644
--- a/debian-keyring-gpg/0x97BA9CE761A0963B
+++ b/debian-keyring-gpg/0x97BA9CE761A0963B
Binary files differ
diff --git a/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC b/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC
index bc58820..599631e 100644
--- a/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC
+++ b/debian-keyring-gpg/0x9AFB7B8C9A5F5BBC
Binary files differ
diff --git a/debian-keyring-gpg/0x9D0470BDA6CDC457 b/debian-keyring-gpg/0x9D0470BDA6CDC457
index d13d702..465bed5 100644
--- a/debian-keyring-gpg/0x9D0470BDA6CDC457
+++ b/debian-keyring-gpg/0x9D0470BDA6CDC457
Binary files differ
diff --git a/debian-keyring-gpg/0x9EC002FE1C9CA517 b/debian-keyring-gpg/0x9EC002FE1C9CA517
index 490c62c..f903b08 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 d50a357..40586d9 100644
--- a/debian-keyring-gpg/0x9FB9262724B17D29
+++ b/debian-keyring-gpg/0x9FB9262724B17D29
Binary files differ
diff --git a/debian-keyring-gpg/0xA04AB3BADBE263EE b/debian-keyring-gpg/0xA04AB3BADBE263EE
index bd413cd..993f679 100644
--- a/debian-keyring-gpg/0xA04AB3BADBE263EE
+++ b/debian-keyring-gpg/0xA04AB3BADBE263EE
Binary files differ
diff --git a/debian-keyring-gpg/0xAB645F406286A7D0 b/debian-keyring-gpg/0xAB645F406286A7D0
index 3d0aade..b4ef5ad 100644
--- a/debian-keyring-gpg/0xAB645F406286A7D0
+++ b/debian-keyring-gpg/0xAB645F406286A7D0
Binary files differ
diff --git a/debian-keyring-gpg/0xAB98288E36D33D07 b/debian-keyring-gpg/0xAB98288E36D33D07
index 2c0cd82..cdb263e 100644
--- a/debian-keyring-gpg/0xAB98288E36D33D07
+++ b/debian-keyring-gpg/0xAB98288E36D33D07
Binary files differ
diff --git a/debian-keyring-gpg/0xAEED6158020EAFFF b/debian-keyring-gpg/0xAEED6158020EAFFF
index cdd2445..12d4937 100644
--- a/debian-keyring-gpg/0xAEED6158020EAFFF
+++ b/debian-keyring-gpg/0xAEED6158020EAFFF
Binary files differ
diff --git a/debian-keyring-gpg/0xB01FEA84617B586D b/debian-keyring-gpg/0xB01FEA84617B586D
index 39a2ba3..a244971 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 a4b8488..d7471b5 100644
--- a/debian-keyring-gpg/0xB06662EC9C0C1404
+++ b/debian-keyring-gpg/0xB06662EC9C0C1404
Binary files differ
diff --git a/debian-keyring-gpg/0xB5754A69B6BE608C b/debian-keyring-gpg/0xB5754A69B6BE608C
index a8982ef..28f462f 100644
--- a/debian-keyring-gpg/0xB5754A69B6BE608C
+++ b/debian-keyring-gpg/0xB5754A69B6BE608C
Binary files differ
diff --git a/debian-keyring-gpg/0xBBC17EBB1396F2F7 b/debian-keyring-gpg/0xBBC17EBB1396F2F7
index 2b84812..5d3c0a1 100644
--- a/debian-keyring-gpg/0xBBC17EBB1396F2F7
+++ b/debian-keyring-gpg/0xBBC17EBB1396F2F7
Binary files differ
diff --git a/debian-keyring-gpg/0xBBF68F03E8F37941 b/debian-keyring-gpg/0xBBF68F03E8F37941
index 968b6a7..4648414 100644
--- a/debian-keyring-gpg/0xBBF68F03E8F37941
+++ b/debian-keyring-gpg/0xBBF68F03E8F37941
Binary files differ
diff --git a/debian-keyring-gpg/0xBC1256AA6AA6EC5E b/debian-keyring-gpg/0xBC1256AA6AA6EC5E
index a4da471..4e15969 100644
--- a/debian-keyring-gpg/0xBC1256AA6AA6EC5E
+++ b/debian-keyring-gpg/0xBC1256AA6AA6EC5E
Binary files differ
diff --git a/debian-maintainers-gpg/0xC293E7B461825ACE b/debian-keyring-gpg/0xC293E7B461825ACE
index b04c15a..b04c15a 100644
--- a/debian-maintainers-gpg/0xC293E7B461825ACE
+++ b/debian-keyring-gpg/0xC293E7B461825ACE
Binary files differ
diff --git a/debian-keyring-gpg/0xC39E74E049E3ACD3 b/debian-keyring-gpg/0xC39E74E049E3ACD3
deleted file mode 100644
index 20246cf..0000000
--- a/debian-keyring-gpg/0xC39E74E049E3ACD3
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0xC3F436CA30F5D8EB b/debian-keyring-gpg/0xC3F436CA30F5D8EB
index d981797..edae97c 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 10cbd20..b8fae5c 100644
--- a/debian-keyring-gpg/0xC61A64DCF1393998
+++ b/debian-keyring-gpg/0xC61A64DCF1393998
Binary files differ
diff --git a/debian-keyring-gpg/0xCC65B0CDEC275D5B b/debian-keyring-gpg/0xCC65B0CDEC275D5B
index f296a54..a14c449 100644
--- a/debian-keyring-gpg/0xCC65B0CDEC275D5B
+++ b/debian-keyring-gpg/0xCC65B0CDEC275D5B
Binary files differ
diff --git a/debian-keyring-gpg/0xCD3CEA34F42AA45D b/debian-keyring-gpg/0xCD3CEA34F42AA45D
new file mode 100644
index 0000000..0a581a3
--- /dev/null
+++ b/debian-keyring-gpg/0xCD3CEA34F42AA45D
Binary files differ
diff --git a/debian-keyring-gpg/0xCE1F9C674512C22A b/debian-keyring-gpg/0xCE1F9C674512C22A
index 4402e33..1817969 100644
--- a/debian-keyring-gpg/0xCE1F9C674512C22A
+++ b/debian-keyring-gpg/0xCE1F9C674512C22A
Binary files differ
diff --git a/debian-keyring-gpg/0xCF0E265B7DFBB2F2 b/debian-keyring-gpg/0xCF0E265B7DFBB2F2
new file mode 100644
index 0000000..7650b9f
--- /dev/null
+++ b/debian-keyring-gpg/0xCF0E265B7DFBB2F2
Binary files differ
diff --git a/debian-keyring-gpg/0xD15D313882004173 b/debian-keyring-gpg/0xD15D313882004173
index 0e8a333..f260bcc 100644
--- a/debian-keyring-gpg/0xD15D313882004173
+++ b/debian-keyring-gpg/0xD15D313882004173
Binary files differ
diff --git a/debian-keyring-gpg/0xD84747ACE4B6813D b/debian-keyring-gpg/0xD84747ACE4B6813D
index 4311851..d36a58d 100644
--- a/debian-keyring-gpg/0xD84747ACE4B6813D
+++ b/debian-keyring-gpg/0xD84747ACE4B6813D
Binary files differ
diff --git a/debian-keyring-gpg/0xDECF849AA6357FB7 b/debian-keyring-gpg/0xDECF849AA6357FB7
index e179c1d..2769963 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 5369541..5ba135d 100644
--- a/debian-keyring-gpg/0xDF6D76C44D696F6B
+++ b/debian-keyring-gpg/0xDF6D76C44D696F6B
Binary files differ
diff --git a/debian-keyring-gpg/0xDFF738C2D16CFBA2 b/debian-keyring-gpg/0xDFF738C2D16CFBA2
deleted file mode 100644
index c96193e..0000000
--- a/debian-keyring-gpg/0xDFF738C2D16CFBA2
+++ /dev/null
Binary files differ
diff --git a/debian-keyring-gpg/0xE352D5C51C5041D4 b/debian-keyring-gpg/0xE352D5C51C5041D4
index 922fb6b..aeb0a3d 100644
--- a/debian-keyring-gpg/0xE352D5C51C5041D4
+++ b/debian-keyring-gpg/0xE352D5C51C5041D4
Binary files differ
diff --git a/debian-keyring-gpg/0xE5AB5F161CDD0D98 b/debian-keyring-gpg/0xE5AB5F161CDD0D98
index cc9235a..fa083bc 100644
--- a/debian-keyring-gpg/0xE5AB5F161CDD0D98
+++ b/debian-keyring-gpg/0xE5AB5F161CDD0D98
Binary files differ
diff --git a/debian-keyring-gpg/0xE63716F4E069949E b/debian-keyring-gpg/0xE63716F4E069949E
index 9cc4669..6a2dafa 100644
--- a/debian-keyring-gpg/0xE63716F4E069949E
+++ b/debian-keyring-gpg/0xE63716F4E069949E
Binary files differ
diff --git a/debian-maintainers-gpg/0xE69822C7E02958CD b/debian-keyring-gpg/0xE69822C7E02958CD
index 6844f52..3d26fd8 100644
--- a/debian-maintainers-gpg/0xE69822C7E02958CD
+++ b/debian-keyring-gpg/0xE69822C7E02958CD
Binary files differ
diff --git a/debian-keyring-gpg/0xEC9D370872BC7A8C b/debian-keyring-gpg/0xEC9D370872BC7A8C
new file mode 100644
index 0000000..031d87f
--- /dev/null
+++ b/debian-keyring-gpg/0xEC9D370872BC7A8C
Binary files differ
diff --git a/debian-keyring-gpg/0xECB73E37E887AA8C b/debian-keyring-gpg/0xECB73E37E887AA8C
index 2a76672..c06c5f2 100644
--- a/debian-keyring-gpg/0xECB73E37E887AA8C
+++ b/debian-keyring-gpg/0xECB73E37E887AA8C
Binary files differ
diff --git a/debian-keyring-gpg/0xF5C83C05D9CEEEEE b/debian-keyring-gpg/0xF5C83C05D9CEEEEE
index facd95c..c13fa61 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 1f60f0e..435ede9 100644
--- a/debian-keyring-gpg/0xF6D3495BB0AE9A02
+++ b/debian-keyring-gpg/0xF6D3495BB0AE9A02
Binary files differ
diff --git a/debian-keyring-gpg/0xFA0C410738C9D903 b/debian-keyring-gpg/0xFA0C410738C9D903
index c24df19..72c9913 100644
--- a/debian-keyring-gpg/0xFA0C410738C9D903
+++ b/debian-keyring-gpg/0xFA0C410738C9D903
Binary files differ
diff --git a/debian-maintainers-gpg/0x0CB18E521B24F3FF b/debian-maintainers-gpg/0x0CB18E521B24F3FF
index 57a3a2c..5547a01 100644
--- a/debian-maintainers-gpg/0x0CB18E521B24F3FF
+++ b/debian-maintainers-gpg/0x0CB18E521B24F3FF
Binary files differ
diff --git a/debian-maintainers-gpg/0x2948210746DF73C0 b/debian-maintainers-gpg/0x2948210746DF73C0
new file mode 100644
index 0000000..8f457fd
--- /dev/null
+++ b/debian-maintainers-gpg/0x2948210746DF73C0
Binary files differ
diff --git a/debian-maintainers-gpg/0x36C361440C9BC971 b/debian-maintainers-gpg/0x36C361440C9BC971
index ea88862..34ab33a 100644
--- a/debian-maintainers-gpg/0x36C361440C9BC971
+++ b/debian-maintainers-gpg/0x36C361440C9BC971
Binary files differ
diff --git a/debian-maintainers-gpg/0x427E381D05190E55 b/debian-maintainers-gpg/0x427E381D05190E55
index 03a02ac..9ba48af 100644
--- a/debian-maintainers-gpg/0x427E381D05190E55
+++ b/debian-maintainers-gpg/0x427E381D05190E55
Binary files differ
diff --git a/debian-maintainers-gpg/0x479EC24F95C71D61 b/debian-maintainers-gpg/0x479EC24F95C71D61
index a6284b7..569bdb9 100644
--- a/debian-maintainers-gpg/0x479EC24F95C71D61
+++ b/debian-maintainers-gpg/0x479EC24F95C71D61
Binary files differ
diff --git a/debian-maintainers-gpg/0x4A0CF639427884E3 b/debian-maintainers-gpg/0x4A0CF639427884E3
new file mode 100644
index 0000000..18233f3
--- /dev/null
+++ b/debian-maintainers-gpg/0x4A0CF639427884E3
Binary files differ
diff --git a/debian-maintainers-gpg/0x5AD75B414EA41667 b/debian-maintainers-gpg/0x5AD75B414EA41667
index 6ccc655..3614ac7 100644
--- a/debian-maintainers-gpg/0x5AD75B414EA41667
+++ b/debian-maintainers-gpg/0x5AD75B414EA41667
Binary files differ
diff --git a/debian-maintainers-gpg/0x61F3442674DE6624 b/debian-maintainers-gpg/0x61F3442674DE6624
index 0700ae7..df288b8 100644
--- a/debian-maintainers-gpg/0x61F3442674DE6624
+++ b/debian-maintainers-gpg/0x61F3442674DE6624
Binary files differ
diff --git a/debian-keyring-gpg/0x6C6580E77BD756C4 b/debian-maintainers-gpg/0x6C6580E77BD756C4
index 72e36a7..72e36a7 100644
--- a/debian-keyring-gpg/0x6C6580E77BD756C4
+++ b/debian-maintainers-gpg/0x6C6580E77BD756C4
Binary files differ
diff --git a/debian-maintainers-gpg/0x7EAE264181E773D5 b/debian-maintainers-gpg/0x7EAE264181E773D5
index d71a275..5049aeb 100644
--- a/debian-maintainers-gpg/0x7EAE264181E773D5
+++ b/debian-maintainers-gpg/0x7EAE264181E773D5
Binary files differ
diff --git a/debian-maintainers-gpg/0x8EFD9702F888B2AE b/debian-maintainers-gpg/0x8EFD9702F888B2AE
index 0e9c914..f646d94 100644
--- a/debian-maintainers-gpg/0x8EFD9702F888B2AE
+++ b/debian-maintainers-gpg/0x8EFD9702F888B2AE
Binary files differ
diff --git a/debian-maintainers-gpg/0xA8822153B391646D b/debian-maintainers-gpg/0xA8822153B391646D
index 2432dd3..bba05fa 100644
--- a/debian-maintainers-gpg/0xA8822153B391646D
+++ b/debian-maintainers-gpg/0xA8822153B391646D
Binary files differ
diff --git a/debian-maintainers-gpg/0xB3C2C7B73BA3CD7F b/debian-maintainers-gpg/0xB3C2C7B73BA3CD7F
new file mode 100644
index 0000000..a63e02e
--- /dev/null
+++ b/debian-maintainers-gpg/0xB3C2C7B73BA3CD7F
Binary files differ
diff --git a/debian-maintainers-gpg/0xC0831D1F15E0DA64 b/debian-maintainers-gpg/0xC0831D1F15E0DA64
new file mode 100644
index 0000000..3fca805
--- /dev/null
+++ b/debian-maintainers-gpg/0xC0831D1F15E0DA64
Binary files differ
diff --git a/debian-maintainers-gpg/0xC617869F1478504E b/debian-maintainers-gpg/0xC617869F1478504E
index d5513b1..af1f16b 100644
--- a/debian-maintainers-gpg/0xC617869F1478504E
+++ b/debian-maintainers-gpg/0xC617869F1478504E
Binary files differ
diff --git a/debian-maintainers-gpg/0xC89D5712DF945F6F b/debian-maintainers-gpg/0xC89D5712DF945F6F
index 7dc0a9e..3d238fd 100644
--- a/debian-maintainers-gpg/0xC89D5712DF945F6F
+++ b/debian-maintainers-gpg/0xC89D5712DF945F6F
Binary files differ
diff --git a/debian-maintainers-gpg/0xCF0E265B7DFBB2F2 b/debian-maintainers-gpg/0xCF0E265B7DFBB2F2
deleted file mode 100644
index 3613eb6..0000000
--- a/debian-maintainers-gpg/0xCF0E265B7DFBB2F2
+++ /dev/null
Binary files differ
diff --git a/debian-maintainers-gpg/0xD22C1A883455D448 b/debian-maintainers-gpg/0xD22C1A883455D448
new file mode 100644
index 0000000..9fc7896
--- /dev/null
+++ b/debian-maintainers-gpg/0xD22C1A883455D448
Binary files differ
diff --git a/debian-maintainers-gpg/0xE27F2CF8458C2FA4 b/debian-maintainers-gpg/0xE27F2CF8458C2FA4
index 76f08dc..c53b59e 100644
--- a/debian-maintainers-gpg/0xE27F2CF8458C2FA4
+++ b/debian-maintainers-gpg/0xE27F2CF8458C2FA4
Binary files differ
diff --git a/debian-maintainers-gpg/0xE7BC91544F3A531B b/debian-maintainers-gpg/0xE7BC91544F3A531B
new file mode 100644
index 0000000..8d2ce66
--- /dev/null
+++ b/debian-maintainers-gpg/0xE7BC91544F3A531B
Binary files differ
diff --git a/debian-maintainers-gpg/0xF505691E3867FB84 b/debian-maintainers-gpg/0xF505691E3867FB84
index 365e57b..869e2f8 100644
--- a/debian-maintainers-gpg/0xF505691E3867FB84
+++ b/debian-maintainers-gpg/0xF505691E3867FB84
Binary files differ
diff --git a/debian-maintainers-gpg/0xFD49D0BC6FEAECDA b/debian-maintainers-gpg/0xFD49D0BC6FEAECDA
new file mode 100644
index 0000000..5f1e4ac
--- /dev/null
+++ b/debian-maintainers-gpg/0xFD49D0BC6FEAECDA
Binary files differ
diff --git a/debian-nonupload-gpg/0x7F55BB12A40F862E b/debian-nonupload-gpg/0x7F55BB12A40F862E
index 3a3e4fb..0e82867 100644
--- a/debian-nonupload-gpg/0x7F55BB12A40F862E
+++ b/debian-nonupload-gpg/0x7F55BB12A40F862E
Binary files differ
diff --git a/debian-nonupload-gpg/0xBB41D45770EF06F7 b/debian-nonupload-gpg/0xBB41D45770EF06F7
index dd598c4..6233108 100644
--- a/debian-nonupload-gpg/0xBB41D45770EF06F7
+++ b/debian-nonupload-gpg/0xBB41D45770EF06F7
Binary files differ
diff --git a/debian-maintainers-gpg/0xCFBBFCE0B74F1B14 b/debian-nonupload-gpg/0xCFBBFCE0B74F1B14
index b4dcc92..b4dcc92 100644
--- a/debian-maintainers-gpg/0xCFBBFCE0B74F1B14
+++ b/debian-nonupload-gpg/0xCFBBFCE0B74F1B14
Binary files differ
diff --git a/debian-keyring-gpg/0x7F36CF55AA87AA77 b/emeritus-keyring-gpg/0x7F36CF55AA87AA77
index 2cfe1b5..2cfe1b5 100644
--- a/debian-keyring-gpg/0x7F36CF55AA87AA77
+++ b/emeritus-keyring-gpg/0x7F36CF55AA87AA77
Binary files differ
diff --git a/keyids b/keyids
index 17d3e1e..9b50d25 100644
--- a/keyids
+++ b/keyids
@@ -94,6 +94,7 @@
0x07B3C8BC4083E800 Roger Leigh <rleigh>
0x07B48452768D3824 Javi Merino <vicho>
0x07DC563D1F41B907 Christian Marillat <marillat>
+0x07FC4891042BA65A Thomas Koch <thk>
0x081419C30B437A89 Fabio M. Di Nitto <fabbione>
0x083781A2D2ACE48B Adriano Rafael Gomes <adrianorg>
0x085D4F8691CA52E5 Susan Kleinmann <sgk>
@@ -432,6 +433,7 @@
0x292003B8AA15EA21 Richard Tibbetts <tibbetts>
0x292A35920034C733 Dennis L. Clark <dbugger>
0x2930100100003344 Gergely Riskó <risko>
+0x2948210746DF73C0 Kurt Kremitzki <kkremitzki>
0x295CAA946CE5FB54 David Frey <dfrey>
0x296A6F97E15ED335 Fredrik Steen <stone>
0x298E9A19AAC0E286 Robert Collins <robertc>
@@ -613,6 +615,7 @@
0x3BBF839336ECA931 Michael Tautschnig <mt>
0x3BBFCF77BD8B050D Roland Rosenfeld <roland>
0x3BF609C68BAFCDBD Neal H. Walfield <neal>
+0x3C4107E6826C40E4 Valentin Vidic <vvidic>
0x3C415250CC453197 Varun Hiremath <varun>
0x3C7B87531EB2DE66 Søren Boll Overgaard <boll>
0x3C81158E72D2E007 Teófilo Ruiz Suárez <teo>
@@ -741,6 +744,7 @@
0x49C5192819D03486 Francois Marier <francois>
0x49DDA59BA2EC1A7F Raphael Geissert <geissert>
0x49DEF96B0B5AB4E7 Kumar Appaiah <akumar>
+0x4A0CF639427884E3 Michal Arbet <kevko>
0x4A27770E165A9742 Frederico Munoz <fsmunoz>
0x4A536AE65B74BD29 Tyson Dowd <tyson>
0x4A55C497F744F705 Toke Høiland-Jørgensen <tohojo>
@@ -823,6 +827,7 @@
0x526F01E8564EE4B6 Adam C. Powell, IV <hazelsct>
0x5299B4990437AC41 Jan Niehusmann <jan>
0x52B6BBD953968D1B Dmitry Smirnov <onlyjob>
+0x52FC8E7BEDB7FCA2 Kunal Mehta <legoktm>
0x530CB002D761B16C Albert H. Stone, III <ahs3>
0x534520A787755E5D Ole J. Tetlie <olet>
0x536D57489C2001D0 Teemu Hukkanen <tjhukkan>
@@ -985,6 +990,7 @@
0x60F2D4C6B9841E08 Nathan Sandver <nsandver>
0x60F960A19A540E39 Philipp Matthias Hahn <pmhahn>
0x611BA9508B78A5C2 Julien Danjou <acid>
+0x612EF1613E050F54 Dylan Aïssi <daissi>
0x613A2251EE445F91 Dale Martin <dmartin>
0x614D4C343E1D0C1C Oliver Elphick <elphick>
0x6168726DB8D33CF1 Steven Baker <srbaker>
@@ -994,6 +1000,7 @@
0x61E98ECF16D970C6 Eric Dorland <eric>
0x62038A4BDD9B9910 Philip Hands <philh>
0x623E49E0876B252F Peter van Rossum <petervr>
+0x62645EB35F686A8A Mo Zhou <lumin>
0x62AF4031C82E0039 Peter Palfrader <weasel>
0x62B54B8C11404EC3 Noah Meyerhans <noahm>
0x62EF1CB4D2F9ADD1 Dima Barsky <dima>
@@ -1008,6 +1015,7 @@
0x63C511C3D1B5859D Federico Di Gregorio <fog>
0x63CE20BAC49C4148 Tim Cutts <tjrc1>
0x63D2D5D907F89BB8 Ludovico Gardenghi <garden>
+0x63F7800A23D7B252 Joseph Herlant <aerostitch>
0x640602273516D372 Carlos Laviola <claviola>
0x640E642E2F2F0CDE Jean-Michel Kelbert <kelbert>
0x6436436109F34024 Danai Sae-Han <danai>
@@ -1064,6 +1072,7 @@
0x6A08D37C0B4D63D8 Eloy A. Paris <peloy>
0x6A49B19728ABDD92 Paul Brossier <piem>
0x6AB79ED6C8FDF9C1 Mauro Lizaur <mauro>
+0x6ACEDAAE40DD2B46 Xavier Guimard <yadd>
0x6AE1DF0D608F22DC Michael Biebl <biebl>
0x6AEBD35661014F99 Jochen Röhrig <jr>
0x6B0E322836129171 Jim Westveer <jwest>
@@ -1116,6 +1125,7 @@
0x715ED6A07E7B8AC9 Joerg Jaspert <joerg>
0x7174A18FAAA7A078 Asias He <asias>
0x71A1FF601BF8DE0F Roland Stigge <stigge>
+0x71A7E533F291A324 Aurélien COUDERC <coucouf>
0x71A802D0BCD1BC92 Yukiharu YABUKI <yyabuki>
0x71A9C91A57159E59 Free Ekanayaka <freee>
0x72043670BDE5F1EE Andreas Henriksson <ah>
@@ -1148,6 +1158,7 @@
0x751AB5DDA79679CC Jimmy Kaplowitz <jimmy>
0x7537F7664950EAA6 Adam Kessel <ajkessel>
0x754191EE8F8135F6 Alexander Sack <asac>
+0x7541CFAAFC35EACF Stephen Gelman <ssgelm>
0x75612741E25A7BC9 Roman Hodek <roman>
0x756BEB4B70D8FB2A Josue Abarca <jmaslibre>
0x75897592BAFEC7F2 Charles Plessy <plessy>
@@ -1929,6 +1940,7 @@
0xC039F0824441E9FD Ben Darnell <bgdarnel>
0xC04974CFDF6807BE Simon Kelley <srk>
0xC073D2287FFB9E9B Michael Hanke <mih>
+0xC0831D1F15E0DA64 Arnaud Rebillout <arnaudr>
0xC09D3F5D2B302452 Steve Kowalik <stevenk>
0xC09E1D8995930EDE Axel Beckert <abe>
0xC09EE9AB965544A9 Peter Teichman <pat>
@@ -1956,6 +1968,7 @@
0xC26D30347C714C78 René van Bevern <rvb>
0xC274DB64C2300F7B Sjoerd Simons <sjoerd>
0xC28B28695F24E015 Fredrik Juhlin <laz>
+0xC293E7B461825ACE Boyuan Yang <byang>
0xC2AEDB1447EDD321 Giuseppe Sacco <eppesuig>
0xC2B079FCF5C75256 Russell Coker <etbe>
0xC2BD1D3FD87C6781 Jonathan Walther <krooger>
@@ -2061,6 +2074,7 @@
0xCCEC38F5A3679C16 Lars Steinke <lss>
0xCCF0D5379F223683 Rene Weber <rweber>
0xCCFBC09569A8D866 Dan Helfman <witten>
+0xCD3CEA34F42AA45D Balint Reczey <rbalint>
0xCD4B2AF3A0A0AAAA Nico Golde <nion>
0xCD58A1B17ED033FA Khalid Aziz <khalid>
0xCD603B5A2ECF984B Alexei Nikolov <clown>
@@ -2079,6 +2093,7 @@
0xCEB14A7A1DDC990D Claire Connelly <cmc>
0xCEF15C1FF2597E04 Samuele Tonon <samu>
0xCEF563662B555AEE Abraham van der Merwe <abz>
+0xCF0E265B7DFBB2F2 Shengjing Zhu <zhsj>
0xCF153232C24B6010 Matthew Danish <mrd>
0xCF489438C5779A1C Manoj Srivastava <srivasta>
0xCF62D79438E68E0E Thomas Girard <tgg>
@@ -2087,6 +2102,7 @@
0xCF7E8E241ADD95A3 Pekka Aleksi Knuutila <pa>
0xCF953E76C24B9018 Niv Sardi-Altivanik <xaiki>
0xCF9A6F914193A197 Jacob Appelbaum <ioerror>
+0xCFBBFCE0B74F1B14 Ming-ting Yao Wei <mwei>
0xCFDA9D8206A7376E Patrick Ouellette <pouelle>
0xD0015BD128F39278 Boris Pek <tehnick>
0xD003852FBD52529E Thomas Preud'homme <robotux>
@@ -2112,6 +2128,7 @@
0xD200EB30A0FB5DA6 Gustavo Noronha <kov>
0xD203CCA5FDA6B6A9 Igor Stroh <jenner>
0xD2277E455D3983A0 Arjan Oosting <arjan>
+0xD22C1A883455D448 HAYASHI Kentaro <kenhys>
0xD22D9B3D21DB31C5 Steven Michael Robbins <smr>
0xD24A8237E8074ECF Hugo Espuny <hec>
0xD265C08531ED8AEF Rémi Vanicat <vanicat>
@@ -2340,6 +2357,7 @@
0xE66C775AEBFE6C7D Jeremy Bicha <jbicha>
0xE66D2EEBAB963370 Clint Adams <clint>
0xE676B867F8D54259 Martin Buck <mbuck>
+0xE69822C7E02958CD Ruben Undheim <rubund>
0xE6AA90171392B174 David Paleino <dapal>
0xE6DE464B62C345FE Arnd Bergmann <arnd>
0xE6EF68372CFD1C38 Jamie Wilkinson <jaq>
@@ -2348,6 +2366,7 @@
0xE76004C5CEF0C94C Christian Kastner <ckk>
0xE78F751770E81554 Josselin Mouette <joss>
0xE7A48877D686C505 Kevin M. Rosenberg <kmr>
+0xE7BC91544F3A531B Iñaki Martin Malerba <ina>
0xE7BFC8EC95861109 Ben Hutchings <benh>
0xE7CBE152AC17F973 李健秋 Andrew Lee <ajqlee>
0xE7D0B098E07586B4 Philip Charles <philipc>
@@ -2407,6 +2426,7 @@
0xEC792FF25D58893B Matthew Garrett <mjg59>
0xEC79A96131761AFD Joop Stakenborg <pa3aba>
0xEC8E0CB00EFAAD81 Guido Witmond <guido>
+0xEC9D370872BC7A8C Nicolas Braud-Santoni <nicoo>
0xECB73E37E887AA8C Tomasz Rybak <serpent>
0xECC1D5F5A1FC6CFA Stephen Leake <stephe>
0xECD401CADFC6E889 Graydon Hoare <gray>
@@ -2573,6 +2593,7 @@
0xFCB0BB5C5F1FBF70 Giovanni Mascellani <gio>
0xFCD14DDFBC5D2B2D Jonathan K. Rabone <jkr>
0xFCF6DD4539CCF0C7 Akira TAGOH <tagoh>
+0xFD49D0BC6FEAECDA Sagar Ippalpalli <isaagar>
0xFDD2DEACD333CBA1 Jim Meyering <meyering>
0xFDD63BAF588A553F stevenk <Steve Kowalik>
0xFDDAB37AD935CEBA Alexander Kotelnikov <sacha>
diff --git a/scripts/process-rt b/scripts/process-rt
index 12b314e..c237252 100755
--- a/scripts/process-rt
+++ b/scripts/process-rt
@@ -22,7 +22,7 @@ from urllib.parse import urlencode
debug = False
RT_BASE_URL = 'https://rt.debian.org/REST/1.0/'
-KEYSERVER = 'the.earth.li:11371'
+KEYSERVER = 'pool.sks-keyservers.net:11371'
DAM = ['enrico', 'joerg', 'jmw', 'myon']
FD = DAM + ['noodles', 'mattia', 'santiago']
@@ -140,7 +140,7 @@ def delete_key(ctx, fpr):
ctx.op_delete(k, True)
-def get_keyinfo(ctx, fpr, checksigs=True):
+def get_keyinfo(ctx, fpr, needsigs=2):
ctx.set_keylist_mode(gpg.constants.keylist.mode.SIGS)
key = ctx.get_key(fpr)
for subkey in key.subkeys:
@@ -167,7 +167,7 @@ def get_keyinfo(ctx, fpr, checksigs=True):
# else:
# print("Skipping unknown ID " + sig.keyid)
- if checksigs and len(sigs) < 2:
+ if len(sigs) < needsigs:
raise RuntimeError('Insufficent key signatures')
certs = None
@@ -321,6 +321,8 @@ def parse_ticket(text):
state['keyid'] = line[20:]
elif line.startswith(' Username: '):
state['username'] = line[20:]
+ elif line.startswith(' uid: '):
+ state['username'] = line[20:]
elif line.startswith(' Details: '):
state['details'] = line[20:]
elif line.startswith(' First name: '):
@@ -372,14 +374,19 @@ def parse_ticket(text):
with get_gpg_ctx() as c:
if state['action'] in ('add', 'replace'):
state['keydata'] = fetch_key(c, state['keyid'])
- keyinfo = get_keyinfo(c, state['keyid'])
+ # We relax the number of signatures for a DM, otherwise we use
+ # the default.
+ if state['role'] == 'DM':
+ keyinfo = get_keyinfo(c, state['keyid'], 1)
+ else:
+ keyinfo = get_keyinfo(c, state['keyid'])
state['keytype'] = keyinfo[0]
state['certs'] = keyinfo[1]
if 'oldkeyid' in state:
with get_gpg_ctx() as c:
fetch_key(c, state['oldkeyid'])
- keyinfo = get_keyinfo(c, state['oldkeyid'], False)
+ keyinfo = get_keyinfo(c, state['oldkeyid'], 0)
state['oldkeytype'] = keyinfo[0]
return state
diff --git a/scripts/update-key b/scripts/update-key
index c0126a5..61e5468 100755
--- a/scripts/update-key
+++ b/scripts/update-key
@@ -70,6 +70,11 @@ case "$summary" in
exit
esac
+if cmp -s $GNUPGHOME/0x$keyid $keydir/0x$keyid; then
+ echo "No changes to 0x$keyid"
+ exit
+fi
+
echo "Running gpg-diff:"
(
echo $summary
diff --git a/scripts/update-keyrings b/scripts/update-keyrings
index ac3a237..37b94d8 100755
--- a/scripts/update-keyrings
+++ b/scripts/update-keyrings
@@ -1,17 +1,37 @@
#!/bin/bash
+
SHOULD_RUN_ON=kaufmann.debian.org
+OUTPUTDIR=/srv/keyring.debian.org/pub
+HKPDIR=/srv/keyring.debian.org/keyrings-new
+PENDINGDIR=/srv/keyring.debian.org/pending-updates
if [ -z "$RUNANYWAY" -a $(hostname -f) != "$SHOULD_RUN_ON" ] ; then
- echo This script is meant to be run in $SHOULD_RUN_ON
- echo You can still run it if you are sure by setting
- echo \$RUNANYWAY to a nonempty value.
- exit 1
+ echo This script is meant to be run in $SHOULD_RUN_ON
+ echo You can still run it if you are sure by setting
+ echo \$RUNANYWAY to a nonempty value.
+ exit 1
fi
-SRCKEYRINGDIR=/srv/keyring.debian.org/master-keyring/output
-OUTPUTDIR=/srv/keyring.debian.org/pub
-HKPDIR=/srv/keyring.debian.org/keyrings-new
-PENDINGDIR=/srv/keyring.debian.org/pending-updates
+if [ $# -ne 1 ]; then
+ echo "Must provide directory containing new keyrings."
+ exit 1
+fi
+
+if [ ! -d $1 ]; then
+ echo "$1 is not a directory."
+ exit 1
+fi
+
+SRCKEYRINGDIR=$1
+
+if [ ! -e ${SRCKEYRINGDIR}/sha512sums.txt ]; then
+ echo "sha512sums.txt not found in ${SRCKEYRINGDIR}"
+ exit 1
+fi
+
+if [ -e ${SRCKEYRINGDIR}/keyrings/.placeholder ]; then
+ rm ${SRCKEYRINGDIR}/keyrings/.placeholder
+fi
if ! gpg --batch --quiet --verify ${SRCKEYRINGDIR}/sha512sums.txt 2> /dev/null; \
then
@@ -25,20 +45,22 @@ if ! sha512sum -c sha512sums.txt; then
exit 1
fi
-if [ -e ${PENDINGDIR}/debian-keyring.pgp -o \
- -e ${PENDINGDIR}/debian-keyring.gpg -o \
- -e ${PENDINGDIR}/debian-maintainers.gpg ]; then
+if [ -e ${PENDINGDIR}/debian-keyring.gpg -o \
+ -e ${PENDINGDIR}/debian-maintainers.gpg -o \
+ -e ${PENDINGDIR}/debian-nonupload.gpg ]; then
echo Unhandled pending updates.
+ echo Keyrings in ${PENDINGDIR} should be dealt with and removed.
exit 1
fi
-cp ${HKPDIR}/debian-keyring.pgp ${PENDINGDIR}
-cp ${HKPDIR}/debian-keyring.gpg ${PENDINGDIR}
-cp ${HKPDIR}/debian-maintainers.gpg ${PENDINGDIR}
+cp -p ${HKPDIR}/debian-keyring.gpg ${PENDINGDIR}
+cp -p ${HKPDIR}/debian-maintainers.gpg ${PENDINGDIR}
+cp -p ${HKPDIR}/debian-nonupload.gpg ${PENDINGDIR}
echo Updating active keyrings.
cp -r ${SRCKEYRINGDIR}/* ${OUTPUTDIR}/
echo Updating HKP keyrings.
-cp -r ${SRCKEYRINGDIR}/keyrings/debian-keyring.{gpg,pgp} \
+cp -r ${SRCKEYRINGDIR}/keyrings/debian-keyring.gpg \
${SRCKEYRINGDIR}/keyrings/debian-maintainers.gpg \
+ ${SRCKEYRINGDIR}/keyrings/debian-nonupload.gpg \
${HKPDIR}/