From 3146e710fb6d915d098d205c8e98dfd97f6bc8a4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 7 Apr 2012 18:43:24 +0200
Subject: [PATCH] pacman 4.0.3 no longer requires the keyring itself to be
 signed

---
 Makefile              |   4 ++--
 archlinux-revoked.sig | Bin 287 -> 0 bytes
 archlinux-trusted.sig | Bin 287 -> 0 bytes
 archlinux.gpg.sig     | Bin 287 -> 0 bytes
 update-keys           |   7 -------
 5 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 archlinux-revoked.sig
 delete mode 100644 archlinux-trusted.sig
 delete mode 100644 archlinux.gpg.sig

diff --git a/Makefile b/Makefile
index 0f37214..9a27e43 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ PREFIX = /usr/local
 
 install:
 	install -dm755 $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
-	install -m0644 archlinux{.gpg,-trusted,-revoked}{,.sig} $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
+	install -m0644 archlinux{.gpg,-trusted,-revoked} $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
 
 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/share/pacman/keyrings/archlinux{.gpg,-trusted,-revoked}{,.sig}
+	rm -f $(DESTDIR)$(PREFIX)/share/pacman/keyrings/archlinux{.gpg,-trusted,-revoked}
 	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
 
 dist:
diff --git a/archlinux-revoked.sig b/archlinux-revoked.sig
deleted file mode 100644
index 52fa7070258371cbcd63a0c92505e6cb0d2f23de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/archlinux-trusted.sig b/archlinux-trusted.sig
deleted file mode 100644
index 76ff3a387b2b7022721802174985139b49131830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/archlinux.gpg.sig b/archlinux.gpg.sig
deleted file mode 100644
index 858e6a27fc0bc035d3f8c6571618173051d23c4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0RjL91p-fZ1K9uy2@roRLra%I=&VR32mU2zUDNInsmj%#7_j0-
zXUt)_KrVte+vgPW+Zv7p#|vRduLuHId$+?Mi2B0G0|{ss5H8sX-6;pKQnZURemnT3
z0q^vR>7KvT#5e)v$y>6QxzwXVs(MZ>V~lf8U4fuk0=Ip?u>M%>%Iv8^g_=;*5->@2
z{XsSTO-ryZ=~5GWn>*d6FNI4S&^l2|&f!0TLkl8(e{=<hukTmrZqPIg|JOuytOhwU
zR!F8Z1anizW5k`Yi5bt4j%Lsv@Ra`&#bPDLWQMz{j|O%Z0-E)WxMEmFhw>_Yh3PDJ
l@DlO<Qhc~cMc&#eD-R~pio3xVgcEcxLpNT(FA<7m&10d&g6seQ

diff --git a/update-keys b/update-keys
index 748a8be..71c4ca6 100755
--- a/update-keys
+++ b/update-keys
@@ -54,11 +54,4 @@ 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