From 1eedc55f5bfe4a7e48abae26fc16135bc8baae8b Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Thu, 28 Feb 2019 10:40:07 +0100
Subject: [PATCH] update to 0.9.2

---
 .gitignore               |  1 +
 sbsigntools-gnuefi.patch | 22 +++++-----------------
 sbsigntools.spec         |  5 ++++-
 sources                  |  2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index ffa67e1..ea67612 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sbsigntools-0.9.1.tar.xz
+/sbsigntools-0.9.2.tar.xz
diff --git a/sbsigntools-gnuefi.patch b/sbsigntools-gnuefi.patch
index e6da73a..eaaf7df 100644
--- a/sbsigntools-gnuefi.patch
+++ b/sbsigntools-gnuefi.patch
@@ -1,24 +1,12 @@
-diff -up sbsigntools-0.9.1/configure.ac.gnuefi sbsigntools-0.9.1/configure.ac
---- sbsigntools-0.9.1/configure.ac.gnuefi	2018-02-21 17:48:52.000000000 +0100
-+++ sbsigntools-0.9.1/configure.ac	2018-02-22 13:26:50.529433565 +0100
-@@ -70,7 +70,7 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ tes
- ##
- # no consistent view of where gnu-efi should dump the efi stuff, so find it
- ##
--for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do
-+for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
-     if test -e $path/crt0-efi-$EFI_ARCH.o; then
-        CRTPATH=$path
-     fi
-diff -up sbsigntools-0.9.1/tests/Makefile.am.gnuefi sbsigntools-0.9.1/tests/Makefile.am
---- sbsigntools-0.9.1/tests/Makefile.am.gnuefi	2018-02-21 17:48:52.000000000 +0100
-+++ sbsigntools-0.9.1/tests/Makefile.am	2018-02-22 13:58:10.297539648 +0100
+diff -up sbsigntools-0.9.2/tests/Makefile.am.orig sbsigntools-0.9.2/tests/Makefile.am
+--- sbsigntools-0.9.2/tests/Makefile.am.orig	2019-02-28 01:20:11.000000000 +0100
++++ sbsigntools-0.9.2/tests/Makefile.am	2019-02-28 10:51:10.283286245 +0100
 @@ -27,7 +27,7 @@ check_SCRIPTS = test-wrapper.sh
  		$(FORMAT) $^ $@
  
  .$(OBJEXT).elf:
--	$(LD) $(EFILDFLAGS) -nostdlib -L $(CRTPATH) -shared -Bsymbolic $(CRTPATH)/crt0-efi-$(EFI_ARCH).o -T elf_$(EFI_ARCH)_efi.lds $< -o $@ -lefi -lgnuefi
-+	$(LD) $(EFILDFLAGS) -nostdlib -L $(CRTPATH) -shared -Bsymbolic $(CRTPATH)/crt0-efi-$(EFI_ARCH).o -T elf_$(EFI_ARCH)_efi.lds $< -o $@ @libdir@/libefi.a @libdir@/libgnuefi.a
+-	$(LD) $(EFILDFLAGS) -nostdlib -L /usr/lib -L /usr/lib64 -L $(CRTPATH) -shared -Bsymbolic $(CRTPATH)/crt0-efi-$(EFI_ARCH).o -T elf_$(EFI_ARCH)_efi.lds $< -o $@ -lefi -lgnuefi
++	$(LD) $(EFILDFLAGS) -nostdlib -L /usr/lib -L /usr/lib64 -L $(CRTPATH) -shared -Bsymbolic $(CRTPATH)/crt0-efi-$(EFI_ARCH).o -T elf_$(EFI_ARCH)_efi.lds $< -o $@ @libdir@/libefi.a @libdir@/libgnuefi.a
  
  AM_CFLAGS=-fpic -I/usr/include/efi -I/usr/include/efi/$(EFI_ARCH)
  
diff --git a/sbsigntools.spec b/sbsigntools.spec
index e363876..ec0ae89 100644
--- a/sbsigntools.spec
+++ b/sbsigntools.spec
@@ -1,7 +1,7 @@
 %bcond_without check
 
 Name:          sbsigntools
-Version:       0.9.1
+Version:       0.9.2
 Release:       1%{?dist}
 Summary:       Signing utility for UEFI secure boot
 License:       GPLv3+
@@ -66,6 +66,9 @@ make check
 %{_mandir}/man1/sbverify.1.*
 
 %changelog
+* Thu Feb 28 2019 Dominik Mierzejewski <dominik@greysector.net> - 0.9.2-1
+- update to 0.9.2
+
 * Thu Feb 22 2018 Dominik Mierzejewski <dominik@greysector.net> - 0.9.1-1
 - update to 0.9.1
 - add Fedora gnu-efi libs location to search path
diff --git a/sources b/sources
index 491fd8f..5d06c6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sbsigntools-0.9.1.tar.xz) = d4102ba950321d43b7e592f83fddd536adc974a43f97df8cab00e2fd44d226fec6814d4065fe591fbeb3c006015cbbcb62586192447ebf21a1539b72b96408f2
+SHA512 (sbsigntools-0.9.2.tar.xz) = 30c90e181e7a4446a3fec60876ad0dea68237565ba8722a0f9b84733c9df0ceaf81d0be176e5b9abe2c794879d2e7c174b6a37fb1bdc5cb77708ea1a294024a1