From 8c53bb72db8a554bed86841510839fe4f663a7e5 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 21 Mar 2012 09:07:08 +0100
Subject: [PATCH] Revert "The keyring no longer needs to be signed"

This reverts commit 9f3a1ace7616f69a91516994e354807e977427c6.

Keep signatures until pacman 4.0.3 hits [core].
---
 archlinux-revoked.sig | Bin 0 -> 287 bytes
 archlinux-trusted.sig | Bin 0 -> 287 bytes
 archlinux.gpg.sig     | Bin 0 -> 287 bytes
 update-keys           |   9 ++++++++-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 archlinux-revoked.sig
 create mode 100644 archlinux-trusted.sig
 create mode 100644 archlinux.gpg.sig

diff --git a/archlinux-revoked.sig b/archlinux-revoked.sig
new file mode 100644
index 0000000000000000000000000000000000000000..52fa7070258371cbcd63a0c92505e6cb0d2f23de
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0RjL91p-fLi*Eo52@roRLra%I=&Tyz2mePNKQ#jh?!KrVqy;M0
ziD?s`a#JR#s?cSufyc#XtqGx<IkaqzI8Uin6rM*DbdO;B$M{dQKW&l0J<LIUh7j$v
zfyVrk2UX#RPoBKyAtm<)-uMib{;;l>IHNpx+YEzprs}yd5CY{l>d{upW9Be$_QUTe
zuIcyoVs4*MvEV1-EG1s<KnC)v^!XM(W_?n>K}6Hm={K$c1*T}rUqOk6-Gkf+f(wUL
zN5qoJ7lU8>EW6{=n+MOqtv_1CyTBoN$@hCn#jHx)6VS2j!k@SZf_|zil|N(cbu~1d
l7H#!{byQ}#ysV?gRV}!<lKf2vxZwC>&`T^)iJ}JkbR~FyjEMjM

literal 0
HcmV?d00001

diff --git a/archlinux-trusted.sig b/archlinux-trusted.sig
new file mode 100644
index 0000000000000000000000000000000000000000..76ff3a387b2b7022721802174985139b49131830
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0RjL91p-fLi*Eo52@roRLra%I=&Yp!2mq0&0)iPexR#*bH~pZb
zYa5XmO1@PmP4zP*YP+9PnOTgiUlwMdG6X$uIDo{F7;DP33bRX5RxCs6Efa~sOWPu4
zwfoR0vF+$n$~BsS`g;f49TlGR%S^-+-eeY!4!;&PO07<5c8Vu(#>2B9E9`x=eHdLF
z@yVaCb`aVi|Ay4-WqL8h7T<kD@#dGA!uMm_pItTmB@rVFi%aFOWj=GB^JxBPu1{Xp
zT+++`UA(t$ql-cXhPO~4`OtA7LRrGHh1p=FWFCe3;y5vXc{wJXzoUs_ki1+la=P!C
lF4@ACt1k~>-0^HCy0&yB1cpYW66+o9hAgeRUSm_s0T*OQgxCN8

literal 0
HcmV?d00001

diff --git a/archlinux.gpg.sig b/archlinux.gpg.sig
new file mode 100644
index 0000000000000000000000000000000000000000..0efc2207f9bdadbfcaa4e0e273ddc6589c40647a
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0RjL91p-fLi*Eo52@roRLra%I=&boP2mrklywf1nJT^B%g~rd-
zg%aXFhXw~H+YB*<6O=`z6_ur=Qtw|kDjc5rUKrsTn+<D7H=~~=QZT7X=iM$|tpve1
z!LeQ<*EVG7!KDzolh?1+gpbVDYe+tj79T5j3+^n}vLh|`U6v~|#YE}^baL=h?pnpQ
zu^4xD8sr!~?(=l;6JX)Fw;b%jH`8-yG8>9&V|bK*luGSZ8yBVX&pW<CaIcfi3>YDu
zK0qws_ks0Y1%U6rCCVVldYi?&7_*uZ)`hJt1s_-dY=sGy>@-#lmRjnuj5`Fo5}}<#
lnmlIvyW~>6UJAe%&`l2QP@bhmH;yQ`*Et?LMp&-OwTQ|^f9U`K

literal 0
HcmV?d00001

diff --git a/update-keys b/update-keys
index c9db42e..20f29f8 100755
--- a/update-keys
+++ b/update-keys
@@ -5,7 +5,7 @@ export LANG=C
 TMPDIR=$(mktemp -d)
 trap "rm -rf '${TMPDIR}'" EXIT
 
-KEYSERVER='hkp://pgp.mit.edu'
+KEYSERVER='hkp://keys.gnupg.net'
 GPG="gpg --quiet --batch --no-tty --no-permission-warning --keyserver "${KEYSERVER}" --homedir ${TMPDIR}"
 
 pushd "$(dirname "$0")" >/dev/null
@@ -55,4 +55,11 @@ done < packager-keyids
 
 cat master/*.asc packager/*.asc > archlinux.gpg
 
+for s in archlinux{.gpg,-trusted,-revoked}; do
+	if ! ${GPG} --verify ${s}.sig; then
+		rm -f ${s}.sig
+		gpg --detach-sign --use-agent ${s}
+	fi
+done
+
 popd >/dev/null