diff --git a/archlinux-keyring/repos/core-any/PKGBUILD b/archlinux-keyring/repos/core-any/PKGBUILD index c21209e7a7b5..23b2c6521d7b 100644 --- a/archlinux-keyring/repos/core-any/PKGBUILD +++ b/archlinux-keyring/repos/core-any/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Bartłomiej Piotrowski pkgname=archlinux-keyring -pkgver=20200422 +pkgver=20200603 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=(any) @@ -10,7 +10,7 @@ url='https://projects.archlinux.org/archlinux-keyring.git/' license=(GPL) install=$pkgname.install source=(https://sources.archlinux.org/other/$pkgname/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha256sums=('06171608f76c6fcb1c5dff092875d074453455f7cecf5aa0df27d961c5a76909' +sha256sums=('b7b7b833a3cb823b0ab58969b568ebdb4c2fd7e234d2f03a80e256ab1b3e8b57' 'SKIP') validpgpkeys=('4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre Schmitz 'A314827C4E4250A204CE6E13284FC34C8E4B1A25' # Thomas Bächler diff --git a/archlinux-keyring/repos/testing-any/PKGBUILD b/archlinux-keyring/repos/testing-any/PKGBUILD deleted file mode 100644 index 23b2c6521d7b..000000000000 --- a/archlinux-keyring/repos/testing-any/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Pierre Schmitz -# Maintainer: Bartłomiej Piotrowski - -pkgname=archlinux-keyring -pkgver=20200603 -pkgrel=1 -pkgdesc='Arch Linux PGP keyring' -arch=(any) -url='https://projects.archlinux.org/archlinux-keyring.git/' -license=(GPL) -install=$pkgname.install -source=(https://sources.archlinux.org/other/$pkgname/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha256sums=('b7b7b833a3cb823b0ab58969b568ebdb4c2fd7e234d2f03a80e256ab1b3e8b57' - 'SKIP') -validpgpkeys=('4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre Schmitz - 'A314827C4E4250A204CE6E13284FC34C8E4B1A25' # Thomas Bächler - '86CFFCA918CF3AF47147588051E8B148A9999C34' # Evangelos Foutras - 'F3691687D867B81B51CE07D9BBE43771487328A9' # Bartlomiej Piotrowski - 'BD84DE71F493DF6814B0167254EDC91609BC9183' # Christian Hesse - 'CFA6AF15E5C74149FC1D8C086D1655C14CE1C13E' # Florian Pritz - 'E499C79F53C96A54E572FEE1C06086337C50773E') # Jelle van der Waa - -package() { - cd $pkgname-$pkgver - make PREFIX=/usr DESTDIR="$pkgdir" install -} diff --git a/archlinux-keyring/repos/testing-any/archlinux-keyring.install b/archlinux-keyring/repos/testing-any/archlinux-keyring.install deleted file mode 100644 index f705a9fdec93..000000000000 --- a/archlinux-keyring/repos/testing-any/archlinux-keyring.install +++ /dev/null @@ -1,20 +0,0 @@ -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 - 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 -} - -post_install() { - if [ -x usr/bin/pacman-key ]; then - post_upgrade - fi -}