[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

[Pierre Schmitz]

    Date: Saturday, June 8, 2013 @ 09:01:02
  Author: pierre
Revision: 187918

upgpkg: archlinux-keyring 20130525-2

Re-enable key of dwallace

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---------------------------+
 PKGBUILD                  |    2 +-
 archlinux-keyring.install |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-08 07:00:54 UTC (rev 187917)
+++ PKGBUILD	2013-06-08 07:01:02 UTC (rev 187918)
@@ -3,7 +3,7 @@
 
 pkgname=archlinux-keyring
 pkgver=20130525
-pkgrel=1
+pkgrel=2
 pkgdesc='Arch Linux PGP keyring'
 arch=('any')
 url='https://projects.archlinux.org/archlinux-keyring.git/'

Modified: archlinux-keyring.install
===================================================================
--- archlinux-keyring.install	2013-06-08 07:00:54 UTC (rev 187917)
+++ archlinux-keyring.install	2013-06-08 07:01:02 UTC (rev 187918)
@@ -1,6 +1,17 @@
 post_upgrade() {
 	if usr/bin/pacman-key -l >/dev/null 2>&1; then
 		usr/bin/pacman-key --populate archlinux
+
+		# Re-enable key of dwallace
+		# See https://bugs.archlinux.org/task/35478
+		if [ -z "$2" ] || [ "$2" = "20130525-1" ]; then
+			printf 'enable\nquit\n' | LANG=C \
+				gpg --homedir /etc/pacman.d/gnupg \
+				--no-permission-warning --command-fd 0 \
+				--quiet --batch --edit-key \
+				5559BC1A32B8F76B3FCCD9555FA5E5544F010D48 \
+				2>/dev/null
+		fi
 	fi
 }