summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2015-11-04 19:20:17 (GMT)
committerBritney Fransen <brfransen@gmail.com>2015-11-04 19:20:17 (GMT)
commit4339ddf11c25a2db077d3694286b7104073ad9d7 (patch)
tree39f6431a74164cd61a14c3316a365770b1a4f9b7 /abs
parent8c2f0953ec25c537e5ff3f09b3906cc536583009 (diff)
downloadlinhes_pkgbuild-4339ddf11c25a2db077d3694286b7104073ad9d7.zip
linhes_pkgbuild-4339ddf11c25a2db077d3694286b7104073ad9d7.tar.gz
linhes_pkgbuild-4339ddf11c25a2db077d3694286b7104073ad9d7.tar.bz2
archlinux-keyring: update to 20150605
Diffstat (limited to 'abs')
-rw-r--r--abs/core/archlinux-keyring/PKGBUILD16
-rw-r--r--abs/core/archlinux-keyring/archlinux-keyring.install11
2 files changed, 21 insertions, 6 deletions
diff --git a/abs/core/archlinux-keyring/PKGBUILD b/abs/core/archlinux-keyring/PKGBUILD
index b0ff4f6..bca238a 100644
--- a/abs/core/archlinux-keyring/PKGBUILD
+++ b/abs/core/archlinux-keyring/PKGBUILD
@@ -1,18 +1,22 @@
-# $Id: PKGBUILD 162172 2012-06-22 16:21:47Z pierre $
+# $Id$
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=archlinux-keyring
-pkgver=20120622
+pkgver=20150605
pkgrel=1
pkgdesc='Arch Linux PGP keyring'
arch=('any')
url='https://projects.archlinux.org/archlinux-keyring.git/'
license=('GPL')
install="${pkgname}.install"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('8fecc7ec4a9b51e3166b79a90930e7ce'
- 'afa0253f24c6ba3fee22ae6c2150cb6c')
+source=("https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('65f1c23ca17e8c72363d831a352e6fd2'
+ 'SKIP')
+validpgpkeys=(
+ '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre
+ 'A314827C4E4250A204CE6E13284FC34C8E4B1A25' # Thomas
+ )
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/abs/core/archlinux-keyring/archlinux-keyring.install b/abs/core/archlinux-keyring/archlinux-keyring.install
index 81726c6..19f594b 100644
--- a/abs/core/archlinux-keyring/archlinux-keyring.install
+++ b/abs/core/archlinux-keyring/archlinux-keyring.install
@@ -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
}