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

[Florian Pritz]

    Date: Thursday, October 18, 2018 @ 13:10:07
  Author: bluewind
Revision: 336818

New release; reenable Alad's key

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

---------------------------+
 PKGBUILD                  |    5 +++--
 archlinux-keyring.install |   11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-18 06:38:57 UTC (rev 336817)
+++ PKGBUILD	2018-10-18 13:10:07 UTC (rev 336818)
@@ -2,7 +2,7 @@
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
 pkgname=archlinux-keyring
-pkgver=20181003
+pkgver=20181018
 pkgrel=1
 pkgdesc='Arch Linux PGP keyring'
 arch=(any)
@@ -10,7 +10,7 @@
 license=(GPL)
 install=$pkgname.install
 source=(https://sources.archlinux.org/other/$pkgname/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha256sums=('6eb0810cd4c6cda6990f08f019b8ddc7b4b2ce46025e6ac08166a7afa1024326'
+sha256sums=('24fbb4154ab7cfcbae76fbca28b1122ec7f305a138db0aa87c74d7ddd8110bb1'
             'SKIP')
 validpgpkeys=('4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'  # Pierre Schmitz <pierre at archlinux.de>
               'A314827C4E4250A204CE6E13284FC34C8E4B1A25'  # Thomas Bächler <thomas at bchlr.de>
@@ -17,6 +17,7 @@
               '86CFFCA918CF3AF47147588051E8B148A9999C34'  # Evangelos Foutras <evangelos at foutrelis.com>
               'F3691687D867B81B51CE07D9BBE43771487328A9'  # Bartlomiej Piotrowski <bpiotrowski at archlinux.org>
               'BD84DE71F493DF6814B0167254EDC91609BC9183'  # Christian Hesse <Christi at n-Hes.se>
+              'CFA6AF15E5C74149FC1D8C086D1655C14CE1C13E'  # Florian Pritz <bluewind at xinu.at>
               'E499C79F53C96A54E572FEE1C06086337C50773E')  # Jelle van der Waa <jelle at archlinux.org>
 
 package() {

Modified: archlinux-keyring.install
===================================================================
--- archlinux-keyring.install	2018-10-18 06:38:57 UTC (rev 336817)
+++ archlinux-keyring.install	2018-10-18 13:10:07 UTC (rev 336818)
@@ -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 alad
+		# See https://bugs.archlinux.org/task/35478
+		if [[ -z "$2" ]] || [[ "$(vercmp "$2" "20181018-1")" -lt 0 ]]; then
+			printf 'enable\nquit\n' | LANG=C \
+				gpg --homedir /etc/pacman.d/gnupg \
+				--no-permission-warning --command-fd 0 \
+				--quiet --batch --edit-key \
+				DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A \
+				2>/dev/null
+		fi
 	fi
 }