- updated to 0.21

- removed obsolete link patch
- added build patch (missing braces in initializer)

diff --git a/efivar-build.patch b/efivar-build.patch
new file mode 100644 (file)
index 0000000..9e7fb47
--- /dev/null
+++ b/efivar-build.patch
@@ -0,0 +1,11 @@
+--- efivar-0.21/src/linux.c.orig       2015-07-13 22:00:06.000000000 +0200
++++ efivar-0.21/src/linux.c    2015-09-11 23:12:37.823596690 +0200
+@@ -847,7 +847,7 @@
+ __attribute__((__visibility__ ("hidden")))
+ make_mac_path(uint8_t *buf, ssize_t size, const char * const ifname)
+ {
+-      struct ifreq ifr = { 0, };
++      struct ifreq ifr = { { { 0 } }, };
+       struct ethtool_drvinfo drvinfo = { 0, };
+       int fd, rc;
+       ssize_t ret = -1, sz, off=0;

diff --git a/efivar-link.patch b/efivar-link.patch
deleted file mode 100644 (file)
index 81017af..0000000
--- a/efivar-link.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- efivar-0.20/src/Makefile.orig      2015-06-02 20:32:44.000000000 +0200
-+++ efivar-0.20/src/Makefile   2015-06-28 20:25:30.902448688 +0200
-@@ -36,10 +36,15 @@
- 
- libefivar.so.$(SONAME_VERSION) :: $(EFIVAR_OBJECTS)
- 
-+libefivar.so.$(SONAME_VERSION) : LIBS+=$(EFIVAR_LIBS)
-+
- libefiboot.a :: $(EFIBOOT_OBJECTS)
- 
--libefiboot.so.$(SONAME_VERSION) :: $(EFIBOOT_OBJECTS)
-+libefiboot.so.$(SONAME_VERSION) :: $(EFIBOOT_OBJECTS) libefivar.so
- 
-+libefiboot.so.$(SONAME_VERSION) : LIBS+=efivar
-+libefiboot.so.$(SONAME_VERSION) : LIBFLAGS+=-L.
-+
- efivar : efivar.o libefivar.so
-       $(CCLD) $(ccldflags) -L. -lefivar -o $@ $^ \
-               -lpopt $(foreach lib,$(EFIVAR_LIBS),-l$(lib))

diff --git a/efivar.spec b/efivar.spec
index b98ddcd45384af00ef2843a2bbce296e728960c1..95e0d4d405ae975671781454e2f018bca93d24e3 100644 (file)
--- a/efivar.spec
+++ b/efivar.spec
@@ -5,13 +5,13 @@
 Summary:       Tools to manage UEFI variables
 Summary(pl.UTF-8):     Narzędzia do zarządzania zmiennymi UEFI
 Name:          efivar
-Version:       0.20
+Version:       0.21
 Release:       1
 License:       LGPL v2.1
 Group:         Applications/System
 Source0:       https://github.com/rhinstaller/efivar/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2982f1e1df35f214c17288137f15312f
-Patch0:                %{name}-link.patch
+# Source0-md5: 9b2bc790c267614b46b9c9c6528629d6
+Patch0:                %{name}-build.patch
 URL:           https://github.com/rhinstaller/efivar
 BuildRequires: popt-devel
 Requires:      %{name}-libs = %{version}-%{release}
@@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README.md TODO
 %attr(755,root,root) %{_bindir}/efivar
 %{_mandir}/man1/efivar.1*