[arch-commits] Commit in efitools/trunk (2 files)

[David Runge]

    Date: Saturday, May 23, 2020 @ 15:10:17
  Author: dvzrv
Revision: 387451

upgpkg: efitools 1.9.2-3: Rebuilding for key checking.

Pointing url to upstream about page. Removing obsolete replaces.
Switching to correct license (GPL2). Adding all required direct dependencies.

Added:
  efitools/trunk/efitools-1.9.2-console_warning_typo.patch
Modified:
  efitools/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |   53 ++++++++++++----------------
 efitools-1.9.2-console_warning_typo.patch |   13 ++++++
 2 files changed, 36 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 11:24:29 UTC (rev 387450)
+++ PKGBUILD	2020-05-23 15:10:17 UTC (rev 387451)
@@ -1,45 +1,38 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
 # Contributor: Mirco Tischler <mt-ml at gmx dot de>
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-pkgname="efitools"
+pkgname=efitools
 pkgver=1.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
-url="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/about/"
 arch=('x86_64')
-replaces=('prebootloader')
-license=('GPL' 'LGPL2.1')
-options=('!strip' '!makeflags')
-makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
-depends=('openssl')
-_commit=392836a46ce3c92b55dc88a1aebbcfdfc5dcddce # master
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit")
-md5sums=('SKIP')
+license=('GPL2' 'LGPL2.1')
+makedepends=('git' 'gnu-efi-libs' 'help2man' 'perl-file-slurp' 'sbsigntools')
+depends=('glibc' 'openssl')
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#tag=v${pkgver}?signed"
+        "${pkgname}-1.9.2-console_warning_typo.patch")
+sha512sums=('SKIP'
+            '9e609eb4fb2a7116166626d15470d66e2eb66a25867618d4065d48636304f88549a71c5e827ac92750183f0fabaa3b84beea3dffa905031a2867939bfae955e7')
+validpgpkeys=('D5606E73C8B46271BEAD9ADF814AE47C214854D6') # James Bottomley <jejb at kernel.org>
 
-pkgver() {
-	cd "${pkgname}"
-	echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g'
-}
-
 prepare() {
-	cd "${pkgname}"
-	git clean -x -d -f
-	sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign/" Make.rules
-	sed -i "s/EFI_WARN_UNKOWN_GLYPH/EFI_WARN_UNKNOWN_GLYPH/" lib/console.c
+  mv -v "${pkgname}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i "../${pkgname}-1.9.2-console_warning_typo.patch"
 }
 
 build() {
-	cd "${pkgname}"
-	# fix PreLoader.efi building on x86_64 #49314
-	export ARCH="${CARCH}"
-	make
+  cd "${pkgname}-${pkgver}"
+  # fix PreLoader.efi building on x86_64 #49314
+  export ARCH="${CARCH}"
+  make
 }
 
 package() {
-	# http://www.rodsbooks.com/efi-bootloaders/secureboot.html#prebootloader
-	# http://blog.hansenpartnership.com/uefi-secure-boot/
-	# http://blog.hansenpartnership.com/linux-foundation-secure-boot-system-released
-	cd "${pkgname}"
-	make DESTDIR="${pkgdir}" install
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -vDm 644 README -t "${pkgdir}/usr/share/doc/${pkgname}"
 }

Added: efitools-1.9.2-console_warning_typo.patch
===================================================================
--- efitools-1.9.2-console_warning_typo.patch	                        (rev 0)
+++ efitools-1.9.2-console_warning_typo.patch	2020-05-23 15:10:17 UTC (rev 387451)
@@ -0,0 +1,13 @@
+diff --git i/lib/console.c w/lib/console.c
+index 9c10560..dc0f9e7 100644
+--- i/lib/console.c
++++ w/lib/console.c
+@@ -357,7 +357,7 @@ static struct {
+ 	{  EFI_SECURITY_VIOLATION,     L"Security Violation"},
+ 
+ 	// warnings
+-	{  EFI_WARN_UNKOWN_GLYPH,      L"Warning Unknown Glyph"},
++	{  EFI_WARN_UNKNOWN_GLYPH,      L"Warning Unknown Glyph"},
+ 	{  EFI_WARN_DELETE_FAILURE,    L"Warning Delete Failure"},
+ 	{  EFI_WARN_WRITE_FAILURE,     L"Warning Write Failure"},
+ 	{  EFI_WARN_BUFFER_TOO_SMALL,  L"Warning Buffer Too Small"},