[arch-commits] Commit in shim/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Tuesday, February 22, 2022 @ 19:56:34
  Author: diabonas
Revision: 1136127

upgpkg: shim 15.5-1: upstream release, add new PGP key

The new maintainer's key has been cross-signed by the old key, cf.
https://github.com/rhboot/shim/issues/453

Additionally a -Werror at the end of a line needs to be removed as well to make
the test suite compile without warnings/errors.

Modified:
  shim/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-22 19:56:27 UTC (rev 1136126)
+++ PKGBUILD	2022-02-22 19:56:34 UTC (rev 1136127)
@@ -2,7 +2,7 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 
 pkgname=shim
-pkgver=15.4 # DO NOT UPDATE until https://github.com/rhboot/shim/issues/453 is resolved
+pkgver=15.5
 pkgrel=1
 pkgdesc="EFI preloader (unsigned EFI binaries)"
 arch=('any')
@@ -9,12 +9,13 @@
 url="https://github.com/rhboot/shim"
 license=('BSD')
 makedepends=('git')
-checkdepends=('xxd')
+checkdepends=('efivar' 'xxd')
 source=("git+https://github.com/rhboot/shim.git#tag=${pkgver}?signed"
         'rhboot-gnu-efi::git+https://github.com/rhboot/gnu-efi.git')
 md5sums=('SKIP'
          'SKIP')
-validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10') # Peter Jones <pjones at redhat.com>
+validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10'  # Peter Jones <pjones at redhat.com>
+              '039A9CEA19DE9508C36875AA2532F9176A95A442') # Robbie Harwood (work) <rharwood at fedoraproject.org>
 
 prepare() {
   cd "$pkgname"
@@ -22,7 +23,7 @@
   git config submodule.gnu-efi.url "$srcdir/rhboot-gnu-efi"
   git submodule update
   # -Werror, not even once
-  sed -e 's/-Werror //g' -i Makefile Make.defaults
+  sed -e 's/-Werror\b//g' -i Makefile Make.defaults
 }
 
 build() {